Merge branch 'v2.2.0/red_package' into peki

feat：增加混淆配置bean

.gitignore

@@ -7,7 +7,7 @@
 .externalNativeBuild
 .idea
 .settings
-app/peko/debug/app-accompany-debug.apk
-app/peko/debug/output.json
+app/peki/debug/app-accompany-debug.apk
+app/peki/debug/output.json
 *.apk
-app/peko/release/output.json
+app/peki/release/output.json

app/build.gradle

@@ -1,18 +1,15 @@
 apply plugin: 'com.android.application'
-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 "fun.peki.live"
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
         versionCode Integer.valueOf(version_code)
@@ -61,7 +58,7 @@ android {
             if (abi == null) {
                 abi = "universal"
             }
-            outputFileName = "repo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
+            outputFileName = "peki_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
         }
     }
 
@@ -82,13 +79,23 @@ android {
     signingConfigs {
 
         v2 {
-            storeFile file('../repo.jks')
-            storePassword "repo2023"
-            keyAlias "repo"
-            keyPassword "repo2023"
+            storeFile file('../pikolive.jks')
+            storePassword "pikolive2023"
+            keyAlias "pikolive"
+            keyPassword "pikolive2023"
             v2SigningEnabled true
             v1SigningEnabled true
         }
+
+        v1 {
+            storeFile file('../pikolive.jks')
+            storePassword "pikolive2023"
+            keyAlias "pikolive"
+            keyPassword "pikolive2023"
+            v2SigningEnabled false
+            v1SigningEnabled true
+        }
+
     }
 
     sourceSets {
@@ -110,7 +117,7 @@ android {
                     'src/module_treasure_box/java',
                     'src/module_community/java',
                     'src/module_album/java',
-
+                    'src/module_other/java',
             ]
 
             res.srcDirs = [
@@ -130,6 +137,7 @@ android {
                     'src/module_treasure_box/res',
                     'src/module_community/res',
                     'src/module_album/res',
+                    'src/module_other/res',
 
             ]
 
@@ -138,14 +146,14 @@ android {
     }
 
     buildTypes {
-        def server_url_debug = '"http://beta.api.pekolive.com/"'
-        def server_url_release = '"https://api.repo.cam/"'
+        def server_url_debug = '"http://beta.api.pikolive.fun/"'
+        def server_url_release = '"https://api.pikolive.fun/"'
 
         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 +175,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 +274,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 +284,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 +302,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 +309,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 = 'peki-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
     //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
     fastMode = false
     //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss
@@ -310,143 +317,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

@@ -29,6 +29,9 @@
 
 # 保留行号
 -keepattributes SourceFile,LineNumberTable
+-obfuscationdictionary ../dic.txt
+-classobfuscationdictionary ../dic.txt
+-packageobfuscationdictionary ../dic.txt
 
 #-dontwarn  #//dontwarn去掉警告
 #-dontskipnonpubliclibraryclassmembers
@@ -117,19 +120,19 @@
 -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
+-keep class com.bingchuang.app.base.** { *; }
+-keep public class * extends com.bingchuang.app.base.BaseMvpPresenter
+-keep public class * extends com.bingchuang.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.bingchuang.app.ui.im.recent.holder.**
+-keep class com.bingchuang.app.ui.im.recent.holder.** {*;}
+-keep class com.bingchuang.app.ui.im.chat.** {*;}
+-keep class com.bingchuang.app.luckymoney.viewholder.** {*;}
+-keep class com.bingchuang.app.share.viewholder.** {*;}
+-keep class com.bingchuang.app.public_chat_hall.msg.viewholder.** {*;}
+-keep class com.bingchuang.app.module_hall.im.msgholder.** {*;}
+-keep class com.bingchuang.core.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 +204,8 @@
      <init>(...);
 }
 
--dontwarn com.yizhuan.erban.bindadapter.**
--keep class com.yizhuan.erban.bindadapter.** {*;}
+-dontwarn com.bingchuang.app.bindadapter.**
+-keep class com.bingchuang.app.bindadapter.** {*;}
 
 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -233,9 +236,12 @@
 
 # TODO 网络加载 一些业务bean gson 时候混淆问题
 -keep class org.json.** {*;}
--keep class com.yizhuan.**.bean.** {*;}
--keep class com.yizhuan.**.result.** {*;}
--keep class com.yizhuan.**.entity.** {*;}
+-dontwarn com.bingchuang.core.**
+-keep class com.bingchuang.core.** {*;}
+-keep class com.bingchuang.treasure_box.bean.** {*;}
+-keep class com.bingchuang.app.avroom.bean.** {*;}
+-keep class com.bingchuang.core2.**.bean.** {*;}
+-keep class com.bingchuang.**.bean.** {*;}
 
 
 #百度统计
@@ -309,8 +315,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.bingchuang.app.avroom.widget.MicroView{*;}
+-keep class com.bingchuang.app.ui.widget.rollviewpager.RollPagerView{*;}
 
 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -368,7 +374,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}
 
--keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.bingchuang.app.ui.widget.AppBarLayoutBehavior {*;}
 
 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {
@@ -453,7 +459,7 @@
 }
 
 ## EasyPhotos
--keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; }
+-keep class com.bingchuang.library.easyphoto.models.** { *; }
 
 ## 图片裁剪UCrop
 -dontwarn com.yalantis.ucrop.**
@@ -478,180 +484,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/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.bingchuang.app">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
 
@@ -84,7 +84,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application
-        android:name=".application.XChatApplication"
+        android:name="com.bingchuang.app.application.App"
         android:allowBackup="false"
         android:icon="@mipmap/app_logo"
         android:label="@string/app_name"
@@ -97,7 +97,7 @@
         tools:targetApi="n">
 
         <activity
-            android:name=".other.activity.SplashActivity"
+            android:name="com.bingchuang.app.other.activity.SplashActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/SplashTheme">
@@ -122,13 +122,13 @@
 
                 <data
                     android:host="main"
-                    android:scheme="repoapp" />
+                    android:scheme="pekiapp" />
             </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 +161,7 @@
            如果 SDKOptions 中提供了，取 SDKOptions 中的值。
         -->
         <activity
-            android:name="app.repo.cam.lineapi.LineAuthenticationCallbackActivity"
+            android:name="fun.peki.live.lineapi.LineAuthenticationCallbackActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:noHistory="true">
@@ -206,36 +206,36 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" /> <!-- 云信进程间通信service -->
         <activity
-            android:name=".ui.login.BindCodeActivity"
+            android:name="com.bingchuang.app.ui.login.BindCodeActivity"
             android:label="@string/main_androidmanifest_04"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" /> <!-- 申明本地电话状态（通话状态）的广播接收器，第三方APP集成时音视频模块时，如果需要在App中处理网络通话与本地电话的交互请加上此接收器 -->
         <!-- 在Demo的示例代码中是在Application进行了网络通话与本地电话的互斥处理 -->
         <activity
-            android:name=".UserGuideActivity"
+            android:name="com.bingchuang.app.UserGuideActivity"
             android:label="@string/main_androidmanifest_05"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.search.SearchActivity"
+            android:name="com.bingchuang.app.ui.search.SearchActivity"
             android:screenOrientation="portrait" /> <!-- 云信进程间通信provider -->
         <!-- 配置的service和receiver -->
         <activity
-            android:name=".MainActivity"
+            android:name="com.bingchuang.app.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Repo"
+            android:label="Peki"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
         <activity
-            android:name=".ui.keepalive.OnePiexlActivity"
+            android:name="com.bingchuang.app.ui.keepalive.OnePiexlActivity"
             android:screenOrientation="portrait"
             android:theme="@style/OnePixelActivity" />
         <activity
-            android:name=".NimMiddleActivity"
+            android:name="com.bingchuang.app.NimMiddleActivity"
             android:noHistory="true"
             android:screenOrientation="portrait" /> <!-- Autolayout####################################################配置 -->
         <activity
-            android:name=".avroom.activity.AVRoomActivity"
+            android:name="com.bingchuang.app.avroom.activity.AVRoomActivity"
             android:hardwareAccelerated="true"
             android:label="@string/main_androidmanifest_06"
             android:launchMode="singleTask"
@@ -243,39 +243,39 @@
             android:theme="@style/AVRoomTheme"
             android:windowSoftInputMode="adjustPan" /> <!-- tinker配置 begin ########################################################## -->
         <activity
-            android:name=".avroom.activity.RoomSettingActivity"
+            android:name="com.bingchuang.app.avroom.activity.RoomSettingActivity"
             android:label="@string/main_androidmanifest_07"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".avroom.activity.RoomManagerListActivity"
+            android:name="com.bingchuang.app.avroom.activity.RoomManagerListActivity"
             android:label="@string/main_androidmanifest_08"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".avroom.activity.RoomBlackListActivity"
+            android:name="com.bingchuang.app.avroom.activity.RoomBlackListActivity"
             android:label="@string/main_androidmanifest_09"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.RoomIncomeActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.RoomIncomeActivity"
             android:label="房间流水"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.music.activity.AddLocalMusicListActivity"
+            android:name="com.bingchuang.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.bingchuang.app.music.activity.MusicListActivity"
             android:label="@string/main_androidmanifest_011"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/AVRoomTheme" />
         <activity
-            android:name=".ui.login.AddUserInfoActivity"
+            android:name="com.bingchuang.app.ui.login.AddUserInfoActivity"
             android:label="@string/main_androidmanifest_012"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.login.ModifyInfoActivity"
+            android:name="com.bingchuang.app.ui.login.ModifyInfoActivity"
             android:label="@string/main_androidmanifest_013"
             android:screenOrientation="portrait" />
         <activity
@@ -287,98 +287,98 @@
             android:label="@string/main_androidmanifest_015"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.user.activity.UserInfoActivity"
+            android:name="com.bingchuang.app.ui.user.activity.UserInfoActivity"
             android:label="@string/main_androidmanifest_016"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".audio.AudioRecordActivity"
+            android:name="com.bingchuang.app.audio.AudioRecordActivity"
             android:label="@string/main_androidmanifest_017"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.pay.ChargeActivity"
+            android:name="com.bingchuang.app.ui.pay.ChargeActivity"
             android:label="@string/main_androidmanifest_018"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".home.activity.CollectionRoomActivity"
+            android:name="com.bingchuang.app.home.activity.CollectionRoomActivity"
             android:label="@string/main_androidmanifest_019"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.wallet.ExchangeGoldActivity"
+            android:name="com.bingchuang.app.ui.wallet.ExchangeGoldActivity"
             android:label="@string/main_androidmanifest_020"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.setting.SettingActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.relation.AttentionListActivity"
+            android:name="com.bingchuang.app.ui.relation.AttentionListActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.relation.FansListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.withdraw.WithdrawActivity"
+            android:name="com.bingchuang.app.ui.withdraw.WithdrawActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.withdraw.bankcard.BindWithdrawBankCardActivity"
+            android:name="com.bingchuang.app.ui.withdraw.bankcard.BindWithdrawBankCardActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.withdraw.WithdrawRuleActivity"
+            android:name="com.bingchuang.app.ui.withdraw.WithdrawRuleActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.withdraw.BinderAlipayActivity"
+            android:name="com.bingchuang.app.ui.withdraw.BinderAlipayActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.user.activity.AboutActivity"
+            android:name="com.bingchuang.app.ui.user.activity.AboutActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.user.activity.ShowPhotoActivity"
+            android:name="com.bingchuang.app.ui.user.activity.ShowPhotoActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.TotalBillsActivity"
+            android:name="com.bingchuang.app.bills.activities.TotalBillsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.WithdrawBillsActivity"
+            android:name="com.bingchuang.app.bills.activities.WithdrawBillsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.ChargeBillsActivity"
+            android:name="com.bingchuang.app.bills.activities.ChargeBillsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.ChatBillsActivity"
+            android:name="com.bingchuang.app.bills.activities.ChatBillsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.setting.FeedbackActivity"
+            android:name="com.bingchuang.app.ui.setting.FeedbackActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.setting.LabActivity"
+            android:name="com.bingchuang.app.ui.setting.LabActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.webview.CommonWebViewActivity"
+            android:name="com.bingchuang.app.ui.webview.CommonWebViewActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.webview.SimpleWebViewActivity"
+            android:name="com.bingchuang.app.ui.webview.SimpleWebViewActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.RedBagBillsActivity"
+            android:name="com.bingchuang.app.bills.activities.RedBagBillsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.BillGiftExpendActivity"
+            android:name="com.bingchuang.app.bills.activities.BillGiftExpendActivity"
             android:label="@string/main_androidmanifest_021"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.BillGiftInComeActivity"
+            android:name="com.bingchuang.app.bills.activities.BillGiftInComeActivity"
             android:label="@string/main_androidmanifest_022"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bills.activities.BillNobleActivity"
+            android:name="com.bingchuang.app.bills.activities.BillNobleActivity"
             android:label="@string/bill_noble_open"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".avroom.activity.RoomInviteActivity"
+            android:name="com.bingchuang.app.avroom.activity.RoomInviteActivity"
             android:label="@string/main_androidmanifest_023"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.im.avtivity.NimP2PMessageActivity"
+            android:name="com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/main_androidmanifest_024"
             android:launchMode="singleTop"
@@ -386,401 +386,401 @@
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden|adjustResize" /> <!-- 提现绑定银行卡 -->
         <activity
-            android:name=".ui.im.avtivity.AddBlackListActivity"
+            android:name="com.bingchuang.app.ui.im.avtivity.AddBlackListActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/main_androidmanifest_025"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".ui.im.avtivity.BlackListManageActivity"
+            android:name="com.bingchuang.app.ui.im.avtivity.BlackListManageActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/main_androidmanifest_026"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".decoration.view.MyDecorationActivity"
+            android:name="com.bingchuang.app.decoration.view.MyDecorationActivity"
             android:label="@string/main_androidmanifest_027"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".decoration.view.DecorationStoreActivity"
+            android:name="com.bingchuang.app.decoration.view.DecorationStoreActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".ui.user.activity.UserGiftActivity"
+            android:name="com.bingchuang.app.ui.user.activity.UserGiftActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".friend.view.SelectFriendActivity"
+            android:name="com.bingchuang.app.friend.view.SelectFriendActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyPlazaActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyPlazaActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyHomeActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyHomeActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilySearchActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilySearchActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyListActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyManageActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyManageActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyCurrencyActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyCurrencyActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyMemberListActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyMemberListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyInfoActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyInfoActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyMemberSearchActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyMemberSearchActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.NimTeamMessageActivity"
+            android:name="com.bingchuang.app.team.view.NimTeamMessageActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.CreateTeamMessageActivity"
+            android:name="com.bingchuang.app.team.view.CreateTeamMessageActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.AddMemberActivity"
+            android:name="com.bingchuang.app.team.view.AddMemberActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.NimTeamManagementActivity"
+            android:name="com.bingchuang.app.team.view.NimTeamManagementActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.TeamMemberListActivity"
+            android:name="com.bingchuang.app.team.view.TeamMemberListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.TeamMemberSearchListActivity"
+            android:name="com.bingchuang.app.team.view.TeamMemberSearchListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.AddMemberSearchActivity"
+            android:name="com.bingchuang.app.team.view.AddMemberSearchActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.TeamWeeklyBillActivity"
+            android:name="com.bingchuang.app.team.view.TeamWeeklyBillActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.TeamWeeklyBillSearchActivity"
+            android:name="com.bingchuang.app.team.view.TeamWeeklyBillSearchActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".luckymoney.view.LuckyMoneyCreationActivity"
+            android:name="com.bingchuang.app.luckymoney.view.LuckyMoneyCreationActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustPan" />
         <activity
-            android:name=".luckymoney.view.LuckyMoneyDetailActivity"
+            android:name="com.bingchuang.app.luckymoney.view.LuckyMoneyDetailActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" /> <!-- android:launchMode="singleTask" -->
         <activity
-            android:name=".family.view.activity.FamilyMemberCurrencyActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyMemberCurrencyActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".ErbanTakePhotoActivity"
+            android:name="com.bingchuang.app.ErbanTakePhotoActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".team.view.UpdateTeamNameActivity"
+            android:name="com.bingchuang.app.team.view.UpdateTeamNameActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilySelectFriendActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilySelectFriendActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyTextInputActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyTextInputActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".family.view.activity.FamilyGameListActivity"
+            android:name="com.bingchuang.app.family.view.activity.FamilyGameListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".treasure_box.activity.TreasureBoxActivity"
+            android:name="com.bingchuang.app.treasure_box.activity.TreasureBoxActivity"
             android:theme="@style/dialog_web_view_activity" />
         <activity
-            android:name=".treasure_box.activity.BoxRankingActivity"
+            android:name="com.bingchuang.app.treasure_box.activity.BoxRankingActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name=".treasure_box.activity.TreasureBoxHonourActivity"
+            android:name="com.bingchuang.app.treasure_box.activity.TreasureBoxHonourActivity"
             android:theme="@style/dialog_web_view_activity" />
         <activity android:name=".ui.setting.VerifyPhoneActivity" />
-        <activity android:name=".ui.setting.ModifyPwdActivity" />
+        <activity android:name="com.bingchuang.app.ui.setting.ModifyPwdActivity" />
         <activity
-            android:name=".ui.widget.LevelUpDialog"
+            android:name="com.bingchuang.app.ui.widget.LevelUpDialog"
             android:launchMode="singleTop"
             android:theme="@style/dialogactivity" />
-        <activity android:name=".home.activity.NewUserListActivity" />
+        <activity android:name="com.bingchuang.app.home.activity.NewUserListActivity" />
         <activity
-            android:name=".ui.widget.RecallDialog"
+            android:name="com.bingchuang.app.ui.widget.RecallDialog"
             android:screenOrientation="portrait"
             android:theme="@style/dialog_activity_close_inside" />
         <activity
-            android:name=".public_chat_hall.activity.PublicChatHallHomeActivity"
+            android:name="com.bingchuang.app.public_chat_hall.activity.PublicChatHallHomeActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/main_androidmanifest_028"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".public_chat_hall.activity.PublicChatHallAitFriendsActivity"
+            android:name="com.bingchuang.app.public_chat_hall.activity.PublicChatHallAitFriendsActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/main_androidmanifest_029"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.user.decorationsend.DecorationSendActivity"
+            android:name="com.bingchuang.app.ui.user.decorationsend.DecorationSendActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".avroom.activity.RoomRankListActivity"
+            android:name="com.bingchuang.app.avroom.activity.RoomRankListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".avroom.activity.RoomOnlineUserActivity"
+            android:name="com.bingchuang.app.avroom.activity.RoomOnlineUserActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".public_chat_hall.activity.PublicChatHallRelatedToMeActivity"
+            android:name="com.bingchuang.app.public_chat_hall.activity.PublicChatHallRelatedToMeActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".public_chat_hall.activity.AitFriendsSearchActivity"
+            android:name="com.bingchuang.app.public_chat_hall.activity.AitFriendsSearchActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".ui.login.ShowBindPhoneActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".avroom.activity.RoomTitleEditActivity"
+            android:name="com.bingchuang.app.avroom.activity.RoomTitleEditActivity"
             android:label="@string/title_room_title_edit"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".avroom.activity.CreatePKActivity"
+            android:name="com.bingchuang.app.avroom.activity.CreatePKActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".avroom.activity.RecordForPKActivity"
+            android:name="com.bingchuang.app.avroom.activity.RecordForPKActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.ModuleHallActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.ModuleHallActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.ModuleClanActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.ModuleClanActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.IncomeStatisticsActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.IncomeStatisticsActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.ClanIncomeActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.ClanIncomeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.SingleRoomIncomeActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.SingleRoomIncomeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.HallMemberListActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.HallMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.HallNameSettingActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.HallNameSettingActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.team.activity.CreateHallTeamActivity"
+            android:name="com.bingchuang.app.module_hall.team.activity.CreateHallTeamActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustNothing" />
         <activity
-            android:name=".module_hall.team.activity.SelectTeamMemberActivity"
+            android:name="com.bingchuang.app.module_hall.team.activity.SelectTeamMemberActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.team.activity.TeamInfoShowActivity"
+            android:name="com.bingchuang.app.module_hall.team.activity.TeamInfoShowActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".module_hall.team.activity.TeamEditActivity"
+            android:name="com.bingchuang.app.module_hall.team.activity.TeamEditActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".module_hall.hall.activity.RemoveMemberListActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.RemoveMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.AdminListActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.AdminListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.AdminAddActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.AdminAddActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.AuthSettingActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.AuthSettingActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.MemberSearchActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.MemberSearchActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".avroom.activity.CpRoomInviteActivity"
+            android:name="com.bingchuang.app.avroom.activity.CpRoomInviteActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.HallSearchActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.HallSearchActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.income.IncomeDetailActivity"
+            android:name="com.bingchuang.app.module_hall.income.IncomeDetailActivity"
             android:screenOrientation="portrait" /> <!-- 模厅 -->
         <activity
-            android:name=".module_hall.team.activity.HallTeamMessageActivity"
+            android:name="com.bingchuang.app.module_hall.team.activity.HallTeamMessageActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.team.activity.HTeamMemberListActivity"
+            android:name="com.bingchuang.app.module_hall.team.activity.HTeamMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
+            android:name="com.bingchuang.app.mentoring_relationship.activity.MentoringRelationshipActivity"
             android:label="@string/main_androidmanifest_030"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".avroom.recommendcard.MyRecommendCardActivity"
+            android:name="com.bingchuang.app.avroom.recommendcard.MyRecommendCardActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
+            android:name="com.bingchuang.app.room_chat.activity.NimRoomP2PMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
+            android:name="com.bingchuang.app.room_chat.activity.RoomMsgActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
+            android:name="com.bingchuang.app.room_chat.activity.RoomNewbieActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
+            android:name="com.bingchuang.app.room_chat.activity.RoomNewbieMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
+            android:name="com.bingchuang.app.room_chat.activity.RoomInviteFansActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"
+            android:name="com.bingchuang.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.bingchuang.app.room_chat.activity.NimHallTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name=".bills.activities.BillGiftIncomeGroupActivity"
+            android:name="com.bingchuang.app.bills.activities.BillGiftIncomeGroupActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".radish.activity.RadishRecordActivity"
+            android:name="com.bingchuang.app.radish.activity.RadishRecordActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".radish.signin.SignInActivity"
+            android:name="com.bingchuang.app.radish.signin.SignInActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".radish.task.activity.TaskCenterActivity"
+            android:name="com.bingchuang.app.radish.task.activity.TaskCenterActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.patriarch.PatriarchModeActivity"
+            android:name="com.bingchuang.app.ui.patriarch.PatriarchModeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.patriarch.PatriarchPwdActivity"
+            android:name="com.bingchuang.app.ui.patriarch.PatriarchPwdActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateVisible" />
         <activity
-            android:name=".guide.GuideActivity"
+            android:name="com.bingchuang.app.guide.GuideActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AVRoomTheme" />
         <activity
-            android:name=".audio.MyVoiceActivity"
+            android:name="com.bingchuang.app.audio.MyVoiceActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".audio.RecordingVoiceActivity"
+            android:name="com.bingchuang.app.audio.RecordingVoiceActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".audio.VoiceMatchActivity"
+            android:name="com.bingchuang.app.audio.VoiceMatchActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".miniworld.activity.MiniWorldGuestPageActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldGuestPageActivity"
             android:screenOrientation="portrait" /> <!-- 推荐位 -->
         <activity
-            android:name=".miniworld.activity.TopicMainActivity"
+            android:name="com.bingchuang.app.miniworld.activity.TopicMainActivity"
             android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
         <activity
-            android:name=".miniworld.activity.MiniWorldEditActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldEditActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".miniworld.activity.MiniWorldMemberListActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".miniworld.activity.MiniWorldTeamMessageActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldTeamMessageActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".miniworld.activity.MWTeamRoomMessageAct"
+            android:name="com.bingchuang.app.miniworld.activity.MWTeamRoomMessageAct"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name=".miniworld.activity.MiniWorldGroupThemeActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldGroupThemeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".miniworld.activity.MiniWorldActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".miniworld.activity.AllTopicActivity"
+            android:name="com.bingchuang.app.miniworld.activity.AllTopicActivity"
             android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
         <!-- 萝卜-签到-任务 -->
         <activity
-            android:name=".miniworld.activity.MiniWorldSearchActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldSearchActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".miniworld.activity.MiniWorldMainActivity"
+            android:name="com.bingchuang.app.miniworld.activity.MiniWorldMainActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".ui.im.friend.ActFriendList" />
+        <activity android:name="com.bingchuang.app.ui.im.friend.ActFriendList" />
         <activity
-            android:name=".bank_card.activity.BankCardListActivity"
+            android:name="com.bingchuang.app.bank_card.activity.BankCardListActivity"
             android:screenOrientation="portrait" /> <!-- 萝卜-签到-任务 -->
         <activity
-            android:name=".bank_card.activity.BankCardListUnbindActivity"
+            android:name="com.bingchuang.app.bank_card.activity.BankCardListUnbindActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bank_card.activity.BankCardBindActivity"
+            android:name="com.bingchuang.app.bank_card.activity.BankCardBindActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".bank_card.activity.AddBankCardAgreementActivity"
+            android:name="com.bingchuang.app.bank_card.activity.AddBankCardAgreementActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
+            android:name="com.bingchuang.app.sadmin.RoomSAdminManagerActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".home.activity.CommunityNoticeAct"
+            android:name="com.bingchuang.app.home.activity.CommunityNoticeAct"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".community.publish.view.PublishActivity"
+            android:name="com.bingchuang.app.community.publish.view.PublishActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustNothing" />
         <activity
-            android:name=".community.dynamic.view.DynamicDetailActivity"
+            android:name="com.bingchuang.app.community.dynamic.view.DynamicDetailActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".community.photo.PreviewPhotoActivity"
+            android:name="com.bingchuang.app.community.photo.PreviewPhotoActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".community.photo.BigPhotoActivity"
+            android:name="com.bingchuang.app.community.photo.BigPhotoActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.zhihu.matisse.ui.MatisseActivity"
@@ -792,63 +792,59 @@
             android:name="com.zhihu.matisse.internal.ui.SelectedPreviewActivity"
             android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
         <activity
-            android:name=".ui.wallet.sendgold.SendGoldActivity"
+            android:name="com.bingchuang.app.ui.wallet.sendgold.SendGoldActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".pay.activity.GiveGoldActivity"
+            android:name="com.bingchuang.app.pay.activity.GiveGoldActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".pay.activity.GiveGoldDetailActivity"
+            android:name="com.bingchuang.app.pay.activity.GiveGoldDetailActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".pay.activity.GiveGoldToUserActivity"
+            android:name="com.bingchuang.app.pay.activity.GiveGoldToUserActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".pay.activity.GiveGoldSearchActivity"
+            android:name="com.bingchuang.app.pay.activity.GiveGoldSearchActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".ui.setting.PrivacySettingActivity"
+            android:name="com.bingchuang.app.ui.setting.PrivacySettingActivity"
             android:screenOrientation="portrait" /> <!-- 银行卡列表 -->
         <activity
-            android:name=".ui.setting.NoticeSettingActivity"
+            android:name="com.bingchuang.app.ui.setting.NoticeSettingActivity"
             android:screenOrientation="portrait" /> <!-- 解除绑定银行卡 -->
         <activity
-            android:name=".ui.login.LoginActivity"
+            android:name="com.bingchuang.app.ui.login.LoginActivity"
             android:label="@string/main_androidmanifest_031"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" /> <!-- 绑定银行卡 -->
         <activity
-            android:name=".ui.webview.DialogWebViewActivity"
+            android:name="com.bingchuang.app.ui.webview.DialogWebViewActivity"
             android:theme="@style/dialog_web_view_activity"
             android:windowSoftInputMode="adjustPan" /> <!-- 隐私政策 -->
         <activity
-            android:name=".ui.webview.DatingRuleWebViewActivity"
+            android:name="com.bingchuang.app.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:name="com.bingchuang.app.ui.webview.TarotPayWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
         <activity
-            android:name=".ui.login.LoginPasswordActivity"
+            android:name="com.bingchuang.app.ui.login.LoginPasswordActivity"
             android:screenOrientation="portrait" /> <!-- 社区 -->
         <activity
             android:name=".ui.setting.ResetPasswordActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.SuperAdminManageActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.SuperAdminManageActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".module_hall.hall.activity.SuperAdminAddActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.SuperAdminAddActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".module_hall.hall.activity.SuperAdminRoomSetActivity" /> <!-- 知乎相册 -->
+        <activity android:name="com.bingchuang.app.module_hall.hall.activity.SuperAdminRoomSetActivity" /> <!-- 知乎相册 -->
         <activity
             android:name=".avroom.anotherroompk.RoomPKCreateActivity"
             android:theme="@style/dialog_web_view_activity"
@@ -875,10 +871,10 @@
             android:name=".ui.setting.PermissionGuideActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".vip.VipMainActivity"
+            android:name="com.bingchuang.app.vip.VipMainActivity"
             android:screenOrientation="portrait" /> <!-- 隐私设置 -->
         <activity
-            android:name=".vip.VipSettingActivity"
+            android:name="com.bingchuang.app.vip.VipSettingActivity"
             android:screenOrientation="portrait" /> <!-- 通知提醒设置 -->
         <activity
             android:name=".skill.activity.AddSkillActivity"
@@ -908,22 +904,22 @@
             android:name=".relation.cp.activity.CpInviteRecordActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".fansteam.FansTeamJoinActivity"
+            android:name="com.bingchuang.app.fansteam.FansTeamJoinActivity"
             android:theme="@style/dialog_web_view_activity" />
         <activity
-            android:name=".fansteam.FansTeamJoinedActivity"
+            android:name="com.bingchuang.app.fansteam.FansTeamJoinedActivity"
             android:theme="@style/dialog_web_view_activity" />
         <activity
-            android:name=".fansteam.FansTeamListActivity"
+            android:name="com.bingchuang.app.fansteam.FansTeamListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".shipantics.PullRadishActivity"
+            android:name="com.bingchuang.app.shipantics.PullRadishActivity"
             android:theme="@style/dialog_web_view_activity" />
         <activity
-            android:name=".shipantics.RadishRankingActivity"
+            android:name="com.bingchuang.app.shipantics.RadishRankingActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name=".AgentActivity"
+            android:name="com.bingchuang.app.AgentActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
@@ -932,27 +928,27 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeUCrop" />
         <activity
-            android:name=".earn.activity.EarnRecordActivity"
+            android:name="com.bingchuang.app.earn.activity.EarnRecordActivity"
             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=".earn.activity.ConvertDiamondActivity"
+            android:name="com.bingchuang.app.earn.activity.ConvertDiamondActivity"
             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=".earn.activity.EarnWithdrawActivity"
+            android:name="com.bingchuang.app.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 -->
         <activity
-            android:name=".earn.activity.BindWithdrawMsgActivity"
+            android:name="com.bingchuang.app.earn.activity.BindWithdrawMsgActivity"
             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=".earn.activity.GoldDetailActivity"
+            android:name="com.bingchuang.app.earn.activity.GoldDetailActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
@@ -972,12 +968,12 @@
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".audio.SoundSignatureActivity"
+            android:name="com.bingchuang.app.audio.SoundSignatureActivity"
             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=".module_hall.hall.activity.ExchangePermissionActivity"
+            android:name="com.bingchuang.app.module_hall.hall.activity.ExchangePermissionActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
@@ -992,7 +988,7 @@
             android:theme="@style/transparent_activity" />
 
         <activity
-            android:name=".ui.webview.FairyDialogWebViewActivity"
+            android:name="com.bingchuang.app.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" />
@@ -1091,7 +1087,11 @@
         </activity>
 
         <activity android:name=".avroom.room_album.RoomAlbumActivity" />
-
+        <activity android:name=".other.OtherActivity"/>
+        <activity android:name=".other.OtherMomentActivity"/>
+        <activity android:name=".other.OtherMusicActivity"/>
+        <activity android:name=".other.OtherRoomActivity"/>
+        <activity android:name=".other.OtherUserInfoActivity"/>
     </application>
 
 </manifest>

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/bingchuang/app/AgentActivity.java

@@ -0,0 +1,117 @@
+package com.bingchuang.app;
+
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Build;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.netease.nim.uikit.common.util.log.LogUtil;
+import com.bingchuang.app.other.activity.SplashActivity;
+import com.bingchuang.core.linked.LinkedModel;
+import com.bingchuang.core.linked.bean.LinkedInfo;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.utils.TextUtils;
+
+import java.util.HashMap;
+import java.util.List;
+
+public class AgentActivity extends AppCompatActivity {
+
+
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+//        MobLink.updateNewIntent(getIntent(), this);
+    }
+//
+//    @Override
+//    public void onReturnSceneData(Scene scene) {
+//
+//        try {
+//            HashMap<String, Object> hashMap = scene.getParams();
+//
+//            LogUtil.print("linkedme", hashMap);
+//            //根据key获取传入的参数的值,该key关键字View可为任意值,由集成方规定,请与web端商议,一致即可
+//            LinkedInfo linkedInfo = new LinkedInfo();
+//            String roomuid = (String) hashMap.get("roomuid");
+//            String uid = (String) hashMap.get("uid");
+//            String type = String.valueOf(hashMap.get("type"));
+//            String familyId = (String) hashMap.get("familyId");
+//            String url = (String) hashMap.get("url");
+//            String worldId = (String) hashMap.get("worldId");
+//            String dynamicId = (String) hashMap.get("dynamicId");
+//            String inviteCode = (String) hashMap.get("inviteCode");
+//            if (roomuid != null) {
+//                linkedInfo.setRoomUid(roomuid);
+//            }
+//            if (TextUtils.isEmptyText(roomuid) && uid != null) {
+//                linkedInfo.setRoomUid(uid);
+//            }
+//            if (uid != null) {
+//                linkedInfo.setUid(uid);
+//            }
+//            linkedInfo.setType(type);
+//            if (familyId != null) {
+//                linkedInfo.setFamilyId(familyId);
+//            }
+//            if (url != null) {
+//                linkedInfo.setUrl(url);
+//            }
+//            if (worldId != null) {
+//                linkedInfo.setWorldId(worldId);
+//            }
+//            if (dynamicId != null) {
+//                linkedInfo.setDynamicId(dynamicId);
+//            }
+//
+//            linkedInfo.setInviteCode(inviteCode);
+//
+//            LinkedModel.get().setLinkedInfo(linkedInfo);
+//
+//        } catch (Exception e) {
+//        }
+//
+//
+//        if (isExistMainActivity(MainActivity.class) && UserModel.get().getCacheLoginUserInfo() != null) {//应用已开启&用户信息以获取
+//            MainActivity.handleLinkedJump(this);
+//        } else {//应用未开启
+//            SplashActivity.start(this);
+//        }
+//        finish();
+//    }
+
+    public boolean isExistMainActivity(Class<?> activity) {
+        try {
+            Intent intent = new Intent(this, activity);
+            ComponentName cmpName = intent.resolveActivity(getPackageManager());
+            boolean flag = false;
+            if (cmpName != null) {
+                ActivityManager am = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    List<ActivityManager.AppTask> taskInfoList = am.getAppTasks();
+                    for (ActivityManager.AppTask taskInfo : taskInfoList) {
+                        if (taskInfo.getTaskInfo().baseActivity.equals(cmpName)) {
+                            flag = true;
+                            break;
+                        }
+                    }
+                } else {
+                    List<ActivityManager.RunningTaskInfo> taskInfoList = am.getRunningTasks(10);
+                    for (ActivityManager.RunningTaskInfo taskInfo : taskInfoList) {
+                        if (taskInfo.baseActivity.equals(cmpName)) {
+                            flag = true;
+                            break;
+                        }
+                    }
+                }
+
+            }
+            return flag;
+        } catch (Throwable e) {
+            return false;
+        }
+
+    }
+}

app/src/main/java/com/bingchuang/app/ErbanTakePhotoActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban;
+package com.bingchuang.app;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,8 +9,9 @@ import com.jph.takephoto.app.TakePhotoActivity;
 import com.jph.takephoto.compress.CompressConfig;
 import com.jph.takephoto.model.CropOptions;
 import com.jph.takephoto.model.TResult;
-import com.yizhuan.erban.common.permission.PermissionActivity;
-import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;
+import com.bingchuang.app.common.permission.PermissionActivity;
+import com.bingchuang.app.R;
+import com.bingchuang.library.utils.file.JXFileUtils;
 
 import java.io.File;
 

app/src/main/java/com/bingchuang/app/GuideAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban;
+package com.bingchuang.app;
 
 import android.content.Context;
 import android.view.View;

app/src/main/java/com/bingchuang/app/MainActivity.java

@@ -1,6 +1,6 @@
-package com.yizhuan.erban;
+package com.bingchuang.app;
 
-import static com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
+import static com.bingchuang.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -37,90 +37,90 @@ import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum;
 import com.netease.nimlib.sdk.team.model.Team;
 import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
 import com.orhanobut.logger.Logger;
-import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
+import com.bingchuang.app.upgrade.AppUpgradeHelper;
+import com.bingchuang.core.settings.SettingsModel;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.erban.application.IReportConstants;
-import com.yizhuan.erban.application.ReportManager;
-import com.yizhuan.erban.application.XChatApplication;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.common.widget.DragLayout;
-import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
-import com.yizhuan.erban.community.publish.view.PublishActivity;
-import com.yizhuan.erban.community.square.SquareFragment;
-import com.yizhuan.erban.family.view.activity.FamilyHomeActivity;
-import com.yizhuan.erban.home.HomeViewModel;
-import com.yizhuan.erban.home.dialog.NewUserHelloDialog;
-import com.yizhuan.erban.home.dialog.ProtocolUpdateDialog;
-import com.yizhuan.erban.home.fragment.ContactsListFragment;
-import com.yizhuan.erban.home.fragment.HomeFragment;
-import com.yizhuan.erban.home.fragment.MeFragment;
-import com.yizhuan.erban.home.presenter.MainPresenter;
-import com.yizhuan.erban.home.view.IMainView;
-import com.yizhuan.erban.home.widget.AnchorCardView;
-import com.yizhuan.erban.main.helper.NoticationsUiHelper;
-import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity;
-import com.yizhuan.erban.module.Extras;
-import com.yizhuan.erban.module_hall.secretcode.PwdCodeMgr;
-import com.yizhuan.erban.service.DaemonService;
-import com.yizhuan.erban.ui.im.ImInitHelper;
-import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
-import com.yizhuan.erban.ui.login.BindPhoneActivity;
-import com.yizhuan.erban.ui.login.LoginActivity;
-import com.yizhuan.erban.ui.login.LoginBoundAuthCodeActivity;
-import com.yizhuan.erban.ui.login.fragment.AddUserInfoFragment;
-import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
-import com.yizhuan.erban.ui.patriarch.help.PmDialogShowMrg;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
-import com.yizhuan.erban.ui.widget.LivingIconView;
-import com.yizhuan.erban.ui.widget.MainTabLayout;
-import com.yizhuan.erban.utils.CleanLeakUtils;
-import com.yizhuan.erban.utils.PushMessageHandler;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.auth.event.KickOutEvent;
-import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
-import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
-import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel;
-import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent;
-import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent;
-import com.yizhuan.xchat_android_core.home.bean.MainTabType;
-import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent;
-import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent;
-import com.yizhuan.xchat_android_core.home.model.GameHomeModel;
-import com.yizhuan.xchat_android_core.home.model.HomeModel;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.linked.LinkedModel;
-import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.manager.IMBroadcastManager;
-import com.yizhuan.xchat_android_core.manager.IMMessageManager;
-import com.yizhuan.xchat_android_core.manager.RoomEvent;
-import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent;
-import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent;
-import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
-import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
-import com.yizhuan.xchat_android_core.user.event.NeedBindPhoneEvent;
-import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
-import com.yizhuan.xchat_android_core.user.event.NeedVerifyBoundAuthCodeEvent;
-import com.yizhuan.xchat_android_core.utils.CoreLogger;
-import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.utils.StringFormatUtils;
-import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.application.IReportConstants;
+import com.bingchuang.app.application.ReportManager;
+import com.bingchuang.app.application.App;
+import com.bingchuang.app.avroom.activity.AVRoomActivity;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.app.common.widget.DragLayout;
+import com.bingchuang.app.community.dynamic.view.DynamicDetailActivity;
+import com.bingchuang.app.community.publish.view.PublishActivity;
+import com.bingchuang.app.community.square.SquareFragment;
+import com.bingchuang.app.family.view.activity.FamilyHomeActivity;
+import com.bingchuang.app.home.HomeViewModel;
+import com.bingchuang.app.home.dialog.NewUserHelloDialog;
+import com.bingchuang.app.home.dialog.ProtocolUpdateDialog;
+import com.bingchuang.app.home.fragment.ContactsListFragment;
+import com.bingchuang.app.home.fragment.HomeFragment;
+import com.bingchuang.app.home.fragment.MeFragment;
+import com.bingchuang.app.home.presenter.MainPresenter;
+import com.bingchuang.app.home.view.IMainView;
+import com.bingchuang.app.home.widget.AnchorCardView;
+import com.bingchuang.app.main.helper.NoticationsUiHelper;
+import com.bingchuang.app.miniworld.activity.MiniWorldGuestPageActivity;
+import com.bingchuang.app.module.Extras;
+import com.bingchuang.app.module_hall.secretcode.PwdCodeMgr;
+import com.bingchuang.app.service.DaemonService;
+import com.bingchuang.app.ui.im.ImInitHelper;
+import com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity;
+import com.bingchuang.app.ui.login.BindPhoneActivity;
+import com.bingchuang.app.ui.login.LoginActivity;
+import com.bingchuang.app.ui.login.LoginBoundAuthCodeActivity;
+import com.bingchuang.app.ui.login.fragment.AddUserInfoFragment;
+import com.bingchuang.app.ui.patriarch.help.LimitEnterRoomHelper;
+import com.bingchuang.app.ui.patriarch.help.PmDialogShowMrg;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.utils.ImageLoadUtilsV2;
+import com.bingchuang.app.ui.webview.CommonWebViewActivity;
+import com.bingchuang.app.ui.widget.LivingIconView;
+import com.bingchuang.app.ui.widget.MainTabLayout;
+import com.bingchuang.app.utils.CleanLeakUtils;
+import com.bingchuang.app.utils.PushMessageHandler;
+import com.bingchuang.core.Constants;
+import com.bingchuang.core.DemoCache;
+import com.bingchuang.core2.UriProvider;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.auth.event.KickOutEvent;
+import com.bingchuang.core.auth.event.LoginEvent;
+import com.bingchuang.core.auth.event.LogoutEvent;
+import com.bingchuang.core.channel_page.model.ChannelPageModel;
+import com.bingchuang.core.community.event.SquareTaskEvent;
+import com.bingchuang.core.community.event.UnReadCountEvent;
+import com.bingchuang.core2.home.bean.MainTabType;
+import com.bingchuang.core2.home.event.RefreshHomeDataEvent;
+import com.bingchuang.core2.home.event.VisitorUnreadCountEvent;
+import com.bingchuang.core2.home.model.GameHomeModel;
+import com.bingchuang.core2.home.model.HomeModel;
+import com.bingchuang.core.initial.InitialModel;
+import com.bingchuang.core.linked.LinkedModel;
+import com.bingchuang.core.linked.bean.LinkedInfo;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.manager.IMBroadcastManager;
+import com.bingchuang.core.manager.IMMessageManager;
+import com.bingchuang.core.manager.RoomEvent;
+import com.bingchuang.core.patriarch.event.CloseMinRoomEvent;
+import com.bingchuang.core.patriarch.event.ImPushMsgPmLimitTimeEvent;
+import com.bingchuang.core.patriarch.event.PmDismissAllLimitDialogEvent;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.core.user.event.LoadLoginUserInfoEvent;
+import com.bingchuang.core.user.event.LoginUserInfoUpdateEvent;
+import com.bingchuang.core.user.event.NeedBindPhoneEvent;
+import com.bingchuang.core.user.event.NeedCompleteInfoEvent;
+import com.bingchuang.core.user.event.NeedVerifyBoundAuthCodeEvent;
+import com.bingchuang.core.utils.CurrentTimeUtils;
+import com.bingchuang.core.utils.SharedPreferenceUtils;
+import com.bingchuang.core.utils.StringUtils;
+import com.bingchuang.core.utils.net.BeanObserver;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.threadmgr.ThreadPoolManager;
+import com.bingchuang.library.utils.JavaUtil;
+import com.bingchuang.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -284,6 +284,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         ThreadPoolManager.instance().init();
         IMBroadcastManager.get().onCreate();
         ImageLoadUtilsV2.init(context);
+        SettingsModel.get().checkSysAccount();
     }
 
     @Override
@@ -411,7 +412,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         }
         onParseIntent();
         handleNimIntent();
-        InitialModel.get().regionCheck();
     }
 
     private void onParseIntent() {
@@ -521,7 +521,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLoadLoginUserInfoEvent(LoadLoginUserInfoEvent event) {
         firstLoadedUserInfo();
-        InitialModel.get().regionCheck();
     }
 
     public void onLogout() {
@@ -569,7 +568,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
                 .subscribe(new BeanObserver<Boolean>() {
                     @Override
                     public void onErrorMsg(String error) {
-                        CoreLogger.info("isBoundAuthCode", error);
+                        com.bingchuang.core.utils.Logger.info("isBoundAuthCode", error);
                     }
 
                     @Override
@@ -821,8 +820,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         GameHomeModel.get().getRoomShortcut()
                 .compose(bindUntilEvent(ActivityEvent.DESTROY))
                 .subscribe(uid -> {
-                            if (StringFormatUtils.toLong(uid) != 0) {
-                                AVRoomActivity.start(context, StringFormatUtils.toLong(uid));
+                            if (StringUtils.toLong(uid) != 0) {
+                                AVRoomActivity.start(context, StringUtils.toLong(uid));
                             }
                         },
                         Throwable::printStackTrace);
@@ -861,7 +860,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onImPushMsgPmLimitTimeEvent(ImPushMsgPmLimitTimeEvent event) {
         //先判断Avroom存不存在，存在的话则不处理，avroom会处理
-        Activity reference = XChatApplication.gStack.getAvRoomActivity();
+        Activity reference = App.gStack.getAvRoomActivity();
         if (reference != null) {
             return;
         }

app/src/main/java/com/bingchuang/app/NimMiddleActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban;
+package com.bingchuang.app;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -10,19 +10,19 @@ import com.coorchice.library.utils.LogUtils;
 import com.netease.nimlib.sdk.NimIntent;
 import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.base.BaseActivity;
-import com.yizhuan.erban.radish.signin.SignInActivity;
-import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
-import com.yizhuan.erban.utils.PushMessageHandler;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomInviteFansAttachment;
-import com.yizhuan.xchat_android_library.utils.UIUtils;
+import com.bingchuang.app.avroom.activity.AVRoomActivity;
+import com.bingchuang.app.base.BaseActivity;
+import com.bingchuang.app.radish.signin.SignInActivity;
+import com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity;
+import com.bingchuang.app.ui.webview.CommonWebViewActivity;
+import com.bingchuang.app.utils.PushMessageHandler;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.im.custom.bean.CustomAttachment;
+import com.bingchuang.core.im.custom.bean.OpenRoomNotiAttachment;
+import com.bingchuang.core.im.custom.bean.OpenSignInAttachment;
+import com.bingchuang.core.im.custom.bean.RedPackageAttachment;
+import com.bingchuang.core.im.custom.bean.RoomInviteFansAttachment;
+import com.bingchuang.library.utils.UIUtils;
 
 import java.util.ArrayList;
 import java.util.Map;

app/src/main/java/com/bingchuang/app/UIHelper.java

@@ -1,22 +1,22 @@
-package com.yizhuan.erban;
+package com.bingchuang.app;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 
-import com.yizhuan.erban.audio.MyVoiceActivity;
-import com.yizhuan.erban.audio.RecordingVoiceActivity;
-import com.yizhuan.erban.audio.SoundSignatureActivity;
-import com.yizhuan.erban.ui.login.AddUserInfoActivity;
-import com.yizhuan.erban.ui.login.ModifyInfoActivity;
-import com.yizhuan.erban.ui.setting.SettingActivity;
-import com.yizhuan.erban.ui.user.activity.EditUserLabelActivity;
-import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
-import com.yizhuan.erban.ui.user.activity.UserInfoModifyActivity;
-import com.yizhuan.erban.ui.user.activity.UserModifyPhotosActivity;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.bingchuang.app.audio.MyVoiceActivity;
+import com.bingchuang.app.audio.RecordingVoiceActivity;
+import com.bingchuang.app.audio.SoundSignatureActivity;
+import com.bingchuang.app.ui.login.AddUserInfoActivity;
+import com.bingchuang.app.ui.login.ModifyInfoActivity;
+import com.bingchuang.app.ui.setting.SettingActivity;
+import com.bingchuang.app.ui.user.activity.EditUserLabelActivity;
+import com.bingchuang.app.ui.user.activity.UserInfoActivity;
+import com.bingchuang.app.ui.user.activity.UserInfoModifyActivity;
+import com.bingchuang.app.ui.user.activity.UserModifyPhotosActivity;
+import com.bingchuang.app.ui.webview.CommonWebViewActivity;
+import com.bingchuang.core2.UriProvider;
+import com.bingchuang.core.user.bean.UserInfo;
 
 
 /**
@@ -108,7 +108,7 @@ public class UIHelper {
 
     public static void showMonsterResult(Context context, String monsterId) {
         CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL +
-                "/repo/modules/monster/index.html?monsterId=" + monsterId);
+                "/peki/modules/monster/index.html?monsterId=" + monsterId);
     }
 
     public static void showLabelInfoAct(Activity mActivity, int requestCode) {
@@ -132,11 +132,11 @@ public class UIHelper {
      */
     public static void showRecommendPosH5(Context context) {
         String cardUrl = UriProvider.JAVA_WEB_URL +
-                "/repo/modules/recommend-card/index.html";
+                "/peki/modules/recommend-card/index.html";
         CommonWebViewActivity.start(context, cardUrl);
     }
 
     public static void openContactUs(Context context) {
-        CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/repo/modules/contact/contact.html");
+        CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/peki/modules/contact/contact.html");
     }
 }

app/src/main/java/com/bingchuang/app/UserGuideActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban;
+package com.bingchuang.app;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,8 +8,9 @@ import android.widget.ImageView;
 
 import androidx.viewpager.widget.ViewPager;
 
-import com.yizhuan.erban.base.BaseActivity;
-import com.yizhuan.xchat_android_core.PreferencesUtils;
+import com.bingchuang.app.base.BaseActivity;
+import com.bingchuang.app.R;
+import com.bingchuang.core.PreferencesUtils;
 
 
 public class UserGuideActivity extends BaseActivity {

app/src/main/java/com/bingchuang/app/application/App.java

@@ -1,9 +1,8 @@
-package com.yizhuan.erban.application;
+package com.bingchuang.app.application;
 
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.graphics.Color;
@@ -16,15 +15,10 @@ import android.util.Log;
 import androidx.multidex.MultiDex;
 
 import com.bumptech.glide.request.target.ViewTarget;
-import com.chuhai.utils.LanguageUtils;
-import com.chuhai.utils.ServiceTime;
 import com.coorchice.library.utils.LogUtils;
 import com.facebook.stetho.Stetho;
 import com.hjq.toast.ToastUtils;
 import com.mob.MobSDK;
-import com.mob.moblink.MobLink;
-import com.mob.moblink.RestoreSceneListener;
-import com.mob.moblink.Scene;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nimlib.sdk.NIMClient;
@@ -40,61 +34,61 @@ import com.netease.nimlib.sdk.util.NIMUtil;
 import com.opensource.svgaplayer.SVGAParser;
 import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.Logger;
+import com.bingchuang.app.support.IMUserInfoProvider;
 import com.scwang.smartrefresh.header.MaterialHeader;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.tencent.vasdolly.helper.ChannelReaderUtil;
-import com.yizhuan.erban.AgentActivity;
-import com.yizhuan.erban.BuildConfig;
-import com.yizhuan.erban.NimMiddleActivity;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.common.app.ActivityStack;
-import com.yizhuan.erban.common.util.AppLifeCycleHelper;
-import com.yizhuan.erban.module_hall.HallDataManager;
-import com.yizhuan.erban.radish.wallet.RadishWalletManager;
-import com.yizhuan.erban.utils.PushMessageHandler;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.channel.ChannelModel;
-import com.yizhuan.xchat_android_core.family.model.FamilyModel;
-import com.yizhuan.xchat_android_core.gift.GiftModel;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor;
-import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor;
-import com.yizhuan.xchat_android_core.interceptor.TimeSyncInterceptor;
-import com.yizhuan.xchat_android_core.manager.IMMessageManager;
-import com.yizhuan.xchat_android_core.manager.IMSystemMsgManager;
-import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
-import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel;
-import com.yizhuan.xchat_android_core.pay.PayModel;
-import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel;
-import com.yizhuan.xchat_android_core.radish.RadishModel;
-import com.yizhuan.xchat_android_core.radish.signin.bean.ImNotice;
-import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.utils.net.ServerException;
-import com.yizhuan.xchat_android_library.common.application.BaseApp;
-import com.yizhuan.xchat_android_library.common.application.Env;
-import com.yizhuan.xchat_android_library.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.net.rxnet.converter.GsonConverterPlugins;
-import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
-import com.yizhuan.xchat_android_library.utils.AppUtils;
-import com.yizhuan.xchat_android_library.utils.DeviceUuidFactory;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.SystemUtils;
-import com.yizhuan.xchat_android_library.utils.VersionUtil;
-import com.yizhuan.xchat_android_library.utils.codec.MD5Utils;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.bingchuang.app.BuildConfig;
+import com.bingchuang.app.NimMiddleActivity;
+import com.bingchuang.app.R;
+import com.bingchuang.app.common.app.ActivityStack;
+import com.bingchuang.app.common.util.AppLifeCycleHelper;
+import com.bingchuang.app.module_hall.HallDataManager;
+import com.bingchuang.app.radish.wallet.RadishWalletManager;
+import com.bingchuang.app.utils.PushMessageHandler;
+import com.bingchuang.core2.XChatConstants;
+import com.bingchuang.core.Constants;
+import com.bingchuang.core.DemoCache;
+import com.bingchuang.core2.UriProvider;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.bean.response.ServiceResult;
+import com.bingchuang.core2.channel.ChannelModel;
+import com.bingchuang.core.family.model.FamilyModel;
+import com.bingchuang.core.gift.GiftModel;
+import com.bingchuang.core.im.custom.bean.CustomAttachment;
+import com.bingchuang.core.im.custom.bean.OpenSignInAttachment;
+import com.bingchuang.core.initial.InitialModel;
+import com.bingchuang.core.interceptor.NoParamsInterceptor;
+import com.bingchuang.core.interceptor.ParamsInterceptor;
+import com.bingchuang.core.interceptor.TimeSyncInterceptor;
+import com.bingchuang.core.manager.IMMessageManager;
+import com.bingchuang.core.manager.IMSystemMsgManager;
+import com.bingchuang.core2.market_verify.MarketVerifyModel;
+import com.bingchuang.core.mentoring_relationship.model.MentoringRelationshipModel;
+import com.bingchuang.core.pay.PayModel;
+import com.bingchuang.core.public_chat_hall.model.PublicChatHallModel;
+import com.bingchuang.core.radish.RadishModel;
+import com.bingchuang.core.radish.signin.bean.ImNotice;
+import com.bingchuang.core.room.face.DynamicFaceModel;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.user.event.NeedCompleteInfoEvent;
+import com.bingchuang.core.utils.SharedPreferenceUtils;
+import com.bingchuang.core.utils.net.ServerException;
+import com.bingchuang.library.common.application.BaseApp;
+import com.bingchuang.library.common.application.Env;
+import com.bingchuang.library.common.file.FileHelper;
+import com.bingchuang.library.net.rxnet.RxNet;
+import com.bingchuang.library.net.rxnet.converter.GsonConverterPlugins;
+import com.bingchuang.library.utils.AppMetaDataUtil;
+import com.bingchuang.library.utils.AppUtils;
+import com.bingchuang.library.utils.DeviceUuidFactory;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
+import com.bingchuang.library.utils.SystemUtils;
+import com.bingchuang.library.utils.VersionUtil;
+import com.bingchuang.library.utils.codec.MD5Utils;
+import com.bingchuang.library.utils.config.BasicConfig;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -113,12 +107,9 @@ import io.realm.RealmConfiguration;
  * @date 2017/2/11
  */
 
-public class XChatApplication extends BaseApp {
-    public static final String TAG = "XChatApplication";
+public class App extends BaseApp {
+    public static final String TAG = "App";
     public static Application gContext;
-
-    // 接收到退出登录事件（跳转到登录页了）
-    private static long logoutEventTime = 0;
     private static final MessageNotifierCustomization messageNotifierCustomization = new MessageNotifierCustomization() {
         @Override
         public String makeNotifyContent(String nick, IMMessage message) {
@@ -131,7 +122,7 @@ public class XChatApplication extends BaseApp {
                 }
             }
             // 采用SDK默认文案
-            return ResUtil.getString(R.string.erban_application_xchatapplication_01);
+            return ResUtil.getString(R.string.erban_application_01);
         }
 
         @Override
@@ -147,7 +138,7 @@ public class XChatApplication extends BaseApp {
                 }
             }
             // 采用SDK默认文案
-            return ResUtil.getString(R.string.erban_application_xchatapplication_02);
+            return ResUtil.getString(R.string.erban_application_02);
         }
 
         private String getContentFromOpenSignIn(CustomAttachment attachment) {
@@ -159,7 +150,7 @@ public class XChatApplication extends BaseApp {
                 }
             }
             if (TextUtils.isEmpty(result)) {
-                result = ResUtil.getString(R.string.erban_application_xchatapplication_03);
+                result = ResUtil.getString(R.string.erban_application_03);
             }
             return result;
         }
@@ -174,7 +165,7 @@ public class XChatApplication extends BaseApp {
             return null;
         }
     };
-    private static XChatApplication instance;
+    private static App instance;
     //生命周期监听
     private static AppLifeCycleHelper lifeCycleHelper;
     public static ActivityStack gStack = new ActivityStack();
@@ -193,7 +184,7 @@ public class XChatApplication extends BaseApp {
                 (context, layout) -> new ClassicsFooter(context).setDrawableSize(20));
     }
 
-    public static XChatApplication instance() {
+    public static App instance() {
         return instance;
     }
 
@@ -207,11 +198,10 @@ public class XChatApplication extends BaseApp {
 
         String channel = "";
         channel = ChannelReaderUtil.getChannel(instance);
-        Log.d(TAG, "localChannel:" + channel);
         if (TextUtils.isEmpty(channel)) {
             channel = Constants.GOOGLE;
         }
-        Log.d(TAG, "finalChannel:" + channel);
+
         BasicConfig.INSTANCE.setOriginalChannel(channel);
 
         BasicConfig.INSTANCE.setChannel(channel);
@@ -250,13 +240,6 @@ public class XChatApplication extends BaseApp {
                         SingleToastUtil.showToast(serviceResult.getMessage());
                         EventBus.getDefault().post(new NeedCompleteInfoEvent());
                         throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
-                    } else if (serviceResult.getCode() == 401) {
-                        if ((ServiceTime.INSTANCE.getTime() - logoutEventTime) > 800) {
-                            logoutEventTime = ServiceTime.INSTANCE.getTime();
-                            SingleToastUtil.showToast(serviceResult.getMessage());
-                            AuthModel.get().cleanLogInfo();
-                        }
-                        throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
                     }
                 }
                 return null;
@@ -292,21 +275,21 @@ public class XChatApplication extends BaseApp {
      * 初始化linkedMe
      */
     private static void initLinkedMe() {
-        MobSDK.init(instance, "36b91eeac7469", "63ec0702513aca17e20615dd5dfdc03f");
-        MobLink.setRestoreSceneListener(new RestoreSceneListener() {
-            @Override
-            public Class<? extends Activity> willRestoreScene(Scene scene) {
-                return AgentActivity.class;
-            }
-
-            @Override
-            public void completeRestore(Scene scene) {
-            }
-
-            @Override
-            public void notFoundScene(Scene scene) {
-            }
-        });
+        MobSDK.init(instance, "381f735395211", "5547946de29a5694162c2cf547edc5a7");
+//        MobLink.setRestoreSceneListener(new RestoreSceneListener() {
+//            @Override
+//            public Class<? extends Activity> willRestoreScene(Scene scene) {
+//                return AgentActivity.class;
+//            }
+//
+//            @Override
+//            public void completeRestore(Scene scene) {
+//            }
+//
+//            @Override
+//            public void notFoundScene(Scene scene) {
+//            }
+//        });
     }
 
 
@@ -412,11 +395,10 @@ public class XChatApplication extends BaseApp {
         httpParams.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
         httpParams.put("model", SystemUtils.getPhoneModel());
         httpParams.put("appVersion", VersionUtil.getLocalName(context));
-        httpParams.put("appVersionCode", String.valueOf(AppUtils.getVersionCode(context)));
+        httpParams.put("appVersionCode", String.valueOf(AppUtils.getVersionCode()));
         httpParams.put("deviceId", DeviceUuidFactory.getDeviceId(context));
         httpParams.put("androidId", MD5Utils.getMD5String(Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID)));
         httpParams.put("channel", AppMetaDataUtil.getChannelID());
-        httpParams.put("lang", LanguageUtils.INSTANCE.getSystemLanguage().toLanguageTag());
         RxNet.init(context)
                 .debug(BuildConfig.DEBUG)
                 .setBaseUrl(url)
@@ -494,7 +476,7 @@ public class XChatApplication extends BaseApp {
 
     private static void initNimUIKit() {
         // 初始化
-        NimUIKit.init(BasicConfig.INSTANCE.getAppContext());
+        NimUIKit.init(BasicConfig.INSTANCE.getAppContext(), new IMUserInfoProvider(), null);
     }
 
     /**

app/src/main/java/com/bingchuang/app/application/GlobalHandleManager.java

@@ -1,27 +1,27 @@
-package com.yizhuan.erban.application;
+package com.bingchuang.app.application;
 
 import android.app.Activity;
 
-import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
+import com.bingchuang.app.upgrade.AppUpgradeHelper;
 import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
-import com.yizhuan.erban.avroom.newuserchargegift.NewUserChargePrizeDialog;
-import com.yizhuan.erban.relation.cp.dialog.CpGlobalDialog;
-import com.yizhuan.erban.ui.widget.LevelUpDialog;
-import com.yizhuan.erban.ui.widget.RecallDialog;
-import com.yizhuan.erban.ui.widget.lottery_dialog.LotteryDialogManager;
-import com.yizhuan.erban.vip.dialog.VipUpgradeDialog;
-import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo;
-import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent;
-import com.yizhuan.xchat_android_core.level.event.LevelUpEvent;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent;
-import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo;
-import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent;
-import com.yizhuan.xchat_android_core.relation.cp.bean.CpInviteInfo;
-import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent;
+import com.bingchuang.app.avroom.newuserchargegift.NewUserChargePrizeDialog;
+import com.bingchuang.app.relation.cp.dialog.CpGlobalDialog;
+import com.bingchuang.app.ui.widget.LevelUpDialog;
+import com.bingchuang.app.ui.widget.RecallDialog;
+import com.bingchuang.app.vip.dialog.VipUpgradeDialog;
+import com.bingchuang.app.ui.widget.lottery_dialog.LotteryDialogManager;
+import com.bingchuang.core.activity.bean.LotteryInfo;
+import com.bingchuang.core.level.event.CharmLevelUpEvent;
+import com.bingchuang.core.level.event.LevelUpEvent;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.pay.event.NewUserChargeEvent;
+import com.bingchuang.core.recall.bean.CheckLostUserInfo;
+import com.bingchuang.core.recall.event.CheckLostUserEvent;
+import com.bingchuang.core.relation.cp.CpInviteInfo;
+import com.bingchuang.core.upgrade.event.ImPushUpdateAppEvent;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.utils.SharedPreferenceUtils;
+import com.bingchuang.core.vip.VipUpgradeEvent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -50,7 +50,7 @@ public class GlobalHandleManager {
     }
 
     public Activity getActivity() {
-        return XChatApplication.gStack.getTopActivity();
+        return App.gStack.getTopActivity();
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

app/src/main/java/com/bingchuang/app/application/IReportConstants.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.application;
+package com.bingchuang.app.application;
 
 /**
  * Created by wushaocheng on 2022/11/10.

app/src/main/java/com/bingchuang/app/application/IReportService.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.application;
+package com.bingchuang.app.application;
 
 import android.os.Bundle;
 

app/src/main/java/com/bingchuang/app/application/ReportManager.java

@@ -0,0 +1,124 @@
+package com.bingchuang.app.application;
+
+import android.os.Bundle;
+
+//import com.adjust.sdk.Adjust;
+//import com.adjust.sdk.AdjustConfig;
+//import com.adjust.sdk.AdjustEvent;
+//import com.adjust.sdk.LogLevel;
+//import com.google.firebase.analytics.FirebaseAnalytics;
+//import com.google.firebase.crashlytics.FirebaseCrashlytics;
+
+import java.util.Map;
+
+/**
+ * 统一埋点事件
+ * create by lvzebiao @2019/8/14
+ */
+public class ReportManager implements IReportService {
+
+    private static final String TAG = "ReportManager";
+
+    private ReportManager() {
+    }
+
+    private static final class Helper {
+        private static final ReportManager INSTANCE = new ReportManager();
+    }
+
+    public static ReportManager get() {
+        return Helper.INSTANCE;
+    }
+
+    public void init() {
+//        initFirebase();
+//        initAdjust();
+    }
+
+    /**
+     * 初始化Firebase相关库
+     */
+    private void initFirebase() {
+        // FirebaseCrashlytics注册公共属性
+//        FirebaseCrashlytics.getInstance().setCustomKey(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID());
+//        // FirebaseAnalytics注册公共属性
+//        Bundle params = new Bundle();
+//        if (AuthModel.get().getCurrentUid() != 0) {
+//            params.putLong(IReportConstants.UID, AuthModel.get().getCurrentUid());
+//        }
+//        params.putString(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID());
+//        setFirebaseAnalyticsDefaultEventParameters(params);
+    }
+
+    //Adjust初始化
+    private void initAdjust() {
+//        String appToken = XChatConstants.ADJUST_APP_TOKEN;
+//        String environment;
+//        if (XChatApplication.isDebug()) {
+//            environment = AdjustConfig.ENVIRONMENT_SANDBOX;
+//        } else {
+//            environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
+//        }
+//        AdjustConfig config = new AdjustConfig(XChatApplication.instance(), appToken, environment);
+//        config.setLogLevel(LogLevel.WARN);
+//        Adjust.onCreate(config);
+    }
+
+    /**
+     * 设置FirebaseAnalytics公共属性
+     *
+     * @param bundle 公共属性
+     */
+    @Override
+    public void setFirebaseAnalyticsDefaultEventParameters(Bundle bundle) {
+//        if (bundle != null) {
+//            FirebaseAnalytics.getInstance(XChatApplication.instance()).setDefaultEventParameters(bundle);
+//        }
+    }
+
+    /**
+     * 埋点，不需要上报网络质量和事件耗时
+     *
+     * @param eventId 事件名称
+     */
+    @Override
+    public void reportEvent(String eventId) {
+        reportEvent(eventId, null);
+    }
+
+    /**
+     * 埋点
+     *
+     * @param eventId 事件名称
+     * @param map     事件参数和值
+     */
+    @Override
+    public void reportEvent(String eventId, Map<String, Object> map) {
+//        try {
+//            Logger.i(TAG, "reportEvent: eventId=%s, map=%s", eventId, new Gson().toJson(map));
+//            Bundle bundle = null;
+//            if (map != null) {
+//                bundle = new Bundle();
+//                for (Map.Entry<String, Object> item : map.entrySet()) {
+//                    String key = item.getKey();
+//                    Object value = item.getValue();
+//                    if (!TextUtils.isEmpty(key) && value != null) {
+//                        bundle.putString(key, String.valueOf(value));
+//                    }
+//                }
+//            }
+//            //所有事件都上报到Google Analytics
+//            FirebaseAnalytics.getInstance(XChatApplication.instance()).logEvent(eventId, bundle);
+//        } catch (Exception e) {
+//            Logger.e(TAG, "reportEvent", e);
+//        }
+    }
+
+    @Override
+    public void reportAdjustEvent(String eventId) {
+//        AdjustEvent adjustEvent = new AdjustEvent(eventId);
+//        Adjust.trackEvent(adjustEvent);
+    }
+
+
+}

app/src/main/java/com/bingchuang/app/audio/AudioRecordActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio;
+package com.bingchuang.app.audio;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -12,20 +12,20 @@ import com.netease.nimlib.sdk.media.player.OnPlayListener;
 import com.netease.nimlib.sdk.media.record.AudioRecorder;
 import com.netease.nimlib.sdk.media.record.IAudioRecordCallback;
 import com.netease.nimlib.sdk.media.record.RecordType;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.base.BaseViewBindingActivity;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.erban.databinding.ActivityAudiorecordBinding;
-import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.file.FileModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.bingchuang.app.R;
+import com.bingchuang.app.base.BaseViewBindingActivity;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.app.databinding.ActivityAudiorecordBinding;
+import com.bingchuang.core.audio.AudioPlayAndRecordManager;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.file.FileModel;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.model.AvRoomModel;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.log.MLog;
 
 import java.io.File;
 

app/src/main/java/com/bingchuang/app/audio/MyVoiceActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio;
+package com.bingchuang.app.audio;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -10,21 +10,22 @@ import android.view.View;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.UIHelper;
-import com.yizhuan.erban.audio.adapter.MyVoiceListAdapter;
-import com.yizhuan.erban.audio.helper.AudioPlayerHelper;
-import com.yizhuan.erban.audio.presenter.MyVoicePresenter;
-import com.yizhuan.erban.audio.view.IMyVoiceView;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.common.NoDataFragment;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration;
-import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.bingchuang.app.audio.adapter.MyVoiceListAdapter;
+import com.bingchuang.app.audio.helper.AudioPlayerHelper;
+import com.bingchuang.app.audio.helper.OnPlayListener;
+import com.bingchuang.app.audio.presenter.MyVoicePresenter;
+import com.bingchuang.app.audio.view.IMyVoiceView;
+import com.bingchuang.app.R;
+import com.bingchuang.app.UIHelper;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.NoDataFragment;
+import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.bingchuang.app.ui.widget.recyclerview.decoration.HorizontalDecoration;
+import com.bingchuang.core2.audio.bean.UserVoiceInfo;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.log.MLog;
 
 import java.util.List;
 
@@ -98,7 +99,7 @@ public class MyVoiceActivity extends BaseMvpActivity<IMyVoiceView, MyVoicePresen
     private void playVoice(String voice) {
 //        AudioEngineManager.get().setOpenVoiceMatchActivity(true);
 //        PlayerModel.get().pause();
-        AudioPlayerHelper.get().playInThread(voice, new com.yizhuan.erban.audio.helper.OnPlayListener() {
+        AudioPlayerHelper.get().playInThread(voice, new OnPlayListener() {
             @Override
             public void onError(String error) {
                 if (adapter != null) {

app/src/main/java/com/bingchuang/app/audio/RecordingVoiceActivity.java

@@ -1,8 +1,8 @@
-package com.yizhuan.erban.audio;
+package com.bingchuang.app.audio;
 
-import static com.yizhuan.erban.audio.presenter.RecordingVoicePresenter.STATE_RECORD_NORMAL;
-import static com.yizhuan.erban.audio.presenter.RecordingVoicePresenter.STATE_RECORD_RECORDING;
-import static com.yizhuan.erban.audio.presenter.RecordingVoicePresenter.STATE_RECORD_SUCCESS;
+import static com.bingchuang.app.audio.presenter.RecordingVoicePresenter.STATE_RECORD_NORMAL;
+import static com.bingchuang.app.audio.presenter.RecordingVoicePresenter.STATE_RECORD_RECORDING;
+import static com.bingchuang.app.audio.presenter.RecordingVoicePresenter.STATE_RECORD_SUCCESS;
 
 import android.Manifest;
 import android.animation.Animator;
@@ -28,24 +28,24 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.audio.adapter.CardAdapter;
-import com.yizhuan.erban.audio.helper.AudioPlayerHelper;
-import com.yizhuan.erban.audio.presenter.RecordingVoicePresenter;
-import com.yizhuan.erban.audio.view.IRecordingVoiceView;
-import com.yizhuan.erban.audio.widget.OnSwipeListener;
-import com.yizhuan.erban.audio.widget.RingProgressView;
-import com.yizhuan.erban.audio.widget.VoiceCardConfig;
-import com.yizhuan.erban.audio.widget.VoiceCardItemTouchHelperCallback;
-import com.yizhuan.erban.audio.widget.VoiceCardLayoutManager;
-import com.yizhuan.erban.audio.widget.VoiceCardRecyclerView;
-import com.yizhuan.erban.audio.widget.VoiceWave;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
-import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.audio.adapter.CardAdapter;
+import com.bingchuang.app.audio.helper.AudioPlayerHelper;
+import com.bingchuang.app.audio.presenter.RecordingVoicePresenter;
+import com.bingchuang.app.audio.view.IRecordingVoiceView;
+import com.bingchuang.app.audio.widget.OnSwipeListener;
+import com.bingchuang.app.audio.widget.RingProgressView;
+import com.bingchuang.app.audio.widget.VoiceCardConfig;
+import com.bingchuang.app.audio.widget.VoiceCardItemTouchHelperCallback;
+import com.bingchuang.app.audio.widget.VoiceCardLayoutManager;
+import com.bingchuang.app.audio.widget.VoiceCardRecyclerView;
+import com.bingchuang.app.audio.widget.VoiceWave;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.core2.audio.bean.VoiceCardInfo;
+import com.bingchuang.core.room.model.AvRoomModel;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

app/src/main/java/com/bingchuang/app/audio/SoundSignatureActivity.kt

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio
+package com.bingchuang.app.audio
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -17,17 +17,17 @@ import com.opensource.svgaplayer.SVGADrawable
 import com.opensource.svgaplayer.SVGAImageView
 import com.opensource.svgaplayer.SVGAParser
 import com.opensource.svgaplayer.SVGAVideoEntity
-import com.yizhuan.erban.R
-import com.yizhuan.erban.audio.helper.AudioPlayerHelper
-import com.yizhuan.erban.audio.viewmodel.SoundViewModel
-import com.yizhuan.erban.base.BaseViewBindingActivity
-import com.yizhuan.erban.databinding.ActivitySoundSignatureBinding
-import com.yizhuan.erban.ui.widget.dialog.CommonDialog
-import com.yizhuan.xchat_android_core.file.FileModel
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.user.bean.UserInfo.SoundBean
-import com.yizhuan.xchat_android_library.utils.ResUtil
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
+import com.bingchuang.app.audio.helper.AudioPlayerHelper
+import com.bingchuang.app.audio.viewmodel.SoundViewModel
+import com.bingchuang.app.base.BaseViewBindingActivity
+import com.bingchuang.app.databinding.ActivitySoundSignatureBinding
+import com.bingchuang.app.ui.widget.dialog.CommonDialog
+import com.bingchuang.core.file.FileModel
+import com.bingchuang.core.manager.AvRoomDataManager
+import com.bingchuang.core.user.bean.UserInfo.SoundBean
+import com.bingchuang.library.utils.ResUtil
+import com.bingchuang.library.utils.SingleToastUtil
+import com.bingchuang.app.R
 import io.reactivex.SingleObserver
 import io.reactivex.disposables.Disposable
 import java.util.*

app/src/main/java/com/bingchuang/app/audio/VoiceMatchActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio;
+package com.bingchuang.app.audio;
 
 import android.content.Context;
 import android.content.Intent;
@@ -14,36 +14,36 @@ import android.widget.TextView;
 
 import com.opensource.svgaplayer.SVGACallback;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.UIHelper;
-import com.yizhuan.erban.audio.helper.AudioPlayerHelper;
-import com.yizhuan.erban.audio.helper.OnPlayListener;
-import com.yizhuan.erban.audio.helper.OnRefreshListener;
-import com.yizhuan.erban.audio.helper.SvgaCacheManager;
-import com.yizhuan.erban.audio.helper.VmSoundManager;
-import com.yizhuan.erban.audio.helper.VoiceMacthHelper;
-import com.yizhuan.erban.audio.view.IBottleOpListener;
-import com.yizhuan.erban.audio.widget.VoiceBottleFilterGenderBottomDialog;
-import com.yizhuan.erban.audio.widget.VoiceLine;
-import com.yizhuan.erban.base.BaseViewBindingActivity;
-import com.yizhuan.erban.base.TitleBar;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.erban.databinding.ActivityVoiceMatchBinding;
-import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
-import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper;
-import com.yizhuan.xchat_android_core.audio.AudioModel;
-import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.music.model.PlayerModel;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_core.utils.ActivityUtil;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.UIHelper;
+import com.bingchuang.app.audio.helper.AudioPlayerHelper;
+import com.bingchuang.app.audio.helper.OnPlayListener;
+import com.bingchuang.app.audio.helper.OnRefreshListener;
+import com.bingchuang.app.audio.helper.SvgaCacheManager;
+import com.bingchuang.app.audio.helper.VmSoundManager;
+import com.bingchuang.app.audio.helper.VoiceMacthHelper;
+import com.bingchuang.app.audio.view.IBottleOpListener;
+import com.bingchuang.app.audio.widget.VoiceBottleFilterGenderBottomDialog;
+import com.bingchuang.app.audio.widget.VoiceLine;
+import com.bingchuang.app.base.BaseViewBindingActivity;
+import com.bingchuang.app.base.TitleBar;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.app.databinding.ActivityVoiceMatchBinding;
+import com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity;
+import com.bingchuang.app.ui.widget.higuide.TuTuGuideHelper;
+import com.bingchuang.core2.audio.AudioModel;
+import com.bingchuang.core2.audio.bean.HistoryVoiceInfo;
+import com.bingchuang.core2.audio.bean.VoiceMatchInfo;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.music.model.PlayerModel;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.core.utils.ActivityUtil;
+import com.bingchuang.core.utils.SharedPreferenceUtils;
+import com.bingchuang.core.utils.net.DontWarnObserver;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
 
 import java.util.List;
 import java.util.Locale;

app/src/main/java/com/bingchuang/app/audio/adapter/CardAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.adapter;
+package com.bingchuang.app.audio.adapter;
 
 import android.text.method.ScrollingMovementMethod;
 import android.view.LayoutInflater;
@@ -11,8 +11,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
+import com.bingchuang.app.R;
+import com.bingchuang.core2.audio.bean.VoiceCardInfo;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/bingchuang/app/audio/adapter/MyVoiceListAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.adapter;
+package com.bingchuang.app.audio.adapter;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,11 +10,11 @@ import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.audio.widget.VoiceLine;
-import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
-import com.yizhuan.xchat_android_core.utils.StringFormatUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.audio.widget.VoiceLine;
+import com.bingchuang.core2.audio.bean.UserVoiceInfo;
+import com.bingchuang.core.utils.StringUtils;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.util.List;
 import java.util.Locale;
@@ -105,7 +105,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter<UserVoiceInfo, BaseView
         });
         // 点击播放声音/停止声音
         helper.voiceBarLayout.setOnClickListener(view -> {
-            if (StringFormatUtils.isEmpty(item.getVoiceUrl())) {
+            if (StringUtils.isEmpty(item.getVoiceUrl())) {
                 return;
             }
             boolean isChange = helper.getAdapterPosition() != voiceClickPos;
@@ -140,7 +140,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter<UserVoiceInfo, BaseView
         });
         // 点击播放声音/停止声音
         helper.voiceBarLayout.setOnClickListener(view -> {
-            if (StringFormatUtils.isEmpty(item.getVoiceUrl())) {
+            if (StringUtils.isEmpty(item.getVoiceUrl())) {
                 return;
             }
             boolean isChange = helper.getAdapterPosition() != voiceClickPos;
@@ -177,7 +177,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter<UserVoiceInfo, BaseView
         });
         // 点击播放声音/停止声音
         helper.voiceBarLayout.setOnClickListener(view -> {
-            if (StringFormatUtils.isEmpty(item.getVoiceUrl())) {
+            if (StringUtils.isEmpty(item.getVoiceUrl())) {
                 return;
             }
             boolean isChange = helper.getAdapterPosition() != voiceClickPos;

app/src/main/java/com/bingchuang/app/audio/helper/AudioPlayerHelper.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.helper;
+package com.bingchuang.app.audio.helper;
 
 import android.annotation.SuppressLint;
 import android.media.AudioManager;
@@ -7,8 +7,8 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.io.IOException;
 

app/src/main/java/com/bingchuang/app/audio/helper/OnPlayListener.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.helper;
+package com.bingchuang.app.audio.helper;
 
 /**
  * create by lvzebiao @2019/6/17

app/src/main/java/com/bingchuang/app/audio/helper/OnRefreshListener.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.helper;
+package com.bingchuang.app.audio.helper;
 
 /**
  * create by lvzebiao @2019/6/11

app/src/main/java/com/bingchuang/app/audio/helper/SvgaCacheManager.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.helper;
+package com.bingchuang.app.audio.helper;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/com/bingchuang/app/audio/helper/VmSoundManager.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.helper;
+package com.bingchuang.app.audio.helper;
 
 
 import lombok.Getter;

app/src/main/java/com/bingchuang/app/audio/helper/VoiceMacthHelper.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.helper;
+package com.bingchuang.app.audio.helper;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;

app/src/main/java/com/bingchuang/app/audio/presenter/MyVoicePresenter.java

@@ -1,12 +1,12 @@
-package com.yizhuan.erban.audio.presenter;
+package com.bingchuang.app.audio.presenter;
 
-import com.yizhuan.erban.audio.view.IMyVoiceView;
-import com.yizhuan.erban.base.BaseMvpPresenter;
-import com.yizhuan.xchat_android_core.audio.AudioModel;
-import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_library.base.PresenterEvent;
+import com.bingchuang.app.audio.view.IMyVoiceView;
+import com.bingchuang.app.base.BaseMvpPresenter;
+import com.bingchuang.core2.audio.AudioModel;
+import com.bingchuang.core2.audio.bean.UserVoiceInfo;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.utils.net.DontWarnObserver;
+import com.bingchuang.library.base.PresenterEvent;
 
 import java.util.List;
 

app/src/main/java/com/bingchuang/app/audio/presenter/RecordingVoicePresenter.java

@@ -1,8 +1,4 @@
-package com.yizhuan.erban.audio.presenter;
-
-import static com.yizhuan.erban.audio.RecordingVoiceActivity.AUDIO_DURA;
-import static com.yizhuan.erban.audio.RecordingVoiceActivity.AUDIO_FILE;
-import static com.yizhuan.erban.audio.RecordingVoiceActivity.MIN_RECORD_VOICE_DURATION;
+package com.bingchuang.app.audio.presenter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,25 +9,26 @@ import android.util.Log;
 import com.netease.nimlib.sdk.media.record.AudioRecorder;
 import com.netease.nimlib.sdk.media.record.IAudioRecordCallback;
 import com.netease.nimlib.sdk.media.record.RecordType;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.audio.helper.AudioPlayerHelper;
-import com.yizhuan.erban.audio.helper.OnPlayListener;
-import com.yizhuan.erban.audio.view.IRecordingVoiceView;
-import com.yizhuan.erban.base.BaseMvpPresenter;
-import com.yizhuan.xchat_android_core.audio.AudioModel;
-import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager;
-import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.file.FileModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_library.base.PresenterEvent;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.bingchuang.app.audio.RecordingVoiceActivity;
+import com.bingchuang.app.audio.helper.AudioPlayerHelper;
+import com.bingchuang.app.audio.helper.OnPlayListener;
+import com.bingchuang.app.audio.view.IRecordingVoiceView;
+import com.bingchuang.app.R;
+import com.bingchuang.app.base.BaseMvpPresenter;
+import com.bingchuang.core2.audio.AudioModel;
+import com.bingchuang.core.audio.AudioPlayAndRecordManager;
+import com.bingchuang.core2.audio.bean.SaveVoiceSuccessResultInfo;
+import com.bingchuang.core2.audio.bean.VoiceCardInfo;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.file.FileModel;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.utils.net.DontWarnObserver;
+import com.bingchuang.library.base.PresenterEvent;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
+import com.bingchuang.library.utils.log.MLog;
 
 import java.io.File;
 import java.util.List;
@@ -301,8 +298,8 @@ public class RecordingVoicePresenter extends BaseMvpPresenter<IRecordingVoiceVie
 
                                 SingleToastUtil.showToast(ResUtil.getString(R.string.audio_presenter_recordingvoicepresenter_03));
                                 Intent intent = new Intent();
-                                intent.putExtra(AUDIO_FILE, audioUrl);
-                                intent.putExtra(AUDIO_DURA, audioDur);
+                                intent.putExtra(RecordingVoiceActivity.AUDIO_FILE, audioUrl);
+                                intent.putExtra(RecordingVoiceActivity.AUDIO_DURA, audioDur);
                                 getMvpView().finishView(intent);// 上传声音成功之后退出页面
                             } else {
                                 SingleToastUtil.showToast(error);
@@ -361,7 +358,7 @@ public class RecordingVoicePresenter extends BaseMvpPresenter<IRecordingVoiceVie
                         + "   dura:" + dura
                         + "   length:" + audioDur
                         + "   type:" + recordType.name());
-                if (audioDur < MIN_RECORD_VOICE_DURATION) {
+                if (audioDur < RecordingVoiceActivity.MIN_RECORD_VOICE_DURATION) {
                     recordFailWithDurationShort();// 时长小于5s：Toast提示录音时间太短
                 } else {
                     showRecordSuccessState();// 否则：【跳转到试听状态】

app/src/main/java/com/bingchuang/app/audio/view/BottleContainer.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.view;
+package com.bingchuang.app.audio.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -9,9 +9,9 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.bingchuang.core2.audio.bean.VoiceMatchInfo;
+import com.bingchuang.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/bingchuang/app/audio/view/BottleLayout.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.view;
+package com.bingchuang.app.audio.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -14,24 +14,24 @@ import androidx.annotation.NonNull;
 
 import com.coorchice.library.SuperTextView;
 import com.opensource.svgaplayer.SVGAImageView;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.UIHelper;
-import com.yizhuan.erban.audio.VoiceMatchActivity;
-import com.yizhuan.erban.audio.helper.OnPlayListener;
-import com.yizhuan.erban.audio.helper.SvgaCacheManager;
-import com.yizhuan.erban.audio.helper.VmSoundManager;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.bingchuang.app.audio.VoiceMatchActivity;
+import com.bingchuang.app.audio.helper.OnPlayListener;
+import com.bingchuang.app.audio.helper.SvgaCacheManager;
+import com.bingchuang.app.audio.helper.VmSoundManager;
+import com.bingchuang.app.R;
+import com.bingchuang.app.UIHelper;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.bingchuang.core2.XChatConstants;
+import com.bingchuang.core2.audio.bean.VoiceMatchInfo;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.utils.SharedPreferenceUtils;
+import com.bingchuang.core.utils.net.DontWarnObserver;
+import com.bingchuang.core.utils.net.RxHelper;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
+import com.bingchuang.library.utils.TimeUtils;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;

app/src/main/java/com/bingchuang/app/audio/view/IBottleOpListener.java

@@ -1,6 +1,6 @@
-package com.yizhuan.erban.audio.view;
+package com.bingchuang.app.audio.view;
 
-import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
+import com.bingchuang.core2.audio.bean.VoiceMatchInfo;
 
 /**
  * create by lvzebiao @2019/6/19

app/src/main/java/com/bingchuang/app/audio/view/IMyVoiceView.java

@@ -1,7 +1,7 @@
-package com.yizhuan.erban.audio.view;
+package com.bingchuang.app.audio.view;
 
-import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.bingchuang.core2.audio.bean.UserVoiceInfo;
+import com.bingchuang.library.base.IMvpBaseView;
 
 import java.util.List;
 

app/src/main/java/com/bingchuang/app/audio/view/IRecordingVoiceView.java

@@ -1,9 +1,9 @@
-package com.yizhuan.erban.audio.view;
+package com.bingchuang.app.audio.view;
 
 import android.content.Intent;
 
-import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
+import com.bingchuang.core2.audio.bean.VoiceCardInfo;
+import com.bingchuang.library.base.IMvpBaseView;
 
 import java.util.List;
 

app/src/main/java/com/bingchuang/app/audio/view/PlayLoadingImageView.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.view;
+package com.bingchuang.app.audio.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -8,8 +8,8 @@ import android.util.AttributeSet;
 
 import androidx.appcompat.widget.AppCompatImageView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
 
 import lombok.Setter;
 

app/src/main/java/com/bingchuang/app/audio/viewmodel/SoundViewModel.kt

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.viewmodel
+package com.bingchuang.app.audio.viewmodel
 
 import android.content.Intent
 import android.util.Log
@@ -6,22 +6,22 @@ import androidx.lifecycle.MutableLiveData
 import com.netease.nimlib.sdk.media.record.AudioRecorder
 import com.netease.nimlib.sdk.media.record.IAudioRecordCallback
 import com.netease.nimlib.sdk.media.record.RecordType
-import com.yizhuan.erban.R
-import com.yizhuan.erban.audio.SoundSignatureActivity
-import com.yizhuan.erban.audio.helper.AudioPlayerHelper
-import com.yizhuan.erban.audio.helper.OnPlayListener
-import com.yizhuan.erban.base.BaseViewModel
-import com.yizhuan.xchat_android_core.Constants
-import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager
-import com.yizhuan.xchat_android_core.auth.AuthModel
-import com.yizhuan.xchat_android_core.manager.AudioEngineManager
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.sound.model.SoundModel
-import com.yizhuan.xchat_android_core.utils.extension.toast
-import com.yizhuan.xchat_android_library.common.application.BaseApp
-import com.yizhuan.xchat_android_library.utils.ResUtil
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
-import com.yizhuan.xchat_android_library.utils.log.MLog
+import com.bingchuang.app.R
+import com.bingchuang.app.audio.SoundSignatureActivity
+import com.bingchuang.app.audio.helper.AudioPlayerHelper
+import com.bingchuang.app.audio.helper.OnPlayListener
+import com.bingchuang.app.base.BaseViewModel
+import com.bingchuang.core.Constants
+import com.bingchuang.core.audio.AudioPlayAndRecordManager
+import com.bingchuang.core.auth.AuthModel
+import com.bingchuang.core.manager.AvRoomDataManager
+import com.bingchuang.core2.sound.model.SoundModel
+import com.bingchuang.core.utils.toast
+import com.bingchuang.core2.manager.AudioEngineManager
+import com.bingchuang.library.common.application.BaseApp
+import com.bingchuang.library.utils.ResUtil
+import com.bingchuang.library.utils.SingleToastUtil
+import com.bingchuang.library.utils.log.MLog
 import java.io.File
 
 /**
@@ -339,7 +339,8 @@ class SoundViewModel : BaseViewModel() {
         if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
             AudioEngineManager.get().isRemoteMute = true //設置靜音
             AudioEngineManager.get().isMute = true //不能説話
-            AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_AUDIENCE)
+            AudioEngineManager.get().setRole(
+                Constants.CLIENT_ROLE_AUDIENCE)
         }
     }
 

app/src/main/java/com/bingchuang/app/audio/widget/DynamicWave.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.content.Context;
 import android.graphics.Canvas;

app/src/main/java/com/bingchuang/app/audio/widget/OnSwipeListener.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import androidx.recyclerview.widget.RecyclerView;
 

app/src/main/java/com/bingchuang/app/audio/widget/RingProgressView.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -11,7 +11,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.erban.R;
+import com.bingchuang.app.R;
 
 /**
  * 录制声音页面的环形进度条

app/src/main/java/com/bingchuang/app/audio/widget/RoundProgressView.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -11,7 +11,7 @@ import android.graphics.SweepGradient;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.yizhuan.erban.R;
+import com.bingchuang.app.R;
 
 public class RoundProgressView extends View {
     // 画实心圆的画笔

app/src/main/java/com/bingchuang/app/audio/widget/VoiceBottleFilterGenderBottomDialog.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -15,7 +15,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.yizhuan.erban.R;
+import com.bingchuang.app.R;
 
 /**
  * 声音瓶子.筛选性别Dialog

app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardConfig.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 /**
  * 录制声音页面.声音卡片滑动配置

app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardItemTouchHelperCallback.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.graphics.Canvas;
 import android.util.Log;
@@ -9,8 +9,8 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.library.utils.ResUtil;
 
 /**
  * 录制声音页面.声音卡片滑动列表ItemTouchHelperCallback

app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardLayoutManager.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.view.MotionEvent;
 import android.view.View;

app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardRecyclerView.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.content.Context;
 import android.graphics.Canvas;

app/src/main/java/com/bingchuang/app/audio/widget/VoiceLine.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -11,7 +11,7 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.erban.R;
+import com.bingchuang.app.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/bingchuang/app/audio/widget/VoiceWave.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.audio.widget;
+package com.bingchuang.app.audio.widget;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -11,7 +11,7 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.erban.R;
+import com.bingchuang.app.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/bingchuang/app/avroom/BottomViewListenerWrapper.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom;
+package com.bingchuang.app.avroom;
 
 /**
  * Created by chenran on 2017/11/21.

app/src/main/java/com/bingchuang/app/avroom/ButtonItemFactory.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom;
+package com.bingchuang.app.avroom;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -9,38 +9,38 @@ import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
 import com.orhanobut.logger.Logger;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.UIHelper;
-import com.yizhuan.erban.avroom.widget.ViewItem;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.erban.public_chat_hall.widget.ShutUpDialog;
-import com.yizhuan.erban.ui.im.avtivity.NimFriendModel;
-import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
-import com.yizhuan.erban.ui.widget.ButtonItem;
-import com.yizhuan.erban.ui.widget.GiftDialog;
-import com.yizhuan.erban.vip.util.VipHelper;
-import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
-import com.yizhuan.xchat_android_core.kick.KickModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
-import com.yizhuan.xchat_android_core.statistic.StatLogKey;
-import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean;
-import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel;
-import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil;
-import com.yizhuan.xchat_android_core.super_admin.util.SaAttachmentFactory;
-import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.bingchuang.app.R;
+import com.bingchuang.app.UIHelper;
+import com.bingchuang.app.avroom.widget.ViewItem;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.app.public_chat_hall.widget.ShutUpDialog;
+import com.bingchuang.app.ui.im.avtivity.NimFriendModel;
+import com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity;
+import com.bingchuang.app.ui.widget.ButtonItem;
+import com.bingchuang.app.ui.widget.GiftDialog;
+import com.bingchuang.app.vip.util.VipHelper;
+import com.bingchuang.app.room_chat.activity.RoomMsgActivity;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.bean.RoomQueueInfo;
+import com.bingchuang.core.initial.InitialModel;
+import com.bingchuang.core.initial.bean.InitInfo;
+import com.bingchuang.core.kick.KickModel;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core2.manager.IMNetEaseManager;
+import com.bingchuang.core.public_chat_hall.manager.PublicChatHallDataManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.model.AvRoomModel;
+import com.bingchuang.core.statistic.StatLogKey;
+import com.bingchuang.core.admin.bean.KickOutExtBean;
+import com.bingchuang.core.admin.model.SuperAdminModel;
+import com.bingchuang.core.admin.util.SAdminOptUtil;
+import com.bingchuang.core.admin.util.SaAttachmentFactory;
+import com.bingchuang.core.admin.util.SuperAdminUtil;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.utils.JavaUtil;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
+import com.bingchuang.library.utils.config.BasicConfig;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/com/bingchuang/app/avroom/ChatMemberDiffUtilCallback.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom;
+package com.bingchuang.app.avroom;
 
 import androidx.recyclerview.widget.DiffUtil;
 

app/src/main/java/com/bingchuang/app/avroom/SoftKeyBoardListener.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom;
+package com.bingchuang.app.avroom;
 
 import android.app.Activity;
 import android.graphics.Rect;

app/src/main/java/com/bingchuang/app/avroom/UserCardButtonManager.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom;
+package com.bingchuang.app.avroom;
 
 /**
  * 用户卡片的管理

app/src/main/java/com/bingchuang/app/avroom/activity/AVRoomActivity.java

@@ -1,19 +1,19 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import static android.view.View.VISIBLE;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
+import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -56,101 +56,101 @@ import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.orhanobut.logger.Logger;
+import com.bingchuang.app.avroom.firstcharge.FirstChargeDialog;
+import com.bingchuang.app.avroom.fragment.FakeSingleRoomBackFragment;
+import com.bingchuang.app.avroom.fragment.FakeSingleRoomFragment;
+import com.bingchuang.app.avroom.fragment.HomePartyFragment;
+import com.bingchuang.app.avroom.fragment.InputPwdDialogFragment;
+import com.bingchuang.app.avroom.presenter.AvRoomPresenter;
+import com.bingchuang.app.avroom.presenter.HomePartyPresenter;
+import com.bingchuang.app.avroom.redpackage.RedPackageHandler;
+import com.bingchuang.app.avroom.view.IAvRoomView;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.dialog.NewUserGiftDialog;
-import com.yizhuan.erban.avroom.dialog.SingleRoomTipDialog;
-import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog;
-import com.yizhuan.erban.avroom.fragment.FakeSingleRoomBackFragment;
-import com.yizhuan.erban.avroom.fragment.FakeSingleRoomFragment;
-import com.yizhuan.erban.avroom.fragment.HomePartyFragment;
-import com.yizhuan.erban.avroom.fragment.InputPwdDialogFragment;
-import com.yizhuan.erban.avroom.presenter.AvRoomPresenter;
-import com.yizhuan.erban.avroom.presenter.HomePartyPresenter;
-import com.yizhuan.erban.avroom.redpackage.RedPackageHandler;
-import com.yizhuan.erban.avroom.view.IAvRoomView;
-import com.yizhuan.erban.avroom.widget.VerticalViewPagerAdapter;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.xchat_android_core.noble.bean.AllServiceGiftProtocolDataBean;
-import com.yizhuan.xchat_android_library.common.util.Utils;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.common.widget.CustomImageSpan;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.erban.home.dialog.HelloMessageDialog;
-import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity;
-import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
-import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
-import com.yizhuan.erban.ui.webview.DialogWebViewActivity;
-import com.yizhuan.erban.ui.widget.NobleOpenNoticeView;
-import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftLevelDialog;
-import com.yizhuan.erban.ui.widget.dialog.MonsterDialog;
-import com.yizhuan.erban.utils.UserUtils;
-import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
-import com.yizhuan.xchat_android_core.bean.BaseProtocol;
-import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo;
-import com.yizhuan.xchat_android_core.gift.GiftModel;
-import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
-import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Attachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.manager.RoomEvent;
-import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
-import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo;
-import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterDataBean;
-import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult;
-import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo;
-import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager;
-import com.yizhuan.xchat_android_core.noble.bean.NobleInfo;
-import com.yizhuan.xchat_android_core.noble.NobleResourceType;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
-import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent;
-import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent;
-import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent;
-import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException;
-import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageNotifyInfo;
-import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
-import com.yizhuan.xchat_android_core.room.dragonball.DragonBallModel;
-import com.yizhuan.xchat_android_core.room.event.FinishAvRoomEvent;
-import com.yizhuan.xchat_android_core.room.event.RoomExitEvent;
-import com.yizhuan.xchat_android_core.room.event.RoomTaskTipsEvent;
-import com.yizhuan.xchat_android_core.room.pk.event.PKStateEvent;
-import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil;
-import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
-import com.yizhuan.xchat_android_core.support.room.RoomContext;
-import com.yizhuan.xchat_android_core.support.room.RoomView;
-import com.yizhuan.xchat_android_core.treasurefairy.bean.FairyMsgInfoBean;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_core.utils.LogUtils;
-import com.yizhuan.xchat_android_core.utils.StringFormatUtils;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.rxbus.RxBus;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.UIUtils;
+import com.bingchuang.app.R;
+import com.bingchuang.app.avroom.dialog.NewUserGiftDialog;
+import com.bingchuang.app.avroom.dialog.SingleRoomTipDialog;
+import com.bingchuang.app.avroom.widget.VerticalViewPagerAdapter;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.util.Utils;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.app.common.widget.CustomImageSpan;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.app.home.dialog.HelloMessageDialog;
+import com.bingchuang.app.treasure_box.activity.TreasureBoxActivity;
+import com.bingchuang.app.ui.patriarch.help.LimitEnterRoomHelper;
+import com.bingchuang.app.ui.user.activity.UserInfoActivity;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.webview.CommonWebViewActivity;
+import com.bingchuang.app.ui.webview.DialogWebViewActivity;
+import com.bingchuang.app.ui.widget.NobleOpenNoticeView;
+import com.bingchuang.app.ui.widget.dialog.AllServiceGiftLevelDialog;
+import com.bingchuang.app.ui.widget.dialog.MonsterDialog;
+import com.bingchuang.app.utils.UserUtils;
+import com.bingchuang.app.room_chat.activity.RoomMsgActivity;
+import com.bingchuang.core.Constants;
+import com.bingchuang.core.DemoCache;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.auth.event.LogoutEvent;
+import com.bingchuang.core.bean.BaseProtocol;
+import com.bingchuang.core.channel_page.bean.HelloMessageInfo;
+import com.bingchuang.core.gift.GiftModel;
+import com.bingchuang.core.gift.bean.GiftInfo;
+import com.bingchuang.core.gift.bean.LuckyBagNoticeInfo;
+import com.bingchuang.core.im.custom.bean.CustomAttachment;
+import com.bingchuang.core.im.custom.bean.FairyMsgAttachment;
+import com.bingchuang.core.im.custom.bean.NotifyH5Attachment;
+import com.bingchuang.core.im.custom.bean.NotifyH5Info;
+import com.bingchuang.core.im.custom.bean.RoomBoxPrizeAttachment;
+import com.bingchuang.core.im.custom.bean.RoomBoxPrizeInfo;
+import com.bingchuang.core.im.custom.bean.RoomLuckySeaAttachment;
+import com.bingchuang.core.im.custom.bean.RoomLuckySeaMsgBean;
+import com.bingchuang.core.im.custom.bean.RoomPKAttachment;
+import com.bingchuang.core.im.custom.bean.RoomPkBean;
+import com.bingchuang.core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
+import com.bingchuang.core.im.custom.bean.TarotAttachment;
+import com.bingchuang.core.im.custom.bean.TarotMsgBean;
+import com.bingchuang.core.initial.InitialModel;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core2.manager.IMNetEaseManager;
+import com.bingchuang.core.manager.RoomEvent;
+import com.bingchuang.core.module_hall.hall.HallModel;
+import com.bingchuang.core.module_hall.hall.bean.SuperAdminInfo;
+import com.bingchuang.core.monsterhunting.bean.MonsterHuntingResult;
+import com.bingchuang.core.monsterhunting.bean.MonsterInfo;
+import com.bingchuang.core.monsterhunting.bean.MonsterProtocol;
+import com.bingchuang.core.monsterhunting.manager.MonsterDataManager;
+import com.bingchuang.core.noble.AllServiceGiftProtocol;
+import com.bingchuang.core.noble.NobleInfo;
+import com.bingchuang.core.noble.NobleResourceType;
+import com.bingchuang.core.noble.NobleUtil;
+import com.bingchuang.core.patriarch.event.CloseMinRoomEvent;
+import com.bingchuang.core.patriarch.event.ImPushMsgPmLimitTimeEvent;
+import com.bingchuang.core.patriarch.event.PmDismissAllLimitDialogEvent;
+import com.bingchuang.core.patriarch.exception.PmRoomLimitException;
+import com.bingchuang.core.redpackage.RedPackageNotifyInfo;
+import com.bingchuang.core.room.anotherroompk.ShowGiftDialogEvent;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.bean.RoomModeType;
+import com.bingchuang.core.room.dragonball.DragonBallModel;
+import com.bingchuang.core.room.event.FinishAvRoomEvent;
+import com.bingchuang.core.room.event.RoomExitEvent;
+import com.bingchuang.core.room.event.RoomTaskTipsEvent;
+import com.bingchuang.core.room.pk.event.PKStateEvent;
+import com.bingchuang.core.admin.util.SAdminOptUtil;
+import com.bingchuang.core.admin.util.SuperAdminUtil;
+import com.bingchuang.core.support.room.RoomContext;
+import com.bingchuang.core.support.room.RoomView;
+import com.bingchuang.core2.treasurefairy.FairyMsgInfoBean;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.user.bean.FirstChargeInfo;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.core.utils.LogUtils;
+import com.bingchuang.core.utils.StringUtils;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.rxbus.RxBus;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
+import com.bingchuang.library.utils.UIUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -220,15 +220,11 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
 
     private GiftBroadcastObserver giftObserver;
     private Dialog giftDialog;
-    private LinkedList<AllServiceGiftProtocolDataBean> giftList;
+    private LinkedList<AllServiceGiftProtocol.DataBean> giftList;
     @Nullable
     private SingleRoomTipDialog singleRoomTipDialog;
     // 通过红包进来时，有该参数
     private RedPackageNotifyInfo redPackageNotifyInfo;
-
-    // 是否禁用VP滑动（true：不允许滑动；false：某些条件下可以滑动）
-    private boolean viewPagerInputDisable;
-
     public static void start(Context context, long roomUid) {
         startForFromType(context, roomUid, FROM_TYPE_NORMAL, null, null);
     }
@@ -300,7 +296,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
 
     public static void setBackBg(Context context, RoomInfo roomInfo, SVGAImageView svgaRoomBg, String[] bgPicture) {
         if (roomInfo != null && svgaRoomBg != null) {
-            if (!StringFormatUtils.isBlank(roomInfo.getBackPic())) {
+            if (!StringUtils.isBlank(roomInfo.getBackPic())) {
                 int resourceType = NobleUtil.getResourceType(roomInfo.getBackPic());
                 if (resourceType == NobleResourceType.URLS) {
                     if (!roomInfo.getBackPic().equals(bgPicture[0])) {
@@ -323,8 +319,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                     }
                 } else if (roomInfo.getType() == RoomInfo.ROOM_TYPE_SINGLE) {
                     bgPicture[0] = "";
-//                    svgaRoomBg.setImageResource(R.drawable.bg_room_single_pic);
-                    playSvgaBg(svgaRoomBg, "svga/room_bg_single.svga");
+                    svgaRoomBg.setImageResource(R.drawable.bg_room_single_pic);
                 } else {
                     bgPicture[0] = "";
                     if (roomInfo.getRoomModeType() == RoomModeType.OPEN_PK_MODE) {
@@ -401,7 +396,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     public void setCurrentItem(int item) {
         dismissLoadingDialog();
         if (viewpager != null) {
-            tryEnabledViewPagerInput();
+            viewpager.setUserInputEnabled(true);
             viewpager.setCurrentItem(item, false);
         }
     }
@@ -416,7 +411,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         Object notifyInfo = intent.getSerializableExtra("notifyInfo");
         if (notifyInfo instanceof RedPackageNotifyInfo) {
             redPackageNotifyInfo = (RedPackageNotifyInfo) notifyInfo;
-        } else {
+        }else{
             redPackageNotifyInfo = null;
         }
         if (mRoomInfo != null) {
@@ -450,7 +445,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             viewpager.setOffscreenPageLimit(2);
             viewpager.setOrientation(ViewPager2.ORIENTATION_VERTICAL);
             viewpager.getChildAt(0).setOverScrollMode(View.OVER_SCROLL_NEVER);
-            disableViewPagerInput();
+            viewpager.setUserInputEnabled(false);
             viewpager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
                 @Override
                 public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -477,11 +472,11 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                     if (state == 0 && viewpager.getCurrentItem() == 2) {
                         showLoadingDialog();
                         ((FakeSingleRoomFragment) mAdapter.getItem(2)).tryJumpRoom();
-                        disableViewPagerInput();
+                        viewpager.setUserInputEnabled(false);
                     } else if (state == 0 && viewpager.getCurrentItem() == 0) {
                         showLoadingDialog();
                         ((FakeSingleRoomBackFragment) mAdapter.getItem(0)).tryJumpRoom();
-                        disableViewPagerInput();
+                        viewpager.setUserInputEnabled(false);
                     }
                 }
             });
@@ -561,7 +556,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                 }
                 break;
             case RoomEvent.MONSTER_STATUS_CHANGED:
-                MonsterDataBean dataBean = roomEvent.getMonsterStatusAttachment().getDataBean();
+                MonsterProtocol.DataBean dataBean = roomEvent.getMonsterStatusAttachment().getDataBean();
                 Log.e(TAG, "onRoomEventReceive: monster status changed: " + dataBean);
                 RoomInfo myRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
                 // 当前为房间页面并且当前房间为怪兽出现房间时才出现通知
@@ -609,7 +604,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                 // 当前为房间页面并且当前房间为怪兽出现房间时才出现通知
                 if (UIUtils.isTopActivity(AVRoomActivity.this) && currentRoomInfo != null &&
                         currentRoomInfo.getUid() == monsterHuntingResult.getMonster().getAppearRoomUid()) {
-                    MonsterDataBean monsterInfo = monsterHuntingResult.getMonster();
+                    MonsterProtocol.DataBean monsterInfo = monsterHuntingResult.getMonster();
                     if (monsterDialog != null && monsterDialog.isShowing()) {
                         monsterDialog.dismiss();
                     }
@@ -668,14 +663,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
      */
     private void showRoomFragment(boolean isRoomMin) {
         mCurrentFragment = (HomePartyFragment) mAdapter.getItem(1);
-        mCurrentFragment.getPlayNotifyState().observe(getLifecycleOwner(), aBoolean -> {
-            if (!aBoolean) {
-                if (isValid()) {
-                    showGiftDialog();
-                }
-            }
-        });
-        tryEnabledViewPagerInput();
+        viewpager.setUserInputEnabled(AvRoomDataManager.get().isSingleRoom());
         viewpager.setCurrentItem(1, false);
         if (isRoomMin) {
             RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
@@ -1203,15 +1191,22 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                     giftList = new LinkedList<>();
                 }
                 int second2 = baseProtocol.getSecond();
-                AllServiceGiftProtocolDataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocolDataBean.class);
+                AllServiceGiftProtocol.DataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocol.DataBean.class);
                 if (data == null || (data.getGiftUrl()) == null)
                     return;
                 giftList.add(data);
                 if (second2 == CUSTOM_MSG_ALL_SERVICE_GIFT) {
-                    if (mCurrentFragment != null && mCurrentFragment.isShowingPlayNotify()) {
-                        return;
+                    if (giftDialog != null && giftDialog.isShowing()) {
+                        // 如果当前以及有礼物弹窗在展示，则需要等到他 dismiss 后再显示下一个
+                        AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
+                        if (dataBean != null) {
+                            return;
+                        } else {
+                            giftDialog.dismiss();
+                        }
+                    } else {
+                        showGiftDialog();
                     }
-                    showGiftDialog();
                 }
                 break;
             case CUSTOM_MSG_BOX://寻爱之旅
@@ -1308,27 +1303,14 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         }
     }
 
-    public boolean isShowingGiftNotify() {
-        if (giftDialog != null && giftDialog.isShowing()) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     private void showGiftDialog() {
-        if (!isValid()) return;
-        if (giftList == null) return;
         if (giftList.size() == 0) return;
-        AllServiceGiftProtocolDataBean data = giftList.peekFirst();
+        AllServiceGiftProtocol.DataBean data = giftList.peekFirst();
         if (data == null) return;
-        if (giftDialog != null && giftDialog.isShowing()) {
-            return;
-        }
         giftDialog = generateAllServiceGiftDialog(this, data);
         giftDialog.setOnDismissListener(dialog -> {
             giftList.pollFirst();
-            AllServiceGiftProtocolDataBean dataBean = giftList.peekFirst();
+            AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
             if (dataBean != null) {
                 if (isValid()) {
                     showGiftDialog();
@@ -1340,7 +1322,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         giftDialog.show();
     }
 
-    private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocolDataBean dataBean) {
+    private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocol.DataBean dataBean) {
         return new AllServiceGiftLevelDialog(context, dataBean);
     }
 
@@ -1445,41 +1427,4 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             }
         }
     }
-
-    @Override
-    protected void onReceiveChatRoomEvent(RoomEvent roomEvent) {
-        super.onReceiveChatRoomEvent(roomEvent);
-        switch (roomEvent.getEvent()) {
-            case RoomEvent.UP_MIC:
-            case RoomEvent.DOWN_MIC:
-                resetViewPagerInputEnabled();
-                break;
-        }
-    }
-
-    /**
-     * 禁用VP滑动
-     */
-    private void disableViewPagerInput() {
-        this.viewPagerInputDisable = true;
-        resetViewPagerInputEnabled();
-    }
-
-    private void tryEnabledViewPagerInput() {
-        this.viewPagerInputDisable = false;
-        resetViewPagerInputEnabled();
-    }
-
-    private void resetViewPagerInputEnabled() {
-        if (viewPagerInputDisable) {
-            viewpager.setUserInputEnabled(false);
-        } else {
-            if (AvRoomDataManager.get().isSingleRoom() && !AvRoomDataManager.get().isOwnerOnMic()) {
-                // 个播+没在麦位=可以滑动
-                viewpager.setUserInputEnabled(true);
-            } else {
-                viewpager.setUserInputEnabled(false);
-            }
-        }
-    }
 }

app/src/main/java/com/bingchuang/app/avroom/activity/CpRoomInviteActivity.java

@@ -1,21 +1,21 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.view.View;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.fragment.InviteFriendListFragment;
-import com.yizhuan.erban.base.BaseBindingActivity;
-import com.yizhuan.erban.databinding.ActivityCpRoomInviteBinding;
-import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
-import com.yizhuan.xchat_android_core.share.bean.SessionType;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.avroom.fragment.InviteFriendListFragment;
+import com.bingchuang.app.R;
+import com.bingchuang.app.base.BaseBindingActivity;
+import com.bingchuang.app.databinding.ActivityCpRoomInviteBinding;
+import com.bingchuang.app.public_chat_hall.event.AitFriendEvent;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core2.manager.IMNetEaseManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.model.RoomSettingModel;
+import com.bingchuang.core.share.bean.SessionType;
+import com.bingchuang.core.utils.net.DontWarnObserver;
+import com.bingchuang.library.annatation.ActLayoutRes;
+import com.bingchuang.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

app/src/main/java/com/bingchuang/app/avroom/activity/CreatePKActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -14,21 +14,21 @@ import androidx.gridlayout.widget.GridLayout;
 
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.dialog.PKSelectPeopleDialog;
-import com.yizhuan.erban.avroom.dialog.PKTimePickerDialog;
-import com.yizhuan.erban.avroom.presenter.CreatePKPresenter;
-import com.yizhuan.erban.avroom.view.ICreatePKView;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.base.TitleBar;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
-import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.avroom.presenter.CreatePKPresenter;
+import com.bingchuang.app.avroom.view.ICreatePKView;
+import com.bingchuang.app.R;
+import com.bingchuang.app.avroom.dialog.PKSelectPeopleDialog;
+import com.bingchuang.app.avroom.dialog.PKTimePickerDialog;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.base.TitleBar;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.pk.bean.PKMemberInfo;
+import com.bingchuang.core.room.pk.bean.PKTeamInfo;
+import com.bingchuang.core.room.pk.model.PkModel;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/bingchuang/app/avroom/activity/RecordForPKActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,18 +10,18 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.netease.nim.uikit.StatusBarUtil;
+import com.bingchuang.app.avroom.presenter.RecordForPKPresenter;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.adapter.RecordForPKAdapter;
-import com.yizhuan.erban.avroom.presenter.RecordForPKPresenter;
-import com.yizhuan.erban.avroom.view.IRecordForPKView;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.xchat_android_library.common.util.Utils;
-import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.avroom.adapter.RecordForPKAdapter;
+import com.bingchuang.app.avroom.view.IRecordForPKView;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.util.Utils;
+import com.bingchuang.app.ui.widget.recyclerview.decoration.ColorDecoration;
+import com.bingchuang.core.room.pk.bean.PKRecordInfo;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.util.List;
 

app/src/main/java/com/bingchuang/app/avroom/activity/RoomBlackListActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,26 +10,26 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
+import com.bingchuang.app.avroom.presenter.RoomBlackPresenter;
+import com.bingchuang.app.avroom.view.IRoomBlackView;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.adapter.RoomNormalListAdapter;
-import com.yizhuan.erban.avroom.presenter.RoomBlackPresenter;
-import com.yizhuan.erban.avroom.view.IRoomBlackView;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.im.room.IIMRoomCoreClient;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
-import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel;
-import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.coremanager.CoreEvent;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.avroom.adapter.RoomNormalListAdapter;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.im.room.IIMRoomCoreClient;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.model.AvRoomModel;
+import com.bingchuang.core.admin.model.SuperAdminModel;
+import com.bingchuang.core.admin.util.SuperAdminUtil;
+import com.bingchuang.core.utils.net.DontWarnObserver;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.coremanager.CoreEvent;
+import com.bingchuang.library.utils.JavaUtil;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.util.List;
 import java.util.ListIterator;

app/src/main/java/com/bingchuang/app/avroom/activity/RoomInviteActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -10,23 +10,22 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.common.util.sys.NetworkUtil;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
+import com.bingchuang.app.avroom.presenter.RoomInvitePresenter;
+import com.bingchuang.app.avroom.view.IRoomInviteView;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.adapter.RoomInviteAdapter;
-import com.yizhuan.erban.avroom.presenter.RoomInvitePresenter;
-import com.yizhuan.erban.avroom.view.IRoomInviteView;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.noble.NobleResourceType;
-import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
-import com.yizhuan.xchat_android_core.room.bean.RoomOnlineUserBean;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.avroom.adapter.RoomInviteAdapter;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.core.Constants;
+import com.bingchuang.core.noble.NobleResourceType;
+import com.bingchuang.core.room.bean.OnlineChatMember;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
 
 import java.util.List;
 import java.util.Map;
@@ -108,11 +107,10 @@ public class RoomInviteActivity extends BaseMvpActivity<IRoomInviteView, RoomInv
     }
 
     @Override
-    public void onRequestRoomOnlineListSuccess(List<RoomOnlineUserBean> list) {
+    public void onRequestChatMemberByPageSuccess(List<OnlineChatMember> memberList, int page) {
 
     }
 
-
     @Override
     public void onRequestChatMemberByPageFail(String errorStr, int page) {
         mPage = page;

app/src/main/java/com/bingchuang/app/avroom/activity/RoomManagerListActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,17 +10,17 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.adapter.RoomNormalListAdapter;
-import com.yizhuan.erban.avroom.presenter.RoomManagerPresenter;
-import com.yizhuan.erban.avroom.view.IRoomManagerView;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.avroom.presenter.RoomManagerPresenter;
+import com.bingchuang.app.R;
+import com.bingchuang.app.avroom.adapter.RoomNormalListAdapter;
+import com.bingchuang.app.avroom.view.IRoomManagerView;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.util.List;
 import java.util.ListIterator;

app/src/main/java/com/bingchuang/app/avroom/activity/RoomOnlineUserActivity.java

@@ -1,17 +1,17 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.content.Context;
 import android.content.Intent;
 
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.fragment.OnlineUserFragment;
-import com.yizhuan.erban.base.BaseBindingActivity;
-import com.yizhuan.erban.databinding.ActivityRoomOnlineUserBinding;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.avroom.fragment.OnlineUserFragment;
+import com.bingchuang.app.R;
+import com.bingchuang.app.base.BaseBindingActivity;
+import com.bingchuang.app.databinding.ActivityRoomOnlineUserBinding;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.library.annatation.ActLayoutRes;
+import com.bingchuang.library.utils.ResUtil;
 
 @ActLayoutRes(R.layout.activity_room_online_user)
 public class RoomOnlineUserActivity extends BaseBindingActivity<ActivityRoomOnlineUserBinding> {

app/src/main/java/com/bingchuang/app/avroom/activity/RoomRankListActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,13 +8,13 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.fragment.RoomCharmListFragment;
-import com.yizhuan.erban.avroom.fragment.RoomContributeListFragment;
-import com.yizhuan.erban.base.BaseBindingActivity;
-import com.yizhuan.erban.databinding.ActivityRoomRankListBinding;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.bingchuang.app.avroom.fragment.RoomCharmListFragment;
+import com.bingchuang.app.avroom.fragment.RoomContributeListFragment;
+import com.bingchuang.app.R;
+import com.bingchuang.app.base.BaseBindingActivity;
+import com.bingchuang.app.databinding.ActivityRoomRankListBinding;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.library.annatation.ActLayoutRes;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/bingchuang/app/avroom/activity/RoomSettingActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -16,43 +16,43 @@ import androidx.databinding.DataBindingUtil;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.dialog.SelectLabelDialog;
-import com.yizhuan.erban.avroom.presenter.RoomSettingPresenter;
-import com.yizhuan.erban.avroom.view.IRoomSettingView;
-import com.yizhuan.erban.avroom.widget.EditRoomTitleDialog;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.erban.databinding.ActivityRoomSettingBinding;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
-import com.yizhuan.erban.utils.RegexUtil;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.auth.event.KickOutEvent;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomNoticeAttachment;
-import com.yizhuan.xchat_android_core.kick.KickModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.manager.RoomEvent;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo;
-import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo;
-import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo;
-import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel;
-import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
-import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
-import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
-import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
-import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
-import com.yizhuan.xchat_android_library.utils.CommonUtils;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
+import com.bingchuang.app.avroom.presenter.RoomSettingPresenter;
+import com.bingchuang.app.avroom.view.IRoomSettingView;
+import com.bingchuang.app.R;
+import com.bingchuang.app.avroom.dialog.SelectLabelDialog;
+import com.bingchuang.app.avroom.widget.EditRoomTitleDialog;
+import com.bingchuang.app.base.BaseMvpActivity;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.app.databinding.ActivityRoomSettingBinding;
+import com.bingchuang.app.ui.webview.CommonWebViewActivity;
+import com.bingchuang.app.utils.RegexUtil;
+import com.bingchuang.core2.UriProvider;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.auth.event.KickOutEvent;
+import com.bingchuang.core.bean.RoomQueueInfo;
+import com.bingchuang.core.im.custom.bean.CustomAttachment;
+import com.bingchuang.core.im.custom.bean.RoomNoticeAttachment;
+import com.bingchuang.core.kick.KickModel;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core2.manager.IMNetEaseManager;
+import com.bingchuang.core.manager.RoomEvent;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.bean.RoomMessageViewNoticeInfo;
+import com.bingchuang.core.room.bean.RoomSettingTabInfo;
+import com.bingchuang.core.room.bean.SingleRoomSortInfo;
+import com.bingchuang.core.room.giftvalue.GiftValueModel;
+import com.bingchuang.core.room.giftvalue.helper.GiftValueMrg;
+import com.bingchuang.core.room.model.AvRoomModel;
+import com.bingchuang.core.room.model.RoomSettingModel;
+import com.bingchuang.core.room.queue.bean.MicMemberInfo;
+import com.bingchuang.core.utils.net.BeanObserver;
+import com.bingchuang.library.base.factory.CreatePresenter;
+import com.bingchuang.library.net.rxnet.callback.CallBack;
+import com.bingchuang.library.utils.CommonUtils;
+import com.bingchuang.library.utils.JavaUtil;
+import com.bingchuang.library.utils.ListUtils;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.codec.DESUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

app/src/main/java/com/bingchuang/app/avroom/activity/RoomTitleEditActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.activity;
+package com.bingchuang.app.avroom.activity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -8,17 +8,17 @@ import android.text.TextWatcher;
 import android.view.View;
 
 import com.netease.nim.uikit.StatusBarUtil;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.base.BaseBindingActivity;
-import com.yizhuan.erban.common.widget.dialog.DialogManager;
-import com.yizhuan.erban.databinding.ActivityRoomTitleEditBinding;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.base.BaseBindingActivity;
+import com.bingchuang.app.common.widget.dialog.DialogManager;
+import com.bingchuang.app.databinding.ActivityRoomTitleEditBinding;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.model.RoomSettingModel;
+import com.bingchuang.library.annatation.ActLayoutRes;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
 
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;

app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListAdapter.java

@@ -1,7 +1,7 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
-import com.yizhuan.xchat_android_library.list.ArrayListAdapter;
-import com.yizhuan.xchat_android_library.list.ListItem;
+import com.bingchuang.library.list.ArrayListAdapter;
+import com.bingchuang.library.list.ListItem;
 
 import java.util.List;
 

app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListEmptyItem.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -6,9 +6,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_library.list.BaseGroupItem;
-import com.yizhuan.xchat_android_library.list.ViewHolder;
+import com.bingchuang.app.R;
+import com.bingchuang.library.list.BaseGroupItem;
+import com.bingchuang.library.list.ViewHolder;
 
 /**
  * Created by chenran on 2017/8/9.

app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListHeaderItem.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -6,9 +6,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_library.list.BaseGroupItem;
-import com.yizhuan.xchat_android_library.list.ViewHolder;
+import com.bingchuang.app.R;
+import com.bingchuang.library.list.BaseGroupItem;
+import com.bingchuang.library.list.ViewHolder;
 
 /**
  * Created by chenran on 2017/8/9.

app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListItem.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -9,12 +9,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo;
-import com.yizhuan.xchat_android_library.list.BaseGroupItem;
-import com.yizhuan.xchat_android_library.list.ViewHolder;
+import com.bingchuang.app.R;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.core.room.auction.bean.AuctionListUserInfo;
+import com.bingchuang.library.list.BaseGroupItem;
+import com.bingchuang.library.list.ViewHolder;
 
 /**
  * Created by chenran on 2017/8/9.

app/src/main/java/com/bingchuang/app/avroom/adapter/BaseMicroViewAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -19,29 +19,29 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.coorchice.library.SuperTextView;
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.opensource.svgaplayer.SVGAImageView;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.webview.DialogWebViewActivity;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.erban.utils.RegexUtil;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
-import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.noble.NobleResourceType;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData;
-import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueFormat;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
-import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.utils.ActivityUtil;
-import com.yizhuan.xchat_android_core.utils.extension.StringExtensionKt;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.bingchuang.app.R;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.webview.DialogWebViewActivity;
+import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.bingchuang.app.utils.RegexUtil;
+import com.bingchuang.core2.UriProvider;
+import com.bingchuang.core.bean.RoomMicInfo;
+import com.bingchuang.core.bean.RoomQueueInfo;
+import com.bingchuang.core.decoration.headwear.bean.HeadWearInfo;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.noble.NobleResourceType;
+import com.bingchuang.core.noble.NobleUtil;
+import com.bingchuang.core.room.bean.RoomInfo;
+import com.bingchuang.core.room.giftvalue.bean.GiftValueData;
+import com.bingchuang.core.room.giftvalue.helper.GiftValueFormat;
+import com.bingchuang.core.room.pk.bean.PKTeamInfo;
+import com.bingchuang.core.room.queue.bean.MicMemberInfo;
+import com.bingchuang.core.user.UserModel;
+import com.bingchuang.core.utils.ActivityUtil;
+import com.bingchuang.core.utils.StringExtensionKt;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.config.BasicConfig;
 
 /**
  * @author xiaoyu
@@ -527,7 +527,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         /**
          * 主席位特有
          */
-        View frTitle;
+        FrameLayout frTitle;
         TextView tvRoomDesc;
         ImageView ivTag;
         TextView tvLabelLeaveMode;

app/src/main/java/com/bingchuang/app/avroom/adapter/CommonVPAdapter.kt

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter
+package com.bingchuang.app.avroom.adapter
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager

app/src/main/java/com/bingchuang/app/avroom/adapter/CpMicroViewAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -11,9 +11,9 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.core.bean.RoomQueueInfo;
+import com.bingchuang.library.utils.ResUtil;
 
 public class CpMicroViewAdapter extends BaseMicroViewAdapter {
 
@@ -24,7 +24,7 @@ public class CpMicroViewAdapter extends BaseMicroViewAdapter {
 
     @Override
     public String microType() {
-        return BaseMicroViewAdapter.MICRO_TYPE_CP;
+        return MICRO_TYPE_CP;
     }
 
     @Override

app/src/main/java/com/bingchuang/app/avroom/adapter/CreateRoomGameAdapter.kt

@@ -1,11 +1,11 @@
-package com.yizhuan.erban.avroom.adapter
+package com.bingchuang.app.avroom.adapter
 
 import android.widget.ImageView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.erban.R
-import com.yizhuan.erban.ui.utils.load
-import com.yizhuan.xchat_android_core.room.game.bean.GameInfo
+import com.bingchuang.app.ui.utils.load
+import com.bingchuang.app.R
+import com.bingchuang.core.room.game.GameInfo
 
 class CreateRoomGameAdapter :
     BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_create_game) {

app/src/main/java/com/bingchuang/app/avroom/adapter/CreateRoomGameGuideAdapter.kt

@@ -1,10 +1,11 @@
-package com.yizhuan.erban.avroom.adapter
+package com.bingchuang.app.avroom.adapter
 
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.erban.R
-import com.yizhuan.xchat_android_library.common.glide.GlideUtils
-import com.yizhuan.xchat_android_core.room.game.bean.GameInfo
+import com.bingchuang.app.R
+import com.bingchuang.library.common.glide.GlideUtils
+import com.bingchuang.app.ui.utils.ImageLoadUtilsV2
+import com.bingchuang.core.room.game.GameInfo
 
 class CreateRoomGameGuideAdapter :
     BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_create_game_guide) {

app/src/main/java/com/bingchuang/app/avroom/adapter/DatingMicroViewAdapter.kt

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter
+package com.bingchuang.app.avroom.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -12,14 +12,14 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.yizhuan.erban.R
-import com.yizhuan.erban.ui.utils.load
-import com.yizhuan.erban.utils.UserUtils
-import com.yizhuan.xchat_android_core.Constants
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.bingchuang.app.ui.utils.load
+import com.bingchuang.app.R
+import com.bingchuang.app.utils.UserUtils
+import com.bingchuang.core.Constants
+import com.bingchuang.core.bean.RoomQueueInfo
+import com.bingchuang.core.manager.AvRoomDataManager
+import com.bingchuang.core.room.bean.RoomInfo
+import com.bingchuang.library.utils.ResUtil
 
 
 /**
@@ -44,7 +44,7 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return if (viewType == TYPE_BOSS) {
+        return if (viewType == BaseMicroViewAdapter.TYPE_BOSS) {
             DatingBossMicroViewHolder(
                 LayoutInflater.from(parent.context)
                     .inflate(R.layout.item_micro_dating_boss, parent, false)
@@ -57,13 +57,14 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
         }
     }
 
-    override fun getItemViewType(position: Int) = if (position == 0) TYPE_BOSS else TYPE_NORMAL
+    override fun getItemViewType(position: Int) = if (position == 0) BaseMicroViewAdapter.TYPE_BOSS else BaseMicroViewAdapter.TYPE_NORMAL
 
-    override fun microType() = MICRO_TYPE_DATING
+    override fun microType() =
+        BaseMicroViewAdapter.MICRO_TYPE_DATING
 
 
     open inner class DatingMicroViewHolder constructor(itemView: View) :
-        GiftValueViewHolder(itemView) {
+        BaseMicroViewAdapter.GiftValueViewHolder(itemView) {
 
         private val viewGenderBg: View = itemView.findViewById(R.id.view_gender_bg)
         private val tvSelectedStatus: TextView = itemView.findViewById(R.id.tv_selected_status)
@@ -137,7 +138,7 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
     }
 
     inner class DatingBossMicroViewHolder internal constructor(itemView: View) :
-        BossMicroViewHolder(itemView) {
+        BaseMicroViewAdapter.BossMicroViewHolder(itemView) {
         private val rvVip: RecyclerView = itemView.findViewById(R.id.rv_vip)
         private val ivVipWear: ImageView = itemView.findViewById(R.id.iv_vip_wear)
 
@@ -169,7 +170,7 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
             rvVip.isVisible = showVipMicro
 
             if (showVipMicro) {
-                var adapter: VipMicroViewAdapter? = rvVip.adapter as? VipMicroViewAdapter
+                var adapter: DatingMicroViewAdapter.VipMicroViewAdapter? = rvVip.adapter as? DatingMicroViewAdapter.VipMicroViewAdapter
                 if (adapter == null) {
                     adapter = VipMicroViewAdapter(context)
                     adapter.bindToRecyclerView(rvVip)
@@ -205,18 +206,19 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
                 AvRoomDataManager.get()
                     .getRoomQueueMemberInfoByMicPosition(AvRoomDataManager.POSITION_VIP_MIC)
                     ?: return
-            (viewHolder as NormalMicroViewHolder).bind(
+            (viewHolder as BaseMicroViewAdapter.NormalMicroViewHolder).bind(
                 roomQueueInfo,
                 AvRoomDataManager.POSITION_VIP_MIC
             )
         }
 
-        override fun microType() = MICRO_TYPE_DATING_VIP
+        override fun microType() =
+            BaseMicroViewAdapter.MICRO_TYPE_DATING_VIP
 
         override fun getItemCount() = 1
 
         inner class VipMicroViewHolder constructor(itemView: View) :
-            DatingMicroViewHolder(itemView) {
+            DatingMicroViewAdapter.DatingMicroViewHolder(itemView) {
 
             override fun bind(info: RoomQueueInfo, position: Int) {
                 super.bind(info, position)

app/src/main/java/com/bingchuang/app/avroom/adapter/ExitRoomAdapter.kt

@@ -1,11 +1,11 @@
-package com.yizhuan.erban.avroom.adapter
+package com.bingchuang.app.avroom.adapter
 
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
-import com.yizhuan.erban.R
-import com.yizhuan.erban.ui.utils.ImageLoadUtils
-import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
-import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
+import com.bingchuang.app.R
+import com.bingchuang.app.ui.utils.ImageLoadUtils
+import com.bingchuang.core.utils.subAndReplaceDot
+import com.bingchuang.core2.home.bean.HomeRoomInfo
 
 class ExitRoomAdapter :
     BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_exit_room) {

app/src/main/java/com/bingchuang/app/avroom/adapter/GameMicroViewAdapter.kt

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter
+package com.bingchuang.app.avroom.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -11,17 +11,17 @@ import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
-import com.yizhuan.erban.R
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_library.utils.ResUtil
+import com.bingchuang.app.R
+import com.bingchuang.core.bean.RoomQueueInfo
+import com.bingchuang.core.manager.AvRoomDataManager
+import com.bingchuang.library.utils.ResUtil
 
 
 /**
  * @author xiaoyu
  * @date 2017/12/18
  */
-class GameMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) {
+class GameMicroViewAdapter(context: Context?) : com.bingchuang.app.avroom.adapter.BaseMicroViewAdapter(context) {
 
     /**
      * Set LayoutManager and bind this to RecyclerView

app/src/main/java/com/bingchuang/app/avroom/adapter/GameMiniMicroViewAdapter.kt

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter
+package com.bingchuang.app.avroom.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -7,16 +7,16 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.yizhuan.erban.R
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.bingchuang.app.R
+import com.bingchuang.core.bean.RoomQueueInfo
+import com.bingchuang.core.manager.AvRoomDataManager
 
 
 /**
  * @author xiaoyu
  * @date 2017/12/18
  */
-class GameMiniMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) {
+class GameMiniMicroViewAdapter(context: Context?) : com.bingchuang.app.avroom.adapter.BaseMicroViewAdapter(context) {
 
     private var onClick: (() -> Unit)? = null
 

app/src/main/java/com/bingchuang/app/avroom/adapter/HomePartyPageAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

app/src/main/java/com/bingchuang/app/avroom/adapter/InviteFriendListAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -9,15 +9,15 @@ import androidx.appcompat.widget.AppCompatImageView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo;
-import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.NobleAvatarView;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.public_chat_hall.bean.PublicChatHallFriendInfo;
+import com.bingchuang.app.public_chat_hall.event.AitFriendEvent;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.widget.NobleAvatarView;
+import com.bingchuang.core.noble.NobleUtil;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.utils.ResUtil;
+import com.bingchuang.library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 

app/src/main/java/com/bingchuang/app/avroom/adapter/MicQueueAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.graphics.drawable.GradientDrawable;
 import android.widget.TextView;
@@ -8,13 +8,13 @@ import androidx.appcompat.widget.AppCompatImageView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.queuing_mic.bean.GroupType;
-import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.queuing_mic.bean.GroupType;
+import com.bingchuang.core.room.queuing_mic.bean.QueuingMicMemeberInfo;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.util.List;
 

app/src/main/java/com/bingchuang/app/avroom/adapter/MicroViewAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -11,10 +11,10 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.core.bean.RoomQueueInfo;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.library.utils.ResUtil;
 
 /**
  * @author xiaoyu
@@ -74,7 +74,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
 
     @Override
     public String microType() {
-        return BaseMicroViewAdapter.MICRO_TYPE_NORMAL;
+        return MICRO_TYPE_NORMAL;
     }
 
     @Override

app/src/main/java/com/bingchuang/app/avroom/adapter/OnMicroItemClickListener.java

@@ -1,6 +1,6 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
-import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
+import com.bingchuang.core.room.queue.bean.MicMemberInfo;
 
 /**
  * Created by lvzebiao on 2018/11/5.

app/src/main/java/com/bingchuang/app/avroom/adapter/OnlineUserAdapter.java

@@ -0,0 +1,315 @@
+package com.bingchuang.app.avroom.adapter;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
+import com.netease.nimlib.sdk.RequestCallbackWrapper;
+import com.netease.nimlib.sdk.uinfo.constant.GenderEnum;
+import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
+import com.bingchuang.app.R;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.widget.NobleAvatarView;
+import com.bingchuang.app.utils.RegexUtil;
+import com.bingchuang.core.auth.AuthModel;
+import com.bingchuang.core.level.UserLevelResourceType;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core2.manager.IMNetEaseManager;
+import com.bingchuang.core.manager.RoomEvent;
+import com.bingchuang.core.noble.NobleResourceType;
+import com.bingchuang.core.noble.NobleUtil;
+import com.bingchuang.core.room.bean.OnlineChatMember;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.utils.ListUtils;
+
+import java.util.List;
+
+import io.reactivex.disposables.Disposable;
+
+/**
+ * <p> 房间在线人数列表 （上麦，房主，游客，管理员）  </p>
+ *
+ * @author Administrator
+ * @date 2017/12/4
+ */
+public class OnlineUserAdapter extends BaseMultiItemQuickAdapter<OnlineChatMember, BaseViewHolder> {
+
+    private boolean mIsHomeParty;
+    private Disposable mDisposable;
+    private Context context;
+    private OnRoomOnlineNumberChangeListener mListener;
+
+    public OnlineUserAdapter(Context context, boolean isHomeParty) {
+        super(null);
+        addItemType(OnlineChatMember.NORMAL, R.layout.list_item_online_user);
+        addItemType(OnlineChatMember.NOBLE, R.layout.list_item_online_user_mystery);
+        mIsHomeParty = isHomeParty;
+        this.context = context;
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        registerRoomEvent();
+    }
+
+    @Override
+    protected void convert(@NonNull BaseViewHolder baseViewHolder, OnlineChatMember onlineChatMember) {
+        if (onlineChatMember != null && onlineChatMember.chatRoomMember != null) {
+            if (onlineChatMember.getItemType() == OnlineChatMember.NORMAL) {
+                setNormalData(baseViewHolder, onlineChatMember);
+            } else {
+                setMysteryData();
+            }
+        }
+    }
+
+    private void setMysteryData() {
+        //do nothing
+    }
+
+    private void setNormalData(BaseViewHolder baseViewHolder, OnlineChatMember onlineChatMember) {
+        setSexData(baseViewHolder, onlineChatMember);
+
+        ImageView roomOnlineTag = baseViewHolder.getView(R.id.room_online_tag);
+        ImageView managerLogo = baseViewHolder.getView(R.id.manager_logo);
+        roomOnlineTag.setVisibility(onlineChatMember.isOnMic ? View.VISIBLE : View.GONE);
+        managerLogo.setVisibility((onlineChatMember.isAdmin || onlineChatMember.isRoomOwer)
+                ? View.VISIBLE : View.GONE);
+        managerLogo.setImageResource(onlineChatMember.isAdmin ? R.drawable.icon_admin_logo
+                : R.drawable.icon_user_list_room_ownner);
+
+        baseViewHolder.setText(R.id.nick, RegexUtil.getPrintableString(onlineChatMember.chatRoomMember.getNick()));
+
+        NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view);
+        nobleAvatarView.setSize(37, 54, 0);
+        nobleAvatarView.setData(onlineChatMember.chatRoomMember);
+
+        // 官字
+        baseViewHolder.getView(R.id.iv_user_official).setVisibility(onlineChatMember.isOfficial() ? View.VISIBLE : View.GONE);
+        //经验等级
+        AppCompatImageView ivUserExper = baseViewHolder.getView(R.id.iv_user_exper);
+        String experLevelUrl = NobleUtil.getLevel(UserLevelResourceType.EXPER_URL, onlineChatMember.chatRoomMember);
+        boolean isExperLevelUrlEmpty = TextUtils.isEmpty(experLevelUrl);
+        ivUserExper.setVisibility(!isExperLevelUrlEmpty ? View.VISIBLE : View.GONE);
+        if (!isExperLevelUrlEmpty) {
+            ImageLoadUtils.loadImage(mContext, experLevelUrl, ivUserExper);
+        }
+        //魅力等级
+        AppCompatImageView ivUserCharm = baseViewHolder.getView(R.id.iv_user_charm);
+        String charmLevelUrl = NobleUtil.getLevel(UserLevelResourceType.CHARM_URL, onlineChatMember.chatRoomMember);
+        boolean isCharmLevelUrlEmpty = TextUtils.isEmpty(charmLevelUrl);
+        ivUserCharm.setVisibility(!isCharmLevelUrlEmpty ? View.VISIBLE : View.GONE);
+        if (!isCharmLevelUrlEmpty) {
+            ImageLoadUtils.loadImage(mContext, charmLevelUrl, ivUserCharm);
+        }
+
+        // 官方主播铭牌标识
+        String fixWord = NobleUtil.getLevel(UserInfo.OAC_NAME, onlineChatMember.chatRoomMember);
+        String iconPic = NobleUtil.getLevel(UserInfo.OAC_ICON, onlineChatMember.chatRoomMember);
+        View inOfficialMask = baseViewHolder.getView(R.id.in_official_mask);
+        if (!TextUtils.isEmpty(fixWord) && !TextUtils.isEmpty(iconPic)) {
+            inOfficialMask.setVisibility(View.VISIBLE);
+            TextView tvOfficialMask = inOfficialMask.findViewById(R.id.tv_official_mask);
+            if (tvOfficialMask != null) {
+                tvOfficialMask.setText(fixWord);
+            }
+
+            ImageView ivOfficialMask = inOfficialMask.findViewById(R.id.iv_official_mask);
+            if (ivOfficialMask != null) {
+                ImageLoadUtils.loadImage(mContext, iconPic, ivOfficialMask);
+            }
+
+        } else {
+            inOfficialMask.setVisibility(View.GONE);
+        }
+
+        // 铭牌
+        String namePlateWord = NobleUtil.getLevel(UserInfo.NAMEPLATE_WORD, onlineChatMember.chatRoomMember);
+        String namePlatePic = NobleUtil.getLevel(UserInfo.NAMEPLATE_PIC, onlineChatMember.chatRoomMember);
+        View inNamePlate = baseViewHolder.getView(R.id.in_nameplate);
+        if (!TextUtils.isEmpty(namePlateWord) && !TextUtils.isEmpty(namePlatePic)) {
+            inNamePlate.setVisibility(View.VISIBLE);
+            TextView tvNamePlate = inNamePlate.findViewById(R.id.tv_official_mask);
+            if (tvNamePlate != null) {
+                tvNamePlate.setText(namePlateWord);
+            }
+
+            ImageView ivNamePlate = inNamePlate.findViewById(R.id.iv_official_mask);
+            if (ivNamePlate != null) {
+                ImageLoadUtils.loadImage(mContext, namePlatePic, ivNamePlate);
+            }
+
+        } else {
+            inNamePlate.setVisibility(View.GONE);
+        }
+
+        AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_noble_level);
+        String resource = (String) NobleUtil.getResource(NobleResourceType.KEY_BADGE, onlineChatMember.chatRoomMember);
+        if (TextUtils.isEmpty(resource)) {
+            ivUserLevel.setVisibility(View.GONE);
+            return;
+        }
+        ivUserLevel.setVisibility(View.VISIBLE);
+        NobleUtil.loadResource(resource, ivUserLevel);
+    }
+
+    private void setSexData(BaseViewHolder baseViewHolder, OnlineChatMember onlineChatMember) {
+        final ImageView sexImage = baseViewHolder.getView(R.id.sex);
+        String gender = NobleUtil.getLevel(UserInfo.GENDER, onlineChatMember.chatRoomMember);
+        if ("1".equals(gender)) {
+            sexImage.setVisibility(View.VISIBLE);
+            sexImage.setImageResource(R.drawable.ic_gender_male);
+        } else if ("2".equals(gender)) {
+            sexImage.setVisibility(View.VISIBLE);
+            sexImage.setImageResource(R.drawable.ic_gender_female);
+        } else {
+            NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(onlineChatMember.chatRoomMember.getAccount());
+            if (nimUserInfo == null) {
+                NimUserInfoCache.getInstance().getUserInfoFromRemote(onlineChatMember.chatRoomMember.getAccount(),
+                        new RequestCallbackWrapper<NimUserInfo>() {
+                            @Override
+                            public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) {
+                                if (nimUserInfo != null) {
+                                    if (nimUserInfo.getGenderEnum() == GenderEnum.MALE) {
+                                        sexImage.setVisibility(View.VISIBLE);
+                                        sexImage.setImageResource(R.drawable.ic_gender_male);
+                                    } else if (nimUserInfo.getGenderEnum() == GenderEnum.FEMALE) {
+                                        sexImage.setVisibility(View.VISIBLE);
+                                        sexImage.setImageResource(R.drawable.ic_gender_female);
+                                    } else {
+                                        sexImage.setVisibility(View.GONE);
+                                    }
+                                }
+                            }
+                        });
+            } else {
+                if (nimUserInfo.getGenderEnum() == GenderEnum.MALE) {
+                    sexImage.setVisibility(View.VISIBLE);
+                    sexImage.setImageResource(R.drawable.ic_gender_male);
+                } else if (nimUserInfo.getGenderEnum() == GenderEnum.FEMALE) {
+                    sexImage.setVisibility(View.VISIBLE);
+                    sexImage.setImageResource(R.drawable.ic_gender_female);
+                } else {
+                    sexImage.setVisibility(View.GONE);
+                }
+            }
+        }
+    }
+
+    private void registerRoomEvent() {
+        mDisposable = IMNetEaseManager.get()
+                .getChatRoomEventObservable()
+                .subscribe(roomEvent -> {
+                    if (roomEvent == null) return;
+                    int event = roomEvent.getEvent();
+                    if (roomEvent.getEvent() == RoomEvent.ADD_BLACK_LIST ||
+                            roomEvent.getEvent() == RoomEvent.DOWN_MIC ||
+                            roomEvent.getEvent() == RoomEvent.KICK_OUT_ROOM) {
+                        if (roomEvent.getEvent() == RoomEvent.ADD_BLACK_LIST ||
+                                roomEvent.getEvent() == RoomEvent.KICK_OUT_ROOM) {
+                            if (mListener != null
+                                    && !AvRoomDataManager.get().isOwner(AuthModel.get().getCurrentUid())) {
+                                mListener.addMemberBlack();
+                                return;
+                            }
+                        }
+                        if (ListUtils.isListEmpty(mData)) return;
+                        if (mIsHomeParty && roomEvent.getEvent() == RoomEvent.DOWN_MIC) {
+                            updateDownUpMic(roomEvent.getAccount(), false);
+                            return;
+                        }
+
+                        if (mListener != null)
+                            mListener.addMemberBlack();
+                    } else if (roomEvent.getEvent() == RoomEvent.ROOM_MANAGER_ADD
+                            || roomEvent.getEvent() == RoomEvent.ROOM_MANAGER_REMOVE) {
+                        updateManager(roomEvent);
+                    } else if (roomEvent.getEvent() == RoomEvent.UP_MIC) {
+                        updateDownUpMic(roomEvent.getAccount(), true);
+                    } else if (event == RoomEvent.ROOM_MEMBER_IN) {
+                        updateMemberIn(roomEvent);
+                    } else if (event == RoomEvent.ROOM_MEMBER_EXIT) {
+                        if (mListener != null) {
+                            mListener.onMemberExit(roomEvent.getAccount(), mData);
+                        }
+                    }
+                });
+    }
+
+    private void updateMemberIn(RoomEvent roomEvent) {
+        if (mListener != null) {
+            mListener.onMemberIn(roomEvent.getAccount(), mData);
+        }
+    }
+
+    private void updateManager(RoomEvent roomEvent) {
+        if (mListener != null)
+            mListener.onUpdateMemberManager(roomEvent.getAccount(),
+                    roomEvent.getEvent() == RoomEvent.ROOM_MANAGER_REMOVE, mData);
+    }
+
+    private void updateDownUpMic(String account, boolean isUpMic) {
+        if (mListener != null) {
+            mListener.onMemberDownUpMic(account, isUpMic, mData);
+        }
+    }
+
+    public void release() {
+        if (mDisposable != null) {
+            mDisposable.dispose();
+            mDisposable = null;
+        }
+    }
+
+    public void setListener(OnRoomOnlineNumberChangeListener listener) {
+        mListener = listener;
+    }
+
+    public interface OnRoomOnlineNumberChangeListener {
+        /**
+         * 成员进来回调
+         *
+         * @param account
+         */
+        void onMemberIn(String account, List<OnlineChatMember> dataList);
+
+        /**
+         * 成员出去回调
+         *
+         * @param account
+         * @param dataList
+         */
+        void onMemberExit(String account, List<OnlineChatMember> dataList);
+
+        /**
+         * 成员上下麦更新
+         *
+         * @param account
+         * @param isUpMic
+         * @param dataList
+         */
+        void onMemberDownUpMic(String account, boolean isUpMic,
+                               List<OnlineChatMember> dataList);
+
+        /**
+         * 设置管理员回调
+         *
+         * @param account
+         * @param dataList
+         */
+        void onUpdateMemberManager(String account, boolean isRemoveManager,
+                                   List<OnlineChatMember> dataList);
+
+        void addMemberBlack();
+    }
+}

app/src/main/java/com/bingchuang/app/avroom/adapter/PKMicQueueAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.view.View;
 import android.widget.TextView;
@@ -8,13 +8,13 @@ import androidx.appcompat.widget.AppCompatImageView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core.room.pk.bean.PKQueuingMicMemberInfo;
+import com.bingchuang.core.room.pk.bean.PKTeamInfo;
+import com.bingchuang.core.user.bean.UserInfo;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.util.List;
 

app/src/main/java/com/bingchuang/app/avroom/adapter/RecordForPKAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
@@ -10,13 +10,13 @@ import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember;
-import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
-import com.yizhuan.xchat_android_library.utils.FormatUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.core.room.pk.bean.PKRecordInfo;
+import com.bingchuang.core.room.pk.bean.PKTeamInfo;
+import com.bingchuang.core.room.pk.bean.PKTeamMember;
+import com.bingchuang.core.room.pk.bean.RoomPkData;
+import com.bingchuang.library.utils.FormatUtils;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

app/src/main/java/com/bingchuang/app/avroom/adapter/RoomBlackListAdapter.java

@@ -1,13 +1,13 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
 
 
 /**

app/src/main/java/com/bingchuang/app/avroom/adapter/RoomConsumeListAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -12,16 +12,16 @@ import androidx.appcompat.widget.AppCompatImageView;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.NobleAvatarView;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.erban.utils.RegexUtil;
-import com.yizhuan.xchat_android_core.noble.bean.NobleInfo;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
-import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo;
-import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.bingchuang.app.R;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.ui.widget.NobleAvatarView;
+import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.bingchuang.app.utils.RegexUtil;
+import com.bingchuang.core.noble.NobleInfo;
+import com.bingchuang.core.noble.NobleUtil;
+import com.bingchuang.core.room.bean.RoomContributeUserInfo;
+import com.bingchuang.core.room.bean.RoomRankMultiItem;
+import com.bingchuang.library.utils.ResUtil;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

app/src/main/java/com/bingchuang/app/avroom/adapter/RoomConsumerListAdapterTemp.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -11,12 +11,12 @@ import androidx.appcompat.widget.AppCompatImageView;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.utils.RegexUtil;
-import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo;
-import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
+import com.bingchuang.app.R;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.utils.RegexUtil;
+import com.bingchuang.core.room.bean.RoomContributeUserInfo;
+import com.bingchuang.core.room.bean.RoomRankMultiItem;
 
 import java.util.ArrayList;
 

app/src/main/java/com/bingchuang/app/avroom/adapter/RoomContributeListAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

app/src/main/java/com/bingchuang/app/avroom/adapter/RoomInviteAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -15,13 +15,13 @@ import com.netease.nimlib.sdk.RequestCallbackWrapper;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.netease.nimlib.sdk.uinfo.constant.GenderEnum;
 import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.ChatMemberDiffUtilCallback;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.manager.RoomEvent;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.bingchuang.app.avroom.ChatMemberDiffUtilCallback;
+import com.bingchuang.app.R;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
+import com.bingchuang.core.manager.AvRoomDataManager;
+import com.bingchuang.core2.manager.IMNetEaseManager;
+import com.bingchuang.core.manager.RoomEvent;
+import com.bingchuang.library.utils.ListUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/bingchuang/app/avroom/adapter/RoomNormalListAdapter.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.adapter;
+package com.bingchuang.app.avroom.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,9 +9,9 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.bingchuang.app.R;
+import com.bingchuang.app.common.widget.CircleImageView;
+import com.bingchuang.app.ui.utils.ImageLoadUtils;
 
 import java.util.List;