fix:临时方案修复WEB弹窗因导航栏导致的显示被裁剪问题

# Conflicts:
#	app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt

app/build.gradle

@@ -1,18 +1,17 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.crashlytics'
+//apply plugin: 'com.google.gms.google-services'
+//apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.tencent.vasdolly'
 apply from: '../mob.gradle'
-apply plugin: "com.bytedance.android.aabResGuard"
-apply plugin: "xml-class-guard"
+
 def onlyArm64 = Boolean.parseBoolean(only_arm64)
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
-        applicationId "app.repo.cam"
+        applicationId "com.vele.habuplay"
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
         versionCode Integer.valueOf(version_code)
@@ -23,7 +22,7 @@ android {
 
         flavorDimensions 'default'
 
-        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
+//        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
     }
 
     splits {
@@ -61,7 +60,7 @@ android {
             if (abi == null) {
                 abi = "universal"
             }
-            outputFileName = "repo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
+            outputFileName = "habu_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
         }
     }
 
@@ -82,13 +81,23 @@ android {
     signingConfigs {
 
         v2 {
-            storeFile file('../repo.jks')
-            storePassword "repo2023"
-            keyAlias "repo"
-            keyPassword "repo2023"
+            storeFile file('../ananplay.jks')
+            storePassword "vele2021"
+            keyAlias "ananplay"
+            keyPassword "vele2021"
             v2SigningEnabled true
             v1SigningEnabled true
         }
+
+        v1 {
+            storeFile file('../ananplay.jks')
+            storePassword "vele2021"
+            keyAlias "ananplay"
+            keyPassword "vele2021"
+            v2SigningEnabled false
+            v1SigningEnabled true
+        }
+
     }
 
     sourceSets {
@@ -139,13 +148,13 @@ android {
 
     buildTypes {
         def server_url_debug = '"http://beta.api.pekolive.com/"'
-        def server_url_release = '"https://api.repo.cam/"'
+        def server_url_release = '"https://api.anan.chat/"'
 
         debug {
             println("minifyEnabled = " + minify_enabled)
 
-            ext.enableCrashlytics = false
-            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
+//            ext.enableCrashlytics = false
+//            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
 
             buildConfigField "String", "BASE_URL", server_url_debug
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
@@ -167,10 +176,10 @@ 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", server_url_release
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
@@ -266,7 +275,7 @@ dependencies {
 
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
 
-    api 'com.tencent.vasdolly:helper:3.0.6'
+    api 'com.tencent.vasdolly:helper:3.0.3'
     implementation "io.github.tencent:vap:2.0.24"
 
     implementation 'com.github.mmin18:realtimeblurview:1.2.1'
@@ -276,15 +285,15 @@ dependencies {
     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'
 
@@ -294,7 +303,6 @@ dependencies {
     implementation 'com.contrarywind:wheelview:4.1.0'
 
     implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
-    implementation 'com.google.android.material:material:1.6.1'
 }
 
 channel {
@@ -302,7 +310,7 @@ channel {
     outputDir = new File(project.buildDir, "channelapk")
     //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
     def only64 = onlyArm64 ? "-only64" : ""
-    apkNameFormat = 'repo-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
+    apkNameFormat = 'habu-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
     //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
     fastMode = false
     //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss
@@ -310,143 +318,3 @@ 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",
-                  //谷歌服务
-                  "*.R.string.default_web_client_id",
-                  "*.R.string.firebase_database_url",
-                  "*.R.string.gcm_defaultSenderId",
-                  "*.R.string.google_api_key",
-                  "*.R.string.google_app_id",
-                  "*.R.string.google_crash_reporting_api_key",
-                  "*.R.string.google_storage_bucket",
-                  "*.R.string.project_id",
-                  //所有涉及到 getResources().getIdentifier 对应的资源ID
-                  "*.R.array.a1",
-                  "*.R.string.s1",
-                  "*.R.mipmap.m1",
-                  "*.R.dimen.d1",
-                  "*.R.integer.int1",
-                  //Firebase Crashlytics
-                  "*.R.string.com.crashlytics.*",
-                  "*.R.bool.com.crashlytics.useFirebaseAppId",
-                  "*.R.string.com.crashlytics.useFirebaseAppId",
-                  "*.R.bool.com.crashlytics.CollectDeviceIdentifiers",
-                  "*.R.string.com.crashlytics.CollectDeviceIdentifiers",
-                  "*.R.bool.com.crashlytics.CollectUserIdentifiers",
-                  "*.R.string.com.crashlytics.CollectUserIdentifiers",
-                  "*.R.string.com.crashlytics.ApiEndpoint",
-                  "*.R.string.io.fabric.android.build_id",
-                  "*.R.string.com.crashlytics.android.build_id",
-                  "*.R.bool.com.crashlytics.RequireBuildId",
-                  "*.R.string.com.crashlytics.RequireBuildId",
-                  "*.R.bool.com.crashlytics.CollectCustomLogs",
-                  "*.R.string.com.crashlytics.CollectCustomLogs",
-                  "*.R.bool.com.crashlytics.Trace",
-                  "*.R.string.com.crashlytics.Trace",
-                  "*.R.string.com.crashlytics.CollectCustomKeys",
-                  "*.R.string.com.google.firebase.crashlytics.mapping_file_id",
-                  "*.R.string.com.google.firebase.crashlytics.unity_version"
-    ]
-    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.yizhuan.erban": "com.c.r"]
-    moveDir = [
-            "com.zhihu.matisse.internal.entity" : "fddbcec",
-            "com.yizhuan.xchat_android_library.easyphoto.models.album.entity" : "dafefbfcbdbe",
-            "com.chuhai.utils" : "cbeccaebfacee",
-            "com.yizhuan.xchat_android_library.utils" : "afeaaebba",
-            "com.yizhuan.erban.base" : "cceceecedec",
-            "com.yizhuan.xchat_android_library.common.base" : "efdbbabccaaf",
-            "com.yizhuan.erban.public_chat_hall.msg" : "cbfce",
-            "com.netease.nim.uikit.common.ui.recyclerview.adapter" : "dddeefacdcbfcbd",
-            "com.yizhuan.erban.ui.list" : "ffbbbeedfdddd",
-            "com.yizhuan.xchat_android_library.list" : "efcebcafccfff",
-            "com.yizhuan.erban.ui.im.avtivity" : "fbabadeadfbeab",
-            "com.netease.nim.uikit.business.session.activity" : "fbfacfcef",
-            "com.yizhuan.erban.common.util" : "dfffbcadbaecffd",
-            "com.netease.nim.uikit.common.util.media" : "bdbeeecbddacffef",
-            "com.netease.nim.uikit.common.media.picker.util" : "dcfdaddda",
-            "com.yizhuan.xchat_android_core.utils" : "eebaabdaacfdc",
-            "com.yizhuan.xchat_android_library.easyphoto.utils.bitmap" : "cafbbeeaccf",
-            "com.yizhuan.xchat_android_library.net.rxnet.manager" : "edeaeebedbddd",
-            "com.yizhuan.xchat_android_library.utils.cache" : "fafcafaecadbbab",
-            "com.yizhuan.erban.ui.pay" : "fdafbddcdeceeed",
-            "com.yizhuan.erban.pay.adapter" : "bcaacecbabacecdfb",
-            "com.yizhuan.erban.public_chat_hall.msg.viewholder" : "bedbdbf",
-            "com.netease.nim.uikit.business.chatroom.viewholder" : "aadeeeeda",
-            "com.yizhuan.erban.common.widget" : "aeccddabefcaaad",
-            "com.netease.nim.uikit.common.ui.imageview" : "baaabaffdafcee",
-            "com.soundcloud.android.crop" : "dcdfeaddbddfdbff",
-            "com.netease.nim.uikit.common.media.picker.activity" : "feaccce",
-            "com.yizhuan.erban.common.permission" : "bbbebcbdfbaadba",
-            "com.yizhuan.xchat_android_library.easypermisssion" : "dbcdcbabdfdefd",
-            "com.yizhuan.erban.module" : "ffccffc",
-            "com.netease.nim.uikit.business.session.constant" : "bebcdeebec",
-            "com.netease.nim.uikit.common.util.log.sdk.util" : "beebacccee",
-            "com.yizhuan.erban.ui.utils" : "bceafa",
-            "com.yizhuan.erban.ui.gift.util" : "aaaaffcaec",
-            "com.zhihu.matisse.engine.impl" : "eaedaafed",
-            "com.yizhuan.xchat_android_library.common.glide" : "ddcefebecddfacade",
-            "com.yizhuan.erban.friend" : "bffeaceaaed",
-            "com.yizhuan.erban.share" : "baadcaabfdcfdef",
-            "com.yizhuan.treasure_box.model" : "ffbefbdaaca",
-            "com.yizhuan.xchat_android_core.radish" : "cbaaafeb",
-            "com.yizhuan.xchat_android_library.easyphoto.engine" : "aeeebbccbfde",
-            "com.yizhuan.xchat_android_core.module_hall.income.bean" : "eaeebbdabcce",
-            "com.yizhuan.xchat_android_core.bills.bean" : "fcafacceabd",
-            "com.jph.takephoto.uitl" : "babbcdefdca",
-            "com.netease.nim.uikit.common.ui.recyclerview.loadmore" : "fbafabef",
-            "com.yizhuan.erban.ui.widget" : "accfffcddadfeefffafad",
-            "com.yizhuan.xchat_android_library.easyphoto.ui.dialog" : "dcbfaeffceafafade",
-            "com.yizhuan.erban.common.widget.dialog" : "aeedfefafd",
-            "com.yizhuan.erban.ui.im.fragment" : "eeceacedadfffff",
-            "com.netease.nim.uikit.business.session.fragment" : "facbafcfbefdcfccb",
-            "com.netease.nim.uikit.business.session.module.list" : "ffdfafebdbdaea",
-            "com.yizhuan.erban.ui.im.chat" : "aafeeecfaa",
-            "com.netease.nim.uikit.business.session.viewholder" : "dfafaeecf",
-            "com.yizhuan.erban.base.list" : "cecbbffbab",
-            "com.netease.nim.uikit.common.ui.recyclerview.entity" : "accaacebcfc",
-            "com.yizhuan.erban.ui.widget.password" : "ddefafca",
-            "com.yizhuan.erban.pay.interfaces" : "fafeddcdbeaa",
-            "com.yizhuan.erban.community.photo" : "daaccefbafac",
-            "com.yizhuan.erban.ui.user.adapter" : "aabafbccfaf",
-            "com.netease.nim.uikit.common.ui.recyclerview.holder" : "bbeaabadfdfeee",
-            "com.netease.nim.uikit.common.ui.recyclerview.util" : "bddceccecb",
-            "com.netease.nim.uikit.common.ui.recyclerview.listener" : "bafbafebdffacbdafe",
-            "com.yizhuan.erban.ui.widget.recyclerview.decoration" : "cddeddddd",
-            "com.netease.nim.uikit.common.ui.recyclerview.decoration" : "aefdcc",
-            "com.yizhuan.tutu.room_chat" : "afeefeddae",
-            "com.yizhuan.erban.bank_card" : "cdfcdafdabcccbfab",
-            "com.yizhuan.tutu.music" : "deebbdbefbbc",
-            "com.yizhuan.erban.team.adapter" : "aaefddefe",
-            "com.netease.nim.uikit.business.team.adapter" : "bfbdeedbcbbc",
-            "com.zhihu.matisse.internal.utils" : "fbdeaebfabae",
-            "com.netease.nim.uikit.impl.preference" : "acacff",
-            "com.netease.nim.uikit.business.preference" : "ccdedacaac",
-            "com.yizhuan.erban.avroom.widget" : "fbaebeeefabde",
-            "com.yizhuan.xchat_android_library.widget" : "aefdcddaaee",
-    ]
-
-}

app/google-services.json

@@ -1,29 +0,0 @@
-{
-  "project_info": {
-    "project_number": "557443720422",
-    "project_id": "repo-32561",
-    "storage_bucket": "repo-32561.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:557443720422:android:d5d1480109b8af15b54727",
-        "android_client_info": {
-          "package_name": "app.repo.cam"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyC2L4szjA4Le5D5_dq0a4PUDxJSCf8XuEI"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/proguard-rules.pro

@@ -117,19 +117,19 @@
 -keep class com.netease.** {*;}
 
 # Presenter 相关
--keep class com.yizhuan.erban.base.** { *; }
--keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter
+-keep class com.yizhuan.habu.base.** { *; }
+-keep public class * extends com.yizhuan.habu.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.yizhuan.habu.ui.im.recent.holder.**
+-keep class com.yizhuan.habu.ui.im.recent.holder.** {*;}
+-keep class com.yizhuan.habu.ui.im.chat.** {*;}
+-keep class com.yizhuan.habu.luckymoney.viewholder.** {*;}
+-keep class com.yizhuan.habu.share.viewholder.** {*;}
+-keep class com.yizhuan.habu.public_chat_hall.msg.viewholder.** {*;}
+-keep class com.yizhuan.habu.module_hall.im.msgholder.** {*;}
+-keep class com.yizhuan.habu.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 {*;}
 
@@ -201,8 +201,8 @@
      <init>(...);
 }
 
--dontwarn com.yizhuan.erban.bindadapter.**
--keep class com.yizhuan.erban.bindadapter.** {*;}
+-dontwarn com.yizhuan.habu.bindadapter.**
+-keep class com.yizhuan.habu.bindadapter.** {*;}
 
 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -233,9 +233,10 @@
 
 # TODO 网络加载 一些业务bean gson 时候混淆问题
 -keep class org.json.** {*;}
--keep class com.yizhuan.**.bean.** {*;}
--keep class com.yizhuan.**.result.** {*;}
--keep class com.yizhuan.**.entity.** {*;}
+-dontwarn com.yizhuan.xchat_android_core.**
+-keep class com.yizhuan.xchat_android_core.** {*;}
+-keep class com.yizhuan.treasure_box.bean.** {*;}
+-keep class com.yizhuan.habu.avroom.bean.** {*;}
 
 
 #百度统计
@@ -309,8 +310,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.yizhuan.habu.avroom.widget.MicroView{*;}
+-keep class com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView{*;}
 
 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -368,7 +369,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}
 
--keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.yizhuan.habu.ui.widget.AppBarLayoutBehavior {*;}
 
 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {
@@ -478,180 +479,4 @@
 }
 -keep public class com.android.installreferrer.**{ *; }
 
--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{*;}
-
-
--keep class b.** { *; }
--keep class cc.** { *; }
--keep public class * extends b.QQ
--keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
--dontwarn com.yizhuan.erban.ui.im.recent.holder.**
--keep class com.yizhuan.erban.ui.im.recent.holder.** {*;}
--keep class aafeeecfaa.** {*;}
--keep class com.yizhuan.erban.luckymoney.viewholder.** {*;}
--keep class baadcaabfdcfdef.viewholder.** {*;}
--keep class cbfce.viewholder.** {*;}
--keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;}
--keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;}
--dontwarn com.yizhuan.erban.bindadapter.**
--keep class com.yizhuan.erban.bindadapter.** {*;}
--keep class com.yizhuan.**.bean.** {*;}
--keep class com.yizhuan.**.result.** {*;}
--keep class com.yizhuan.**.entity.** {*;}
--keep class g.GL{*;}
--keep class bc.BV{*;}
--keep class d.BD {*;}
--keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; }
--keep class fn.** { *; }
--keep class com.jph.takephoto.** { *; }
--dontwarn com.jph.takephoto.**
--keep class babbcdefdca.** { *; }
--dontwarn babbcdefdca.**
--keep class dd.** { *; }
--dontwarn dd.**
--keep public class * extends bbeaabadfdfeee.RecyclerViewHolder {*;}
--keep public class * extends dfafaeecf.MsgViewHolderBase {*;}
-
--keep class h.** {*;}
--keep class k.** {*;}
--keep class w.** {*;}
--keep class bb.** {*;}
--keep class bd.** {*;}
--keep class be.** {*;}
--keep class bi.** {*;}
--keep class bl.** {*;}
--keep class ce.** {*;}
--keep class cm.** {*;}
--keep class h.J {*;}
--keep class h.K {*;}
--keep class k.N {*;}
--keep class w.BJ {*;}
--keep class bb.BU {*;}
--keep class bd.BX {*;}
--keep class be.BY {*;}
--keep class bd.CB {*;}
--keep class bi.CF {*;}
--keep class be.CG {*;}
--keep class bl.CK {*;}
--keep class bi.CP {*;}
--keep class bb.DG {*;}
--keep class bb.DX {*;}
--keep class ce.EL {*;}
--keep class bi.ES {*;}
--keep class bd.FH {*;}
--keep class bb.FJ {*;}
--keep class cm.FW {*;}
--keep class h.UD {*;}
--keep class h.UE {*;}
--keep class h.UF {*;}
--keep class h.UG {*;}
--keep class h.UH {*;}
--keep class h.UI {*;}
--keep class w.VA {*;}
--keep class w.VB {*;}
--keep class w.VC {*;}
--keep class w.VD {*;}
--keep class w.VE {*;}
--keep class w.VF {*;}
--keep class w.VG {*;}
--keep class w.VH {*;}
--keep class w.VI {*;}
--keep class w.VJ {*;}
--keep class w.VK {*;}
--keep class w.VL {*;}
--keep class w.VM {*;}
--keep class bb.WY {*;}
--keep class bb.WZ {*;}
--keep class bb.XA {*;}
--keep class bb.XB {*;}
--keep class bb.XC {*;}
--keep class bb.XD {*;}
--keep class bb.XE {*;}
--keep class bb.XF {*;}
--keep class bb.XG {*;}
--keep class bb.XH {*;}
--keep class bb.XI {*;}
--keep class bb.XJ {*;}
--keep class bb.XK {*;}
--keep class bb.XL {*;}
--keep class bb.XM {*;}
--keep class bb.XN {*;}
--keep class bb.XO {*;}
--keep class bb.XP {*;}
--keep class bb.XQ {*;}
--keep class bb.XR {*;}
--keep class bb.XS {*;}
--keep class bb.XT {*;}
--keep class bb.XU {*;}
--keep class bb.XV {*;}
--keep class bb.XW {*;}
--keep class bb.XX {*;}
--keep class bb.XY {*;}
--keep class bd.YC {*;}
--keep class bd.YD {*;}
--keep class bd.YE {*;}
--keep class be.YF {*;}
--keep class be.YG {*;}
--keep class be.YH {*;}
--keep class be.YI {*;}
--keep class be.YJ {*;}
--keep class be.YK {*;}
--keep class be.YL {*;}
--keep class be.YM {*;}
--keep class be.YN {*;}
--keep class bl.ZD {*;}
--keep class bl.ZE {*;}
--keep class bl.ZF {*;}
--keep class bl.ZG {*;}
--keep class bl.ZH {*;}
--keep class bl.ZI {*;}
--keep class bl.ZJ {*;}
--keep class bl.ZK {*;}
--keep class bl.ZL {*;}
--keep class bl.ZM {*;}
--keep class bl.ZN {*;}
--keep class bl.ZO {*;}
--keep class bl.ZP {*;}
--keep class ce.BDC {*;}
--keep class ce.BDD {*;}
--keep class ce.BDE {*;}
--keep class ce.BDF {*;}
--keep class ce.BDG {*;}
--keep class ce.BDH {*;}
--keep class ce.BDI {*;}
--keep class ce.BDJ {*;}
--keep class ce.BDK {*;}
--keep class ce.BDL {*;}
--keep class ce.BDM {*;}
--keep class ce.BDN {*;}
--keep class ce.BDO {*;}
--keep class ce.BDP {*;}
--keep class ce.BDQ {*;}
--keep class ce.BDR {*;}
--keep class ce.BDS {*;}
--keep class ce.BDT {*;}
--keep class ce.BDU {*;}
--keep class ce.BDV {*;}
--keep class ce.BDW {*;}
--keep class ce.BDX {*;}
--keep class ce.BDY {*;}
--keep class ce.BDZ {*;}
--keep class ce.BEA {*;}
--keep class ce.BEB {*;}
--keep class ce.BEC {*;}
--keep class ce.BED {*;}
--keep class ce.BEE {*;}
--keep class ce.BEF {*;}
--keep class ce.BEG {*;}
--keep class ce.BEH {*;}
--keep class ce.BEI {*;}
--keep class ce.BEJ {*;}
--keep class cm.BFD {*;}
--keep class cm.BFE {*;}
--keep class cm.BFF {*;}
--keep class cm.BFG {*;}
-
+-keep public class * extends java.lang.Exception

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

@@ -1,4 +1,4 @@
-package com.yizhuan.erban;
+package com.yizhuan.habu;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,7 +22,7 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.yizhuan.erban_android_client", appContext.getPackageName());
+        assertEquals("com.yizhuan.habu_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.yizhuan.habu">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
 
@@ -92,6 +92,7 @@
         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:targetApi="n">
@@ -112,23 +113,23 @@
             则需要考虑发起的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="repoapp" />
-            </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"
@@ -161,7 +162,7 @@
            如果 SDKOptions 中提供了，取 SDKOptions 中的值。
         -->
         <activity
-            android:name="app.repo.cam.lineapi.LineAuthenticationCallbackActivity"
+            android:name="com.vele.habuplay.lineapi.LineAuthenticationCallbackActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:noHistory="true">
@@ -222,7 +223,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Repo"
+            android:label="Habu Live"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -259,12 +260,12 @@
             android:label="房间流水"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.music.activity.AddLocalMusicListActivity"
+            android:name="com.yizhuan.habu.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.yizhuan.habu.music.activity.MusicListActivity"
             android:label="@string/main_androidmanifest_011"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -649,7 +650,7 @@
             android:name=".module_hall.team.activity.HTeamMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
+            android:name="com.yizhuan.habu.mentoring_relationship.activity.MentoringRelationshipActivity"
             android:label="@string/main_androidmanifest_030"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
@@ -658,26 +659,26 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomMsgActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomInviteFansActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"
+            android:name="com.yizhuan.habu.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.yizhuan.habu.room_chat.activity.NimHallTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
@@ -762,7 +763,7 @@
             android:name=".bank_card.activity.AddBankCardAgreementActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
+            android:name="com.yizhuan.habu.sadmin.RoomSAdminManagerActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".home.activity.CommunityNoticeAct"
@@ -961,11 +962,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"
@@ -1066,30 +1062,6 @@
             android:name=".service.DaemonService"
             android:enabled="true" />
 
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id" />
-        <meta-data
-            android:name="com.facebook.sdk.ClientToken"
-            android:value="@string/facebook_client_token" />
-
-        <activity
-            android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name" />
-        <activity
-            android:name="com.facebook.CustomTabActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="@string/fb_login_protocol_scheme" />
-            </intent-filter>
-        </activity>
-
         <activity android:name=".avroom.room_album.RoomAlbumActivity" />
 
     </application>

app/src/main/assets/hot_region.json

@@ -1 +0,0 @@
-[{"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/java/com/jph/takephoto/app/TakePhotoActivity.java

@@ -13,8 +13,8 @@ import com.jph.takephoto.permission.InvokeListener;
 import com.jph.takephoto.permission.PermissionManager;
 import com.jph.takephoto.permission.PermissionManager.TPermissionType;
 import com.jph.takephoto.permission.TakePhotoInvocationHandler;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.base.BaseActivity;
+import com.yizhuan.habu.R;
+import com.yizhuan.habu.base.BaseActivity;
 
 /**
  * 继承这个类来让Activity获取拍照的能力<br>

app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java

@@ -12,7 +12,7 @@ import com.jph.takephoto.model.TResult;
 import com.jph.takephoto.permission.InvokeListener;
 import com.jph.takephoto.permission.PermissionManager;
 import com.jph.takephoto.permission.TakePhotoInvocationHandler;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 
 /**
  * 继承这个类来让Fragment获取拍照的能力<br>

app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java

@@ -12,7 +12,7 @@ import com.jph.takephoto.model.TResult;
 import com.jph.takephoto.permission.InvokeListener;
 import com.jph.takephoto.permission.PermissionManager;
 import com.jph.takephoto.permission.TakePhotoInvocationHandler;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 
 /**
  * 继承这个类来让Activity获取拍照的能力<br>

app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java

@@ -35,7 +35,7 @@ import com.jph.takephoto.uitl.TUriParse;
 import com.jph.takephoto.uitl.TUtils;
 import com.orhanobut.logger.Logger;
 import com.soundcloud.android.crop.Crop;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import java.io.File;

app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java

@@ -7,7 +7,7 @@ import android.graphics.BitmapFactory;
 import android.os.Handler;
 
 import com.jph.takephoto.uitl.TFileUtils;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 
 import java.io.ByteArrayOutputStream;