fix:修复房间榜单入口背景圆角大小问题

fix:区分个播小时榜落地页

android_crop_lib/build.gradle

@@ -1,34 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdkVersion COMPILE_SDK_VERSION.toInteger()
-
-    defaultConfig {
-        minSdkVersion MIN_SDK_VERSION.toInteger()
-        targetSdkVersion TARGET_SDK_VERSION.toInteger()
-
-        testApplicationId 'com.soundcloud.android.crop.test'
-        testInstrumentationRunner 'android.test.InstrumentationTestRunner'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    buildToolsVersion = '30.0.3'
-}
-
-dependencies {
-    api 'androidx.annotation:annotation:1.4.0'
-    api 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.core:core-ktx:1.7.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-repositories {
-    mavenCentral()
-}
-

android_crop_lib/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="com.soundcloud.android.crop" />

android_crop_lib/src/main/java/com/soundcloud/android/crop/UriUtil.java

@@ -1,48 +0,0 @@
-package com.soundcloud.android.crop;
-
-import android.content.Context;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.util.Log;
-
-import java.io.File;
-
-public class UriUtil {
-
-    public final static String getFileProviderName(Context context){
-        return context.getPackageName()+".fileprovider";
-    }
-
-    /**
-     * 将TakePhoto 提供的Uri 解析出文件绝对路径
-     *
-     * @param uri
-     * @return
-     */
-    public static String parseOwnUri(Context context, Uri uri) {
-        if (uri == null) return null;
-        String path;
-        if (TextUtils.equals(uri.getAuthority(), getFileProviderName(context))) {
-            String target_text_camera_photos = "camera_photos/";
-            if (uri.getPath() != null && uri.getPath().contains(target_text_camera_photos)) {
-                path = new File(uri.getPath().replace(target_text_camera_photos, ""))
-                        .getAbsolutePath();
-            } else {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    path = new File(Environment.getExternalStorageDirectory(),
-                            uri.getPath())
-                            .getAbsolutePath();
-                } else {
-                    path = uri.getPath();
-                }
-            }
-
-        } else {
-            path = uri.getPath();
-        }
-        return path;
-    }
-
-}

app/build.gradle

@@ -1,38 +1,40 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.tencent.vasdolly'
-apply from: '../mob.gradle'
+apply from: '../project.gradle'
 
-def onlyArm64 = Boolean.parseBoolean(only_arm64)
+apply plugin: "com.bytedance.android.aabResGuard"
+apply plugin: "xml-class-guard"
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
-        applicationId "com.vele.pekolive"
+        applicationId isolationMode ? 'com.example.gogo' : 'app.hiyoo.fun'
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
         versionCode Integer.valueOf(version_code)
         versionName version_name
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        ndk {
-            //设置支持的SO库架构
-            if (onlyArm64) {
-                abiFilters "arm64-v8a"
-            } else {
-                abiFilters "armeabi-v7a", "arm64-v8a"
-            }
-        }
-
         flavorDimensions 'default'
+        buildConfigField "boolean", "ISOLATION_MODE", "$isolationMode"
 
-        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
+        if (isolationMode) {
+            resValue "string", "app_name", "Hi-debug"
+        } else {
+            resValue "string", "app_name", "Hiyoo"
+        }
+    }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk true
+        }
     }
 
     bundle {
@@ -48,20 +50,29 @@ android {
     }
 
     //在apk文件后边生成版本号信息
-    android.applicationVariants.all {
-        variant ->
-            variant.outputs.all {
-                def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
-                outputFileName = "peko_${buildType.name}_v${defaultConfig.versionName}-${date}.apk"
+    android.applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach { output ->
+            def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
+
+            def outputFile = output.outputFile
+            if (outputFile == null || !outputFile.name.endsWith('.apk')) {
+                return
             }
+
+            def abi = output.getFilter(com.android.build.OutputFile.ABI)
+            if (abi == null) {
+                abi = "universal"
+            }
+            outputFileName = "hiyoo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
+        }
     }
 
-    lintOptions {
+    lint {
         abortOnError false
-        disable 'MissingTranslation'
-        disable 'ExtraTranslation'
+        disable 'MissingTranslation', 'ExtraTranslation', 'ContentDescription', 'SmallSp'
     }
 
+
     dataBinding {
         enabled = true
     }
@@ -72,24 +83,23 @@ android {
 
     signingConfigs {
 
-        v2 {
-            storeFile file('../pekolive.jks')
-            storePassword "peko2023"
-            keyAlias "pekolive"
-            keyPassword "peko2023"
+        debug {
+            storeFile file('../app_debug.jks')
+            storePassword "debug2023"
+            keyAlias "debug"
+            keyPassword "debug2023"
             v2SigningEnabled true
             v1SigningEnabled true
         }
 
-        v1 {
-            storeFile file('../pekolive.jks')
-            storePassword "peko2023"
-            keyAlias "pekolive"
-            keyPassword "peko2023"
-            v2SigningEnabled false
+        release {
+            storeFile file('../hiyoo.jks')
+            storePassword "hiyoo2023"
+            keyAlias "hiyoo"
+            keyPassword "hiyoo2023"
+            v2SigningEnabled true
             v1SigningEnabled true
         }
-
     }
 
     sourceSets {
@@ -139,19 +149,23 @@ android {
     }
 
     buildTypes {
+        def server_url_debug = '"http://beta.api.hiyoo.fun/"'
+        def server_url_release = '"https://api.hiyoo.fun/"'
 
         debug {
-            ext.enableCrashlytics = false
-            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
+            println("minifyEnabled = " + minify_enabled)
 
-            buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\""
+//            ext.enableCrashlytics = false
+//            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
+
+            buildConfigField "String", "BASE_URL", server_url_debug
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
-            buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
-            minifyEnabled false // 是否混淆
-            crunchPngs false // 停用 PNG 压缩
-            signingConfig signingConfigs.v2
+            buildConfigField "String", "BASE_URL_RELEASE", server_url_release
+            minifyEnabled minify_enabled.toBoolean() // 是否混淆
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            crunchPngs false // 停用 PNG 压缩
+            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
             gradle.taskGraph.whenReady {
                 tasks.each { task ->
                     if (task.name.contains("Test") || task.name.contains("Lint")) {
@@ -164,12 +178,12 @@ android {
         release {
             ext.enableCrashlytics = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
             ext.alwaysUpdateBuildId = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
-            firebaseCrashlytics {
-                //Firebase Crashlytics控制上传混淆文件开关
-                mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
-            }
+//            firebaseCrashlytics {
+//                //Firebase Crashlytics控制上传混淆文件开关
+//                mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
+//            }
 
-            buildConfigField "String", "BASE_URL", "\"https://api.pekolive.com/\""
+            buildConfigField "String", "BASE_URL", server_url_release
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
             buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -177,7 +191,7 @@ android {
             shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件
             zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列
             crunchPngs true // 启用 PNG 压缩
-            signingConfig signingConfigs.v2
+            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -200,11 +214,8 @@ def Lombok = "1.18.24"
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation fileTree(dir: 'aliyun-libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
 
     api 'androidx.multidex:multidex:2.0.1'
 
@@ -224,9 +235,8 @@ dependencies {
     api "com.github.zyyoona7:EasyPopup:1.0.2"
     api "com.github.donkingliang:LabelsView:1.6.5"
     api "com.github.yyued:SVGAPlayer-Android:2.6.1"
-    implementation "com.orhanobut:logger:2.2.0"
     api "com.ms-square:expandableTextView:0.1.4"
-    annotationProcessor 'androidx.annotation:annotation:1.4.0'
+    annotationProcessor 'androidx.annotation:annotation:1.6.0'
 
     implementation 'io.github.h07000223:flycoTabLayout:3.0.0'
 
@@ -247,7 +257,7 @@ dependencies {
     //数字滚动效果
     implementation 'com.github.YvesCheung:RollingText:1.2.3'
     // 引入原有第三方裁图源码，方便修改
-    api project(':android_crop_lib')
+    api project(':libs:lib_crop')
 
     //rx权限请求框架
     implementation('com.github.tbruyelle:rxpermissions:0.10.2') {
@@ -260,25 +270,25 @@ dependencies {
 
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
 
-    api 'com.tencent.vasdolly:helper:3.0.3'
+    api 'com.tencent.vasdolly:helper:3.0.6'
     implementation "io.github.tencent:vap:2.0.24"
 
     implementation 'com.github.mmin18:realtimeblurview:1.2.1'
 
-    implementation 'com.appsflyer:af-android-sdk:6.8.2'
+//    implementation 'com.appsflyer:af-android-sdk:6.8.2'
 
     implementation 'com.github.zhpanvip:BannerViewPager:3.5.6'
 
     //fireBase
-    implementation platform('com.google.firebase:firebase-bom:31.1.1')
-    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-    implementation 'com.google.firebase:firebase-analytics-ktx'
+//    implementation platform('com.google.firebase:firebase-bom:31.1.1')
+//    implementation 'com.google.firebase:firebase-crashlytics-ktx'
+//    implementation 'com.google.firebase:firebase-analytics-ktx'
 
     //Adjust接入
-    implementation 'com.adjust.sdk:adjust-android:4.33.0'
-    implementation 'com.android.installreferrer:installreferrer:2.2'
+//    implementation 'com.adjust.sdk:adjust-android:4.33.0'
+//    implementation 'com.android.installreferrer:installreferrer:2.2'
     // Add the following if you are using the Adjust SDK inside web views on your app
-    implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
+//    implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
 
     implementation 'com.github.yalantis:ucrop:2.2.7'
 
@@ -287,14 +297,19 @@ dependencies {
     //wheelView
     implementation 'com.contrarywind:wheelview:4.1.0'
 
+//    implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
+
+    implementation project(':modules:module_base')
+    if (!isolationMode && file("../modules/module_google/build.gradle").exists()) {
+        implementation project(':modules:module_google')
+    }
 }
 
 channel {
     //多渠道包的输出目录，默认为new File(project.buildDir,"channel")
     outputDir = new File(project.buildDir, "channelapk")
     //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
-    def only64 = onlyArm64 ? "-only64" : ""
-    apkNameFormat = 'peko-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
+    apkNameFormat = 'hiyoo-${buildType}-${flavorName}-v${versionName}-${buildTime}'
     //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
     fastMode = false
     //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss
@@ -302,3 +317,31 @@ channel {
     //低内存模式（仅针对V2签名，默认为false）：只把签名块、中央目录和EOCD读取到内存，不把最大头的内容块读取到内存，在手机上合成APK时，可以使用该模式
     lowMemory = false
 }
+
+aabResGuard {
+    mappingFile = file("aab-res-guard-mapping.txt").toPath() // Mapping file used for incremental obfuscation
+    whiteList = [ // White list rules
+                  "*.R.raw.*",
+                  "*.R.drawable.icon"
+    ]
+    obfuscatedBundleFileName = "duplicated-app.aab" // Obfuscated file name, must end with '.aab'
+    mergeDuplicatedRes = true // Whether to allow the merge of duplicate resources
+    enableFilterFiles = false // Whether to allow filter files
+    filterList = [ // file filter rules
+//                   "*/arm64-v8a/*",
+//                   "META-INF/*"
+    ]
+
+    enableFilterStrings = false // switch of filter strings
+    unusedStringPath = file("unused.txt").toPath() // strings will be filtered in this file
+    languageWhiteList = ["en", "zh"] // keep en,en-xx,zh,zh-xx etc. remove others.
+}
+
+//以下均为非必须
+xmlClassGuard {
+    findAabConstraintReferencedIds = true
+    //用于增量混淆的 mapping 文件
+    mappingFile = file("xml-class-mapping.txt")
+    //更改manifest文件的package属性，即包名
+    packageChange = ["com.chwl.app": "co.ch.a"]
+}

app/google-services.json

@@ -1,39 +0,0 @@
-{
-  "project_info": {
-    "project_number": "656602722869",
-    "project_id": "pekolive-30f9e",
-    "storage_bucket": "pekolive-30f9e.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
-        "android_client_info": {
-          "package_name": "com.vele.pekolive"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/proguard-rules.pro

@@ -99,35 +99,32 @@
 -keep class android.support.v7.** { *;}
 
 #----------------EventBus事件巴士-----------------
--keepclassmembers class ** {
+-keepattributes *Annotation*
+-keepclassmembers class * {
     @org.greenrobot.eventbus.Subscribe <methods>;
 }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
-
-# Only required if you use AsyncExecutor
--keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(Java.lang.Throwable);
+# If using AsyncExecutord, keep required constructor of default event used.
+# Adjust the class name if a custom failure event type is used.
+-keepclassmembers class org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
 }
-
+# Accessed via reflection, avoid renaming or removal
+-keep class org.greenrobot.eventbus.android.AndroidComponentsImpl
 
 #-------------云信相关的混淆配置------------
 -dontwarn com.netease.**
 -keep class com.netease.** {*;}
 
-# Presenter 相关
--keep class com.yizhuan.erban.base.** { *; }
--keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter
--keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
-
 # 云信自定义 ViewHolder 配置
--dontwarn com.yizhuan.erban.ui.im.recent.holder.**
--keep class com.yizhuan.erban.ui.im.recent.holder.** {*;}
--keep class com.yizhuan.erban.ui.im.chat.** {*;}
--keep class com.yizhuan.erban.luckymoney.viewholder.** {*;}
--keep class com.yizhuan.erban.share.viewholder.** {*;}
--keep class com.yizhuan.erban.public_chat_hall.msg.viewholder.** {*;}
--keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;}
--keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;}
+-dontwarn com.chwl.app.ui.im.recent.holder.**
+-keep class com.chwl.app.ui.im.recent.holder.** {*;}
+-keep class com.chwl.app.ui.im.chat.** {*;}
+-keep class com.chwl.app.luckymoney.viewholder.** {*;}
+-keep class com.chwl.app.share.viewholder.** {*;}
+-keep class com.chwl.app.public_chat_hall.msg.viewholder.** {*;}
+-keep class com.chwl.app.module_hall.im.msgholder.** {*;}
+-keep class com.chwl.app.mentoring_relationship.viewholder.** {*;}
 -keep public class * extends com.netease.nim.uikit.common.ui.recyclerview.holder.RecyclerViewHolder {*;}
 -keep public class * extends com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase {*;}
 
@@ -175,8 +172,8 @@
 -keep class com.darsh.multipleimageselect.** { *; }
 -dontwarn com.darsh.multipleimageselect.**
 
--keep class com.soundcloud.android.crop.** { *; }
--dontwarn com.soundcloud.android.crop.**
+-keep class com.soundcloud.crop.** { *; }
+-dontwarn com.soundcloud.crop.**
 
 # glide4.0
 -keep public class * implements com.bumptech.glide.module.GlideModule
@@ -188,6 +185,11 @@
 # for DexGuard only
 #-keepresourcexmlelements manifest/application/meta-data@value=GlideModule
 
+# Presenter 相关
+-keep class com.chwl.app.base.** { *; }
+-keep public class * extends com.chwl.app.base.BaseMvpPresenter
+-keep public class * extends com.chwl.library.base.factory.AbstractMvpPresenter
+
 # BaseAdapter
 -keep class com.chad.library.adapter.** {
 *;
@@ -199,8 +201,8 @@
      <init>(...);
 }
 
--dontwarn com.yizhuan.erban.bindadapter.**
--keep class com.yizhuan.erban.bindadapter.** {*;}
+-dontwarn com.chwl.app.bindadapter.**
+-keep class com.chwl.app.bindadapter.** {*;}
 
 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -231,9 +233,9 @@
 
 # TODO 网络加载 一些业务bean gson 时候混淆问题
 -keep class org.json.** {*;}
--dontwarn com.yizhuan.xchat_android_core.**
--keep class com.yizhuan.xchat_android_core.** {*;}
-
+-keep class com.chwl.**.bean.** {*;}
+-keep class com.chwl.**.result.** {*;}
+-keep class com.chwl.**.entity.** {*;}
 
 #百度统计
 -keep class com.baidu.bottom.** { *; }
@@ -306,8 +308,8 @@
 -keep class com.autonavi.aps.amapapi.model.**{*;}
 
 #暂时keep这个View排查华为oom问题
--keep class com.yizhuan.erban.avroom.widget.MicroView{*;}
--keep class com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView{*;}
+-keep class com.chwl.app.avroom.widget.MicroView{*;}
+-keep class com.chwl.app.ui.widget.rollviewpager.RollPagerView{*;}
 
 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -365,7 +367,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}
 
--keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.chwl.app.ui.widget.AppBarLayoutBehavior {*;}
 
 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {
@@ -450,7 +452,7 @@
 }
 
 ## EasyPhotos
--keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; }
+-keep class com.chwl.library.easyphoto.models.** { *; }
 
 ## 图片裁剪UCrop
 -dontwarn com.yalantis.ucrop.**
@@ -475,4 +477,8 @@
 }
 -keep public class com.android.installreferrer.**{ *; }
 
--keep public class * extends java.lang.Exception
+-keep public class * extends java.lang.Exception
+
+-keep public class com.alibaba.android.arouter.routes.**{*;}
+-keep public class com.alibaba.android.arouter.facade.**{*;}
+-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}

app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java

@@ -1,28 +0,0 @@
-package com.yizhuan.erban;
-
-import static org.junit.Assert.assertEquals;
-
-import android.content.Context;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.yizhuan.erban_android_client", appContext.getPackageName());
-    }
-
-}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yizhuan.erban">
+    package="com.chwl.app">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
 
@@ -19,8 +19,8 @@
         android:protectionLevel="signature" />
 
     <queries>
-        <package android:name="com.facebook.katana" />
-        <package android:name="jp.naver.line.android" />
+<!--        <package android:name="com.facebook.katana" />-->
+<!--        <package android:name="jp.naver.line.android" />-->
         <package android:name="com.android.vending" />
     </queries>
 
@@ -51,8 +51,15 @@
         tools:node="remove" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- 如果需要实时音视频通话模块，下面的权限也是必须的。否则，可以不加 -->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- SDK 权限申明, 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
@@ -72,19 +79,24 @@
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
     <!-- AppsFlyer需要，参考：https://dev.appsflyer.com/hc/docs/install-android-sdk#setting-required-permissions -->
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <!-- 对于 Android 12.0 及以上设备，还需要添加如下权限： -->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application
-        android:name=".application.XChatApplication"
+        android:name=".application.App"
         android:allowBackup="false"
-        android:icon="@mipmap/app_logo"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:supportsRtl="true"
+        android:testOnly="false"
         android:theme="@style/MyMaterialTheme"
-        tools:replace="android:name,android:allowBackup"
+        tools:replace="android:name,android:label,android:allowBackup"
         tools:targetApi="n">
+
         <activity
             android:name=".other.activity.SplashActivity"
             android:exported="true"
@@ -101,26 +113,26 @@
             则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
             参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
             -->
-            <intent-filter>
+<!--            <intent-filter>-->
 
-                <!-- 此处scheme值需要替换为后台设置中的scheme值 -->
-                <action android:name="android.intent.action.VIEW" />
+<!--                &lt;!&ndash; 此处scheme值需要替换为后台设置中的scheme值 &ndash;&gt;-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
 
-                <data
-                    android:host="main"
-                    android:scheme="pekoapp" />
-            </intent-filter>
+<!--                <data-->
+<!--                    android:host="main"-->
+<!--                    android:scheme="pikoapp" />-->
+<!--            </intent-filter>-->
         </activity>
 
-        <meta-data
-            android:name="firebase_crashlytics_collection_enabled"
-            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> <!-- 刘海屏适配 begin -->
+<!--        <meta-data-->
+<!--            android:name="firebase_crashlytics_collection_enabled"-->
+<!--            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
         <!-- 小米 -->
         <activity
-            android:name="com.soundcloud.android.crop.CropImageActivity"
+            android:name="com.soundcloud.crop.CropImageActivity"
             android:screenOrientation="portrait" /> <!-- 华为 -->
         <activity
             android:name="com.darsh.multipleimageselect.activities.AlbumSelectActivity"
@@ -140,31 +152,31 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity> <!-- 刘海屏适配 end -->
-        <activity
-            android:name="com.mob.tools.MobUIShell"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:windowSoftInputMode="stateHidden|adjustResize" /> <!-- 云信配置 begin ##################################################### -->
+<!--        <activity-->
+<!--            android:name="com.mob.tools.MobUIShell"-->
+<!--            android:configChanges="keyboardHidden|orientation|screenSize"-->
+<!--            android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
+<!--            android:windowSoftInputMode="stateHidden|adjustResize" /> &lt;!&ndash; 云信配置 begin ##################################################### &ndash;&gt;-->
         <!--
            APP key, 可以在这里设置，也可以在 SDKOptions 中提供。
            如果 SDKOptions 中提供了，取 SDKOptions 中的值。
         -->
-        <activity
-            android:name="com.vele.pekolive.lineapi.LineAuthenticationCallbackActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:noHistory="true">
+<!--        <activity-->
+<!--            android:name="app.hiyoo.fun.lineapi.LineAuthenticationCallbackActivity"-->
+<!--            android:exported="true"-->
+<!--            android:launchMode="singleTask"-->
+<!--            android:noHistory="true">-->
 
-            <!-- 集成line客户端登录授权，需要添如下格式的过滤器 -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+<!--            &lt;!&ndash; 集成line客户端登录授权，需要添如下格式的过滤器 &ndash;&gt;-->
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
 
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
 
-                <data android:scheme="lineauth" />
-            </intent-filter>
-        </activity>
+<!--                <data android:scheme="lineauth" />-->
+<!--            </intent-filter>-->
+<!--        </activity>-->
         <!--
             声明云信后台服务，如需保持后台推送，使用独立进程效果会更好。
             ca46478c438dda51d25306f52fe7506b
@@ -211,7 +223,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Peko"
+            android:label="Hiyoo"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -244,12 +256,16 @@
             android:label="@string/main_androidmanifest_09"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.music.activity.AddLocalMusicListActivity"
+            android:name=".module_hall.hall.activity.RoomIncomeActivity"
+            android:label="房间流水"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.chwl.app.music.activity.AddLocalMusicListActivity"
             android:label="@string/main_androidmanifest_010"
             android:screenOrientation="portrait"
             android:theme="@style/AVRoomTheme" />
         <activity
-            android:name="com.yizhuan.tutu.music.activity.MusicListActivity"
+            android:name="com.chwl.app.music.activity.MusicListActivity"
             android:label="@string/main_androidmanifest_011"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -504,15 +520,6 @@
             android:name=".family.view.activity.FamilyGameListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".treasure_box.activity.TreasureBoxActivity"
-            android:theme="@style/dialog_web_view_activity" />
-        <activity
-            android:name=".treasure_box.activity.BoxRankingActivity"
-            android:theme="@style/room_message_activity" />
-        <activity
-            android:name=".treasure_box.activity.TreasureBoxHonourActivity"
-            android:theme="@style/dialog_web_view_activity" />
         <activity android:name=".ui.setting.VerifyPhoneActivity" />
         <activity android:name=".ui.setting.ModifyPwdActivity" />
         <activity
@@ -634,7 +641,7 @@
             android:name=".module_hall.team.activity.HTeamMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
+            android:name="com.chwl.app.mentoring_relationship.activity.MentoringRelationshipActivity"
             android:label="@string/main_androidmanifest_030"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
@@ -643,26 +650,26 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomMsgActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomNewbieActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomNewbieMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomInviteFansActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
@@ -747,7 +754,7 @@
             android:name=".bank_card.activity.AddBankCardAgreementActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
+            android:name="com.chwl.app.sadmin.RoomSAdminManagerActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".home.activity.CommunityNoticeAct"
@@ -768,13 +775,13 @@
             android:name=".community.photo.BigPhotoActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.zhihu.matisse.ui.MatisseActivity"
+            android:name="com.example.matisse.ui.MatisseActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.zhihu.matisse.internal.ui.AlbumPreviewActivity"
+            android:name="com.example.matisse.internal.ui.AlbumPreviewActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.zhihu.matisse.internal.ui.SelectedPreviewActivity"
+            android:name="com.example.matisse.internal.ui.SelectedPreviewActivity"
             android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
         <activity
             android:name=".ui.wallet.sendgold.SendGoldActivity"
@@ -814,6 +821,10 @@
         <activity
             android:name=".ui.webview.DatingRuleWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
+        <activity
+            android:name=".ui.webview.room_banner.RoomBannerWebDialogActivity"
+            android:theme="@style/dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan"  />
         <activity
             android:name=".ui.webview.TarotPayWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
@@ -926,7 +937,7 @@
             android:name=".earn.activity.EarnWithdrawActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
-            android:screenOrientation="portrait" /> <!-- com.yizhuan.xchat_android_core.skill -->
+            android:screenOrientation="portrait" /> <!-- com.chwl.core.skill -->
         <activity
             android:name=".earn.activity.BindWithdrawMsgActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
@@ -942,11 +953,6 @@
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.login.LoginBoundAuthCodeActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.setting.ShieldManageActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
@@ -968,6 +974,12 @@
             android:exported="false"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".ui.webview.FairyDialogWebViewActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
+            android:exported="false"
+            android:theme="@style/transparent_activity" />
+
         <meta-data
             android:name="notch.config"
             android:value="portrait|landscape" />
@@ -990,6 +1002,10 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
+<!--        <meta-data-->
+<!--            android:name="Mob-Https"-->
+<!--            android:value="yes" />-->
+
         <provider
             android:name="com.netease.nimlib.ipc.NIMContentProvider"
             android:authorities="${applicationId}.ipc.provider"
@@ -1007,8 +1023,7 @@
             android:name="com.netease.nimlib.service.NimReceiver"
             android:exported="false"
             android:process=":core"
-            tools:node="remove">
-        </receiver>
+            tools:node="remove"></receiver>
         <receiver android:name="com.netease.nimlib.service.ResponseReceiver" />
         <receiver
             android:name=".reciever.IncomingCallReceiver"
@@ -1018,6 +1033,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name=".reciever.NotificationClickReceiver" />
+
         <service
             android:name="com.netease.nimlib.service.NimService"
             android:process=":core" />
@@ -1032,6 +1048,9 @@
         <service
             android:name=".service.DaemonService"
             android:enabled="true" />
+
+        <activity android:name=".avroom.room_album.RoomAlbumActivity" />
+
     </application>
 
 </manifest>

app/src/main/assets/hot_region.json

@@ -0,0 +1 @@
+[{"name":"Taiwan","abbr":"TW","mcc":"466","code":"886"},{"name":"Hong Kong","abbr":"HK","mcc":"454","code":"852"},{"name":"Singapore","abbr":"SG","mcc":"525","code":"65"},{"name":"Malaysia","abbr":"MY","mcc":"502","code":"60"},{"name":"China","abbr":"CN","mcc":"460","code":"86"}]

app/src/main/assets/supplierconfig.json

@@ -1,17 +0,0 @@
-{
-  "supplier":{
-    "vivo":{
-      "appid":"100215079"
-    },
-    "xiaomi":{
-
-    },
-    "huawei":{
-
-    },
-    "oppo":{
-
-    }
-  }
-
-}