fix:修复输入密码进入游戏房的房间状态不一致问题

feat：补充日志信息
fix:调整礼物飘窗样式问题
2023-12-04 18:54:11 +08:00 · 2023-12-04 17:42:29 +08:00 · 2023-12-04 17:42:14 +08:00 · 2023-12-04 17:34:47 +08:00 · 2023-12-04 16:58:11 +08:00 · 2023-12-01 16:54:21 +08:00
4021 changed files with 22720 additions and 28058 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 .externalNativeBuild
 .idea
 .settings
-app/peki/debug/app-accompany-debug.apk
-app/peki/debug/output.json
+app/peko/debug/app-accompany-debug.apk
+app/peko/debug/output.json
 *.apk
-app/peki/release/output.json
+app/peko/release/output.json
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,6 @@
 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'
@@ -9,7 +11,7 @@ android {
    compileSdkVersion COMPILE_SDK_VERSION.toInteger()

    defaultConfig {
-        applicationId "fun.peki.live"
+        applicationId "com.vele.pekolive"
        minSdkVersion MIN_SDK_VERSION.toInteger()
        targetSdkVersion TARGET_SDK_VERSION.toInteger()
        versionCode Integer.valueOf(version_code)
@@ -58,7 +60,7 @@ android {
            if (abi == null) {
                abi = "universal"
            }
-            outputFileName = "peki_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
+            outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
        }
    }

@@ -79,19 +81,19 @@ android {
    signingConfigs {

        v2 {
-            storeFile file('../pikolive.jks')
-            storePassword "pikolive2023"
-            keyAlias "pikolive"
-            keyPassword "pikolive2023"
+            storeFile file('../pekolive.jks')
+            storePassword "peko2023"
+            keyAlias "pekolive"
+            keyPassword "peko2023"
            v2SigningEnabled true
            v1SigningEnabled true
        }

        v1 {
-            storeFile file('../pikolive.jks')
-            storePassword "pikolive2023"
-            keyAlias "pikolive"
-            keyPassword "pikolive2023"
+            storeFile file('../pekolive.jks')
+            storePassword "peko2023"
+            keyAlias "pekolive"
+            keyPassword "peko2023"
            v2SigningEnabled false
            v1SigningEnabled true
        }
@@ -117,7 +119,7 @@ android {
                    'src/module_treasure_box/java',
                    'src/module_community/java',
                    'src/module_album/java',
-                    'src/module_other/java',
+
            ]

            res.srcDirs = [
@@ -137,7 +139,6 @@ android {
                    'src/module_treasure_box/res',
                    'src/module_community/res',
                    'src/module_album/res',
-                    'src/module_other/res',

            ]

@@ -146,14 +147,14 @@ android {
    }

    buildTypes {
-        def server_url_debug = '"http://beta.api.pikolive.fun/"'
-        def server_url_release = '"https://api.pikolive.fun/"'
+        def server_url_debug = '"http://beta.api.pekolive.com/"'
+        def server_url_release = '"https://api.pekolive.com/"'

        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"
@@ -175,10 +176,10 @@ android {
        release {
            ext.enableCrashlytics = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
            ext.alwaysUpdateBuildId = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
-//            firebaseCrashlytics {
-//                //Firebase Crashlytics控制上传混淆文件开关
-//                mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
-//            }
+            firebaseCrashlytics {
+                //Firebase Crashlytics控制上传混淆文件开关
+                mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
+            }

            buildConfigField "String", "BASE_URL", server_url_release
            buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
@@ -284,15 +285,15 @@ dependencies {
    implementation 'com.github.zhpanvip:BannerViewPager:3.5.6'

    //fireBase
-//    implementation platform('com.google.firebase:firebase-bom:31.1.1')
-//    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-//    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation platform('com.google.firebase:firebase-bom:31.1.1')
+    implementation 'com.google.firebase:firebase-crashlytics-ktx'
+    implementation 'com.google.firebase:firebase-analytics-ktx'

    //Adjust接入
-//    implementation 'com.adjust.sdk:adjust-android:4.33.0'
-//    implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.adjust.sdk:adjust-android:4.33.0'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
    // Add the following if you are using the Adjust SDK inside web views on your app
-//    implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
+    implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'

    implementation 'com.github.yalantis:ucrop:2.2.7'

@@ -309,7 +310,7 @@ channel {
    outputDir = new File(project.buildDir, "channelapk")
    //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
    def only64 = onlyArm64 ? "-only64" : ""
-    apkNameFormat = 'peki-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
+    apkNameFormat = 'piko-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
    //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
    fastMode = false
    //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "656602722869",
+    "project_id": "pekolive-30f9e",
+    "storage_bucket": "pekolive-30f9e.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
+        "android_client_info": {
+          "package_name": "com.vele.pekolive"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -29,9 +29,6 @@

 # 保留行号
 -keepattributes SourceFile,LineNumberTable
-obfuscationdictionary ../dic.txt
-classobfuscationdictionary ../dic.txt
-packageobfuscationdictionary ../dic.txt

 #-dontwarn  #//dontwarn去掉警告
 #-dontskipnonpubliclibraryclassmembers
@@ -120,19 +117,19 @@
 -keep class com.netease.** {*;}

 # Presenter 相关
-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
+-keep class com.yizhuan.erban.base.** { *; }
+-keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter
+-keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter

 # 云信自定义 ViewHolder 配置
-dontwarn com.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.** {*;}
+-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.** {*;}
 -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 {*;}

@@ -204,8 +201,8 @@
     <init>(...);
 }

-dontwarn com.bingchuang.app.bindadapter.**
-keep class com.bingchuang.app.bindadapter.** {*;}
+-dontwarn com.yizhuan.erban.bindadapter.**
+-keep class com.yizhuan.erban.bindadapter.** {*;}

 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -236,12 +233,10 @@

 # TODO 网络加载 一些业务bean gson 时候混淆问题
 -keep class org.json.** {*;}
-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.** {*;}
+-dontwarn com.yizhuan.xchat_android_core.**
+-keep class com.yizhuan.xchat_android_core.** {*;}
+-keep class com.yizhuan.treasure_box.bean.** {*;}
+-keep class com.yizhuan.erban.avroom.bean.** {*;}


 #百度统计
@@ -315,8 +310,8 @@
 -keep class com.autonavi.aps.amapapi.model.**{*;}

 #暂时keep这个View排查华为oom问题
-keep class com.bingchuang.app.avroom.widget.MicroView{*;}
-keep class com.bingchuang.app.ui.widget.rollviewpager.RollPagerView{*;}
+-keep class com.yizhuan.erban.avroom.widget.MicroView{*;}
+-keep class com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView{*;}

 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -374,7 +369,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}

-keep class com.bingchuang.app.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}

 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {
@@ -459,7 +454,7 @@
 }

 ## EasyPhotos
-keep class com.bingchuang.library.easyphoto.models.** { *; }
+-keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; }

 ## 图片裁剪UCrop
 -dontwarn com.yalantis.ucrop.**
--- a/app/src/main/AndroidManifest.xml
+++ b/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.bingchuang.app">
+    package="com.yizhuan.erban">

    <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="com.bingchuang.app.application.App"
+        android:name=".application.XChatApplication"
        android:allowBackup="false"
        android:icon="@mipmap/app_logo"
        android:label="@string/app_name"
@@ -97,7 +97,7 @@
        tools:targetApi="n">

        <activity
-            android:name="com.bingchuang.app.other.activity.SplashActivity"
+            android:name=".other.activity.SplashActivity"
            android:exported="true"
            android:screenOrientation="portrait"
            android:theme="@style/SplashTheme">
@@ -122,13 +122,13 @@

                <data
                    android:host="main"
-                    android:scheme="pekiapp" />
+                    android:scheme="pikoapp" />
            </intent-filter>
        </activity>

-<!--        <meta-data-->
-<!--            android:name="firebase_crashlytics_collection_enabled"-->
-<!--            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
+        <meta-data
+            android:name="firebase_crashlytics_collection_enabled"
+            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> <!-- 刘海屏适配 begin -->
        <!-- 小米 -->
        <activity
            android:name="com.soundcloud.android.crop.CropImageActivity"
@@ -161,7 +161,7 @@
           如果 SDKOptions 中提供了，取 SDKOptions 中的值。
        -->
        <activity
-            android:name="fun.peki.live.lineapi.LineAuthenticationCallbackActivity"
+            android:name="com.vele.pekolive.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="com.bingchuang.app.ui.login.BindCodeActivity"
+            android:name=".ui.login.BindCodeActivity"
            android:label="@string/main_androidmanifest_04"
            android:launchMode="singleTop"
            android:screenOrientation="portrait" /> <!-- 申明本地电话状态（通话状态）的广播接收器，第三方APP集成时音视频模块时，如果需要在App中处理网络通话与本地电话的交互请加上此接收器 -->
        <!-- 在Demo的示例代码中是在Application进行了网络通话与本地电话的互斥处理 -->
        <activity
-            android:name="com.bingchuang.app.UserGuideActivity"
+            android:name=".UserGuideActivity"
            android:label="@string/main_androidmanifest_05"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.search.SearchActivity"
+            android:name=".ui.search.SearchActivity"
            android:screenOrientation="portrait" /> <!-- 云信进程间通信provider -->
        <!-- 配置的service和receiver -->
        <activity
-            android:name="com.bingchuang.app.MainActivity"
+            android:name=".MainActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Peki"
+            android:label="Piko"
            android:launchMode="singleTask"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
        <activity
-            android:name="com.bingchuang.app.ui.keepalive.OnePiexlActivity"
+            android:name=".ui.keepalive.OnePiexlActivity"
            android:screenOrientation="portrait"
            android:theme="@style/OnePixelActivity" />
        <activity
-            android:name="com.bingchuang.app.NimMiddleActivity"
+            android:name=".NimMiddleActivity"
            android:noHistory="true"
            android:screenOrientation="portrait" /> <!-- Autolayout####################################################配置 -->
        <activity
-            android:name="com.bingchuang.app.avroom.activity.AVRoomActivity"
+            android:name=".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="com.bingchuang.app.avroom.activity.RoomSettingActivity"
+            android:name=".avroom.activity.RoomSettingActivity"
            android:label="@string/main_androidmanifest_07"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.RoomManagerListActivity"
+            android:name=".avroom.activity.RoomManagerListActivity"
            android:label="@string/main_androidmanifest_08"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.RoomBlackListActivity"
+            android:name=".avroom.activity.RoomBlackListActivity"
            android:label="@string/main_androidmanifest_09"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.RoomIncomeActivity"
+            android:name=".module_hall.hall.activity.RoomIncomeActivity"
            android:label="房间流水"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.music.activity.AddLocalMusicListActivity"
+            android:name="com.yizhuan.tutu.music.activity.AddLocalMusicListActivity"
            android:label="@string/main_androidmanifest_010"
            android:screenOrientation="portrait"
            android:theme="@style/AVRoomTheme" />
        <activity
-            android:name="com.bingchuang.app.music.activity.MusicListActivity"
+            android:name="com.yizhuan.tutu.music.activity.MusicListActivity"
            android:label="@string/main_androidmanifest_011"
            android:launchMode="singleTop"
            android:screenOrientation="portrait"
            android:theme="@style/AVRoomTheme" />
        <activity
-            android:name="com.bingchuang.app.ui.login.AddUserInfoActivity"
+            android:name=".ui.login.AddUserInfoActivity"
            android:label="@string/main_androidmanifest_012"
            android:launchMode="singleTop"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.login.ModifyInfoActivity"
+            android:name=".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="com.bingchuang.app.ui.user.activity.UserInfoActivity"
+            android:name=".ui.user.activity.UserInfoActivity"
            android:label="@string/main_androidmanifest_016"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.audio.AudioRecordActivity"
+            android:name=".audio.AudioRecordActivity"
            android:label="@string/main_androidmanifest_017"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.pay.ChargeActivity"
+            android:name=".ui.pay.ChargeActivity"
            android:label="@string/main_androidmanifest_018"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.home.activity.CollectionRoomActivity"
+            android:name=".home.activity.CollectionRoomActivity"
            android:label="@string/main_androidmanifest_019"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.wallet.ExchangeGoldActivity"
+            android:name=".ui.wallet.ExchangeGoldActivity"
            android:label="@string/main_androidmanifest_020"
            android:screenOrientation="portrait" />
        <activity
            android:name=".ui.setting.SettingActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.relation.AttentionListActivity"
+            android:name=".ui.relation.AttentionListActivity"
            android:screenOrientation="portrait" />
        <activity
            android:name=".ui.relation.FansListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.withdraw.WithdrawActivity"
+            android:name=".ui.withdraw.WithdrawActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.withdraw.bankcard.BindWithdrawBankCardActivity"
+            android:name=".ui.withdraw.bankcard.BindWithdrawBankCardActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.withdraw.WithdrawRuleActivity"
+            android:name=".ui.withdraw.WithdrawRuleActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.withdraw.BinderAlipayActivity"
+            android:name=".ui.withdraw.BinderAlipayActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.user.activity.AboutActivity"
+            android:name=".ui.user.activity.AboutActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.user.activity.ShowPhotoActivity"
+            android:name=".ui.user.activity.ShowPhotoActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.TotalBillsActivity"
+            android:name=".bills.activities.TotalBillsActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.WithdrawBillsActivity"
+            android:name=".bills.activities.WithdrawBillsActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.ChargeBillsActivity"
+            android:name=".bills.activities.ChargeBillsActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.ChatBillsActivity"
+            android:name=".bills.activities.ChatBillsActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.setting.FeedbackActivity"
+            android:name=".ui.setting.FeedbackActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.setting.LabActivity"
+            android:name=".ui.setting.LabActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.webview.CommonWebViewActivity"
+            android:name=".ui.webview.CommonWebViewActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="adjustPan" />
        <activity
-            android:name="com.bingchuang.app.ui.webview.SimpleWebViewActivity"
+            android:name=".ui.webview.SimpleWebViewActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.RedBagBillsActivity"
+            android:name=".bills.activities.RedBagBillsActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.BillGiftExpendActivity"
+            android:name=".bills.activities.BillGiftExpendActivity"
            android:label="@string/main_androidmanifest_021"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.BillGiftInComeActivity"
+            android:name=".bills.activities.BillGiftInComeActivity"
            android:label="@string/main_androidmanifest_022"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.BillNobleActivity"
+            android:name=".bills.activities.BillNobleActivity"
            android:label="@string/bill_noble_open"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.RoomInviteActivity"
+            android:name=".avroom.activity.RoomInviteActivity"
            android:label="@string/main_androidmanifest_023"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity"
+            android:name=".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="com.bingchuang.app.ui.im.avtivity.AddBlackListActivity"
+            android:name=".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="com.bingchuang.app.ui.im.avtivity.BlackListManageActivity"
+            android:name=".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="com.bingchuang.app.decoration.view.MyDecorationActivity"
+            android:name=".decoration.view.MyDecorationActivity"
            android:label="@string/main_androidmanifest_027"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.decoration.view.DecorationStoreActivity"
+            android:name=".decoration.view.DecorationStoreActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.ui.user.activity.UserGiftActivity"
+            android:name=".ui.user.activity.UserGiftActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.friend.view.SelectFriendActivity"
+            android:name=".friend.view.SelectFriendActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyPlazaActivity"
+            android:name=".family.view.activity.FamilyPlazaActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyHomeActivity"
+            android:name=".family.view.activity.FamilyHomeActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilySearchActivity"
+            android:name=".family.view.activity.FamilySearchActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyListActivity"
+            android:name=".family.view.activity.FamilyListActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyManageActivity"
+            android:name=".family.view.activity.FamilyManageActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyCurrencyActivity"
+            android:name=".family.view.activity.FamilyCurrencyActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyMemberListActivity"
+            android:name=".family.view.activity.FamilyMemberListActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyInfoActivity"
+            android:name=".family.view.activity.FamilyInfoActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyMemberSearchActivity"
+            android:name=".family.view.activity.FamilyMemberSearchActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.NimTeamMessageActivity"
+            android:name=".team.view.NimTeamMessageActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.CreateTeamMessageActivity"
+            android:name=".team.view.CreateTeamMessageActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.AddMemberActivity"
+            android:name=".team.view.AddMemberActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.NimTeamManagementActivity"
+            android:name=".team.view.NimTeamManagementActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.TeamMemberListActivity"
+            android:name=".team.view.TeamMemberListActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.TeamMemberSearchListActivity"
+            android:name=".team.view.TeamMemberSearchListActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.AddMemberSearchActivity"
+            android:name=".team.view.AddMemberSearchActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.TeamWeeklyBillActivity"
+            android:name=".team.view.TeamWeeklyBillActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.TeamWeeklyBillSearchActivity"
+            android:name=".team.view.TeamWeeklyBillSearchActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.luckymoney.view.LuckyMoneyCreationActivity"
+            android:name=".luckymoney.view.LuckyMoneyCreationActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustPan" />
        <activity
-            android:name="com.bingchuang.app.luckymoney.view.LuckyMoneyDetailActivity"
+            android:name=".luckymoney.view.LuckyMoneyDetailActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" /> <!-- android:launchMode="singleTask" -->
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyMemberCurrencyActivity"
+            android:name=".family.view.activity.FamilyMemberCurrencyActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.ErbanTakePhotoActivity"
+            android:name=".ErbanTakePhotoActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.team.view.UpdateTeamNameActivity"
+            android:name=".team.view.UpdateTeamNameActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilySelectFriendActivity"
+            android:name=".family.view.activity.FamilySelectFriendActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyTextInputActivity"
+            android:name=".family.view.activity.FamilyTextInputActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.family.view.activity.FamilyGameListActivity"
+            android:name=".family.view.activity.FamilyGameListActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.treasure_box.activity.TreasureBoxActivity"
+            android:name=".treasure_box.activity.TreasureBoxActivity"
            android:theme="@style/dialog_web_view_activity" />
        <activity
-            android:name="com.bingchuang.app.treasure_box.activity.BoxRankingActivity"
+            android:name=".treasure_box.activity.BoxRankingActivity"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.treasure_box.activity.TreasureBoxHonourActivity"
+            android:name=".treasure_box.activity.TreasureBoxHonourActivity"
            android:theme="@style/dialog_web_view_activity" />
        <activity android:name=".ui.setting.VerifyPhoneActivity" />
-        <activity android:name="com.bingchuang.app.ui.setting.ModifyPwdActivity" />
+        <activity android:name=".ui.setting.ModifyPwdActivity" />
        <activity
-            android:name="com.bingchuang.app.ui.widget.LevelUpDialog"
+            android:name=".ui.widget.LevelUpDialog"
            android:launchMode="singleTop"
            android:theme="@style/dialogactivity" />
-        <activity android:name="com.bingchuang.app.home.activity.NewUserListActivity" />
+        <activity android:name=".home.activity.NewUserListActivity" />
        <activity
-            android:name="com.bingchuang.app.ui.widget.RecallDialog"
+            android:name=".ui.widget.RecallDialog"
            android:screenOrientation="portrait"
            android:theme="@style/dialog_activity_close_inside" />
        <activity
-            android:name="com.bingchuang.app.public_chat_hall.activity.PublicChatHallHomeActivity"
+            android:name=".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="com.bingchuang.app.public_chat_hall.activity.PublicChatHallAitFriendsActivity"
+            android:name=".public_chat_hall.activity.PublicChatHallAitFriendsActivity"
            android:configChanges="keyboardHidden|orientation"
            android:label="@string/main_androidmanifest_029"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.user.decorationsend.DecorationSendActivity"
+            android:name=".ui.user.decorationsend.DecorationSendActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.RoomRankListActivity"
+            android:name=".avroom.activity.RoomRankListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.RoomOnlineUserActivity"
+            android:name=".avroom.activity.RoomOnlineUserActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.public_chat_hall.activity.PublicChatHallRelatedToMeActivity"
+            android:name=".public_chat_hall.activity.PublicChatHallRelatedToMeActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.public_chat_hall.activity.AitFriendsSearchActivity"
+            android:name=".public_chat_hall.activity.AitFriendsSearchActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
            android:name=".ui.login.ShowBindPhoneActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.RoomTitleEditActivity"
+            android:name=".avroom.activity.RoomTitleEditActivity"
            android:label="@string/title_room_title_edit"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.CreatePKActivity"
+            android:name=".avroom.activity.CreatePKActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.RecordForPKActivity"
+            android:name=".avroom.activity.RecordForPKActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.ModuleHallActivity"
+            android:name=".module_hall.hall.activity.ModuleHallActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.ModuleClanActivity"
+            android:name=".module_hall.hall.activity.ModuleClanActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.IncomeStatisticsActivity"
+            android:name=".module_hall.hall.activity.IncomeStatisticsActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.ClanIncomeActivity"
+            android:name=".module_hall.hall.activity.ClanIncomeActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.SingleRoomIncomeActivity"
+            android:name=".module_hall.hall.activity.SingleRoomIncomeActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.HallMemberListActivity"
+            android:name=".module_hall.hall.activity.HallMemberListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.HallNameSettingActivity"
+            android:name=".module_hall.hall.activity.HallNameSettingActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.team.activity.CreateHallTeamActivity"
+            android:name=".module_hall.team.activity.CreateHallTeamActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustNothing" />
        <activity
-            android:name="com.bingchuang.app.module_hall.team.activity.SelectTeamMemberActivity"
+            android:name=".module_hall.team.activity.SelectTeamMemberActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.team.activity.TeamInfoShowActivity"
+            android:name=".module_hall.team.activity.TeamInfoShowActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateAlwaysHidden" />
        <activity
-            android:name="com.bingchuang.app.module_hall.team.activity.TeamEditActivity"
+            android:name=".module_hall.team.activity.TeamEditActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.RemoveMemberListActivity"
+            android:name=".module_hall.hall.activity.RemoveMemberListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.AdminListActivity"
+            android:name=".module_hall.hall.activity.AdminListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.AdminAddActivity"
+            android:name=".module_hall.hall.activity.AdminAddActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.AuthSettingActivity"
+            android:name=".module_hall.hall.activity.AuthSettingActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.MemberSearchActivity"
+            android:name=".module_hall.hall.activity.MemberSearchActivity"
            android:windowSoftInputMode="adjustPan" />
        <activity
-            android:name="com.bingchuang.app.avroom.activity.CpRoomInviteActivity"
+            android:name=".avroom.activity.CpRoomInviteActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.HallSearchActivity"
+            android:name=".module_hall.hall.activity.HallSearchActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.income.IncomeDetailActivity"
+            android:name=".module_hall.income.IncomeDetailActivity"
            android:screenOrientation="portrait" /> <!-- 模厅 -->
        <activity
-            android:name="com.bingchuang.app.module_hall.team.activity.HallTeamMessageActivity"
+            android:name=".module_hall.team.activity.HallTeamMessageActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.team.activity.HTeamMemberListActivity"
+            android:name=".module_hall.team.activity.HTeamMemberListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.mentoring_relationship.activity.MentoringRelationshipActivity"
+            android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
            android:label="@string/main_androidmanifest_030"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.avroom.recommendcard.MyRecommendCardActivity"
+            android:name=".avroom.recommendcard.MyRecommendCardActivity"
            android:launchMode="singleTask"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.room_chat.activity.NimRoomP2PMessageActivity"
+            android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.room_chat.activity.RoomMsgActivity"
+            android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.room_chat.activity.RoomNewbieActivity"
+            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.room_chat.activity.RoomNewbieMessageActivity"
+            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.room_chat.activity.RoomInviteFansActivity"
+            android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.room_chat.activity.NimTeamRoomMessageActivity"
+            android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"
            android:screenOrientation="portrait"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.room_chat.activity.NimHallTeamRoomMessageActivity"
+            android:name="com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity"
            android:screenOrientation="portrait"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.bills.activities.BillGiftIncomeGroupActivity"
+            android:name=".bills.activities.BillGiftIncomeGroupActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.radish.activity.RadishRecordActivity"
+            android:name=".radish.activity.RadishRecordActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.radish.signin.SignInActivity"
+            android:name=".radish.signin.SignInActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.radish.task.activity.TaskCenterActivity"
+            android:name=".radish.task.activity.TaskCenterActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.patriarch.PatriarchModeActivity"
+            android:name=".ui.patriarch.PatriarchModeActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.ui.patriarch.PatriarchPwdActivity"
+            android:name=".ui.patriarch.PatriarchPwdActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateVisible" />
        <activity
-            android:name="com.bingchuang.app.guide.GuideActivity"
+            android:name=".guide.GuideActivity"
            android:screenOrientation="portrait"
            android:theme="@style/AVRoomTheme" />
        <activity
-            android:name="com.bingchuang.app.audio.MyVoiceActivity"
+            android:name=".audio.MyVoiceActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.audio.RecordingVoiceActivity"
+            android:name=".audio.RecordingVoiceActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.audio.VoiceMatchActivity"
+            android:name=".audio.VoiceMatchActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldGuestPageActivity"
+            android:name=".miniworld.activity.MiniWorldGuestPageActivity"
            android:screenOrientation="portrait" /> <!-- 推荐位 -->
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.TopicMainActivity"
+            android:name=".miniworld.activity.TopicMainActivity"
            android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldEditActivity"
+            android:name=".miniworld.activity.MiniWorldEditActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldMemberListActivity"
+            android:name=".miniworld.activity.MiniWorldMemberListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldTeamMessageActivity"
+            android:name=".miniworld.activity.MiniWorldTeamMessageActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MWTeamRoomMessageAct"
+            android:name=".miniworld.activity.MWTeamRoomMessageAct"
            android:screenOrientation="portrait"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldGroupThemeActivity"
+            android:name=".miniworld.activity.MiniWorldGroupThemeActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldActivity"
+            android:name=".miniworld.activity.MiniWorldActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.AllTopicActivity"
+            android:name=".miniworld.activity.AllTopicActivity"
            android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
        <!-- 萝卜-签到-任务 -->
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldSearchActivity"
+            android:name=".miniworld.activity.MiniWorldSearchActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.miniworld.activity.MiniWorldMainActivity"
+            android:name=".miniworld.activity.MiniWorldMainActivity"
            android:screenOrientation="portrait" />
-        <activity android:name="com.bingchuang.app.ui.im.friend.ActFriendList" />
+        <activity android:name=".ui.im.friend.ActFriendList" />
        <activity
-            android:name="com.bingchuang.app.bank_card.activity.BankCardListActivity"
+            android:name=".bank_card.activity.BankCardListActivity"
            android:screenOrientation="portrait" /> <!-- 萝卜-签到-任务 -->
        <activity
-            android:name="com.bingchuang.app.bank_card.activity.BankCardListUnbindActivity"
+            android:name=".bank_card.activity.BankCardListUnbindActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bank_card.activity.BankCardBindActivity"
+            android:name=".bank_card.activity.BankCardBindActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.bank_card.activity.AddBankCardAgreementActivity"
+            android:name=".bank_card.activity.AddBankCardAgreementActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.sadmin.RoomSAdminManagerActivity"
+            android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.home.activity.CommunityNoticeAct"
+            android:name=".home.activity.CommunityNoticeAct"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.community.publish.view.PublishActivity"
+            android:name=".community.publish.view.PublishActivity"
            android:launchMode="singleTop"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustNothing" />
        <activity
-            android:name="com.bingchuang.app.community.dynamic.view.DynamicDetailActivity"
+            android:name=".community.dynamic.view.DynamicDetailActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="adjustPan" />
        <activity
-            android:name="com.bingchuang.app.community.photo.PreviewPhotoActivity"
+            android:name=".community.photo.PreviewPhotoActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.community.photo.BigPhotoActivity"
+            android:name=".community.photo.BigPhotoActivity"
            android:screenOrientation="portrait" />
        <activity
            android:name="com.zhihu.matisse.ui.MatisseActivity"
@@ -792,59 +792,63 @@
            android:name="com.zhihu.matisse.internal.ui.SelectedPreviewActivity"
            android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
        <activity
-            android:name="com.bingchuang.app.ui.wallet.sendgold.SendGoldActivity"
+            android:name=".ui.wallet.sendgold.SendGoldActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.pay.activity.GiveGoldActivity"
+            android:name=".pay.activity.GiveGoldActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.pay.activity.GiveGoldDetailActivity"
+            android:name=".pay.activity.GiveGoldDetailActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.pay.activity.GiveGoldToUserActivity"
+            android:name=".pay.activity.GiveGoldToUserActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="adjustPan" />
        <activity
-            android:name="com.bingchuang.app.pay.activity.GiveGoldSearchActivity"
+            android:name=".pay.activity.GiveGoldSearchActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden|adjustResize" />
        <activity
-            android:name="com.bingchuang.app.ui.setting.PrivacySettingActivity"
+            android:name=".ui.setting.PrivacySettingActivity"
            android:screenOrientation="portrait" /> <!-- 银行卡列表 -->
        <activity
-            android:name="com.bingchuang.app.ui.setting.NoticeSettingActivity"
+            android:name=".ui.setting.NoticeSettingActivity"
            android:screenOrientation="portrait" /> <!-- 解除绑定银行卡 -->
        <activity
-            android:name="com.bingchuang.app.ui.login.LoginActivity"
+            android:name=".ui.login.LoginActivity"
            android:label="@string/main_androidmanifest_031"
            android:launchMode="singleTask"
            android:screenOrientation="portrait" /> <!-- 绑定银行卡 -->
        <activity
-            android:name="com.bingchuang.app.ui.webview.DialogWebViewActivity"
+            android:name=".ui.webview.DialogWebViewActivity"
            android:theme="@style/dialog_web_view_activity"
            android:windowSoftInputMode="adjustPan" /> <!-- 隐私政策 -->
        <activity
-            android:name="com.bingchuang.app.ui.webview.DatingRuleWebViewActivity"
+            android:name=".ui.webview.DatingRuleWebViewActivity"
            android:theme="@style/dialog_web_view_activity" />
        <activity
-            android:name="com.bingchuang.app.ui.webview.TarotPayWebViewActivity"
+            android:name=".ui.webview.room_banner.RoomBannerWebDialogActivity"
+            android:theme="@style/dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan"  />
+        <activity
+            android:name=".ui.webview.TarotPayWebViewActivity"
            android:theme="@style/dialog_web_view_activity" />
        <activity
-            android:name="com.bingchuang.app.ui.login.LoginPasswordActivity"
+            android:name=".ui.login.LoginPasswordActivity"
            android:screenOrientation="portrait" /> <!-- 社区 -->
        <activity
            android:name=".ui.setting.ResetPasswordActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.SuperAdminManageActivity"
+            android:name=".module_hall.hall.activity.SuperAdminManageActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.module_hall.hall.activity.SuperAdminAddActivity"
+            android:name=".module_hall.hall.activity.SuperAdminAddActivity"
            android:screenOrientation="portrait" />
-        <activity android:name="com.bingchuang.app.module_hall.hall.activity.SuperAdminRoomSetActivity" /> <!-- 知乎相册 -->
+        <activity android:name=".module_hall.hall.activity.SuperAdminRoomSetActivity" /> <!-- 知乎相册 -->
        <activity
            android:name=".avroom.anotherroompk.RoomPKCreateActivity"
            android:theme="@style/dialog_web_view_activity"
@@ -871,10 +875,10 @@
            android:name=".ui.setting.PermissionGuideActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.vip.VipMainActivity"
+            android:name=".vip.VipMainActivity"
            android:screenOrientation="portrait" /> <!-- 隐私设置 -->
        <activity
-            android:name="com.bingchuang.app.vip.VipSettingActivity"
+            android:name=".vip.VipSettingActivity"
            android:screenOrientation="portrait" /> <!-- 通知提醒设置 -->
        <activity
            android:name=".skill.activity.AddSkillActivity"
@@ -904,22 +908,22 @@
            android:name=".relation.cp.activity.CpInviteRecordActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.fansteam.FansTeamJoinActivity"
+            android:name=".fansteam.FansTeamJoinActivity"
            android:theme="@style/dialog_web_view_activity" />
        <activity
-            android:name="com.bingchuang.app.fansteam.FansTeamJoinedActivity"
+            android:name=".fansteam.FansTeamJoinedActivity"
            android:theme="@style/dialog_web_view_activity" />
        <activity
-            android:name="com.bingchuang.app.fansteam.FansTeamListActivity"
+            android:name=".fansteam.FansTeamListActivity"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.shipantics.PullRadishActivity"
+            android:name=".shipantics.PullRadishActivity"
            android:theme="@style/dialog_web_view_activity" />
        <activity
-            android:name="com.bingchuang.app.shipantics.RadishRankingActivity"
+            android:name=".shipantics.RadishRankingActivity"
            android:theme="@style/room_message_activity" />
        <activity
-            android:name="com.bingchuang.app.AgentActivity"
+            android:name=".AgentActivity"
            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
        <activity
            android:name="com.yalantis.ucrop.UCropActivity"
@@ -928,27 +932,27 @@
            android:screenOrientation="portrait"
            android:theme="@style/AppThemeUCrop" />
        <activity
-            android:name="com.bingchuang.app.earn.activity.EarnRecordActivity"
+            android:name=".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="com.bingchuang.app.earn.activity.ConvertDiamondActivity"
+            android:name=".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="com.bingchuang.app.earn.activity.EarnWithdrawActivity"
+            android:name=".earn.activity.EarnWithdrawActivity"
            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
            android:exported="false"
            android:screenOrientation="portrait" /> <!-- com.yizhuan.xchat_android_core.skill -->
        <activity
-            android:name="com.bingchuang.app.earn.activity.BindWithdrawMsgActivity"
+            android:name=".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="com.bingchuang.app.earn.activity.GoldDetailActivity"
+            android:name=".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" />
@@ -968,12 +972,12 @@
            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
-            android:name="com.bingchuang.app.audio.SoundSignatureActivity"
+            android:name=".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="com.bingchuang.app.module_hall.hall.activity.ExchangePermissionActivity"
+            android:name=".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" />
@@ -988,7 +992,7 @@
            android:theme="@style/transparent_activity" />

        <activity
-            android:name="com.bingchuang.app.ui.webview.FairyDialogWebViewActivity"
+            android:name=".ui.webview.FairyDialogWebViewActivity"
            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
            android:exported="false"
            android:theme="@style/transparent_activity" />
@@ -1087,11 +1091,7 @@
        </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>
--- a/app/src/main/java/com/bingchuang/app/AgentActivity.java
+++ b/app/src/main/java/com/bingchuang/app/AgentActivity.java
@@ -1,117 +0,0 @@
-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;
-        }
-
-    }
-}
--- a/app/src/main/java/com/bingchuang/app/application/ReportManager.java
+++ b/app/src/main/java/com/bingchuang/app/application/ReportManager.java
@@ -1,124 +0,0 @@
-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);
-    }
-
-
-}
--- a/app/src/main/java/com/bingchuang/app/avroom/redpackage/RedPackageEvent.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/redpackage/RedPackageEvent.java
@@ -1,4 +0,0 @@
-package com.bingchuang.app.avroom.redpackage;
-
-public class RedPackageEvent {
-}
--- a/app/src/main/java/com/bingchuang/app/bills/presenter/BillGiftIncomeGroupPresenter.java
+++ b/app/src/main/java/com/bingchuang/app/bills/presenter/BillGiftIncomeGroupPresenter.java
@@ -1,7 +0,0 @@
-package com.bingchuang.app.bills.presenter;
-
-import com.bingchuang.app.base.BaseMvpPresenter;
-import com.bingchuang.app.bills.view.IBillGiftIncomeGroupView;
-
-public class BillGiftIncomeGroupPresenter extends BaseMvpPresenter<IBillGiftIncomeGroupView> {
-}
--- a/app/src/main/java/com/bingchuang/app/bills/view/IBillGiftIncomeGroupView.java
+++ b/app/src/main/java/com/bingchuang/app/bills/view/IBillGiftIncomeGroupView.java
@@ -1,6 +0,0 @@
-package com.bingchuang.app.bills.view;
-
-import com.bingchuang.library.base.IMvpBaseView;
-
-public interface IBillGiftIncomeGroupView extends IMvpBaseView {
-}
--- a/app/src/main/java/com/bingchuang/app/bills/view/ISmoothToTopView.java
+++ b/app/src/main/java/com/bingchuang/app/bills/view/ISmoothToTopView.java
@@ -1,7 +0,0 @@
-package com.bingchuang.app.bills.view;
-
-import com.bingchuang.library.base.IMvpBaseView;
-
-public interface ISmoothToTopView extends IMvpBaseView {
-    void smoothScrollToTop();
-}
--- a/app/src/main/java/com/bingchuang/app/family/presenter/FamilyManagePresenter.java
+++ b/app/src/main/java/com/bingchuang/app/family/presenter/FamilyManagePresenter.java
@@ -1,14 +0,0 @@
-package com.bingchuang.app.family.presenter;
-
-import com.bingchuang.app.base.BaseMvpPresenter;
-import com.bingchuang.app.family.contract.viewinterface.IFamilyManageActivityView;
-
-/**
- * @author jack
- * @Description
- * @Date 2018/5/25
- */
-
-public class FamilyManagePresenter extends BaseMvpPresenter<IFamilyManageActivityView> {
-
-}
--- a/app/src/main/java/com/bingchuang/app/family/presenter/FamilySelectFriendPresenter.java
+++ b/app/src/main/java/com/bingchuang/app/family/presenter/FamilySelectFriendPresenter.java
@@ -1,14 +0,0 @@
-package com.bingchuang.app.family.presenter;
-
-
-import com.bingchuang.app.base.BaseMvpPresenter;
-import com.bingchuang.app.family.contract.viewinterface.IFamilySelectFriendActivityView;
-
-/**
- * @author jack
- * @Description
- * @Date 2018/7/4
- */
-
-public class FamilySelectFriendPresenter extends BaseMvpPresenter<IFamilySelectFriendActivityView> {
-}
--- a/app/src/main/java/com/bingchuang/app/home/adapter/HomeHotAdapter.kt
+++ b/app/src/main/java/com/bingchuang/app/home/adapter/HomeHotAdapter.kt
@@ -1,37 +0,0 @@
-package com.bingchuang.app.home.adapter
-
-import android.widget.ImageView
-import androidx.core.view.isGone
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.bingchuang.app.R
-import com.bingchuang.app.ui.utils.load
-import com.bingchuang.core2.home.bean.HomeRoomInfo
-
-/**
- * create by lvzebiao @2019/11/13
- */
-class HomeHotAdapter :
-    BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_room_recommend) {
-
-    override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) {
-        helper.apply {
-            getView<ImageView>(R.id.iv_room_image).load(item.avatar)
-            setText(R.id.tv_online_number, "${item.onlineNum}")
-            setText(R.id.tv_room_title, item.title)
-        }
-
-        val avatars: Array<ImageView> = arrayOf(
-            helper.getView(R.id.iv_avatar_0),
-            helper.getView(R.id.iv_avatar_1),
-            helper.getView(R.id.iv_avatar_2),
-            helper.getView(R.id.iv_avatar_3),
-            helper.getView(R.id.iv_avatar_4)
-        )
-        for (i in avatars.indices) {
-            val avatarUrl = item.micUsers?.getOrNull(i)?.avatar
-            avatars[i].isGone = avatarUrl.isNullOrBlank()
-            avatars[i].load(avatarUrl)
-        }
-    }
-}
--- a/app/src/main/java/com/bingchuang/app/home/adapter/RoomActAdapter.java
+++ b/app/src/main/java/com/bingchuang/app/home/adapter/RoomActAdapter.java
@@ -1,95 +0,0 @@
-package com.bingchuang.app.home.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import com.netease.nim.uikit.support.glide.GlideApp;
-import com.bingchuang.app.R;
-import com.bingchuang.app.avroom.firstcharge.FirstChargeDialog;
-import com.bingchuang.app.shipantics.PullRadishActivity;
-import com.bingchuang.app.treasure_box.widget.GoldBoxHelper;
-import com.bingchuang.app.treasurefairy.HomeFairyActivity;
-import com.bingchuang.app.ui.utils.ImageLoadUtils;
-import com.bingchuang.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
-import com.bingchuang.app.utils.CommonJumpHelper;
-import com.bingchuang.core2.home.bean.BannerInfo;
-import com.bingchuang.core.room.model.AvRoomModel;
-import com.bingchuang.library.utils.config.BasicConfig;
-
-import java.util.List;
-
-public class RoomActAdapter extends StaticPagerAdapter {
-
-    private Context mContext;
-    private List<BannerInfo> data;
-    private RoomActClickListener listener;
-
-    public RoomActAdapter(Context context, List<BannerInfo> data) {
-        this.data = data;
-        this.mContext = context;
-    }
-
-    @Override
-    public View getView(ViewGroup container, int position) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_room_act, container, false);
-        ImageView ivCover = view.findViewById(R.id.iv_cover);
-        BannerInfo bannerInfo = data.get(position);
-        String actId = String.valueOf(bannerInfo.getBannerId());
-        ivCover.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        if (bannerInfo.isFairy()) {
-            ivCover.setImageResource(R.drawable.ic_fairy_entrance);
-        } else if (bannerInfo.isFirstCharge()) {
-            ivCover.setImageResource(R.drawable.ic_first_charge_enter);
-        } else if (bannerInfo.isBox()) {
-            GlideApp.with(BasicConfig.INSTANCE.getAppContext())
-                    .load(GoldBoxHelper.getBoxIcon())
-                    .error(R.drawable.icon_room_treasure_box)
-                    .into(ivCover);
-        } else if (bannerInfo.isRadish()) {
-            ivCover.setImageResource(R.drawable.ic_radish_entrance);
-        } else {
-            ImageLoadUtils.loadImage(mContext, bannerInfo.getBannerPic(), ivCover, R.drawable.default_cover);
-        }
-        ivCover.setOnClickListener(v -> {
-            if (bannerInfo.isFairy()) {
-                HomeFairyActivity.start(mContext);
-            } else if (bannerInfo.isFirstCharge()) {
-                FirstChargeDialog.start(mContext);
-            } else if (bannerInfo.isBox()) {
-                GoldBoxHelper.handleBoxClick(mContext);
-            } else if (bannerInfo.isRadish()) {
-                PullRadishActivity.start(mContext);
-            } else {
-                AvRoomModel.get().activityClickLog("2", actId).subscribe();
-                if (bannerInfo.getSkipType() == 3 && bannerInfo.getShowType() != 1) {
-                    if (listener != null) {
-                        listener.onWebClick(bannerInfo.getSkipUri());
-                    }
-                } else {
-                    CommonJumpHelper.bannerJump(mContext, bannerInfo);
-                }
-            }
-        });
-        return view;
-    }
-
-    @Override
-    public int getCount() {
-        if (data != null) {
-            return data.size();
-        } else {
-            return 0;
-        }
-    }
-
-    public void setRoomActClickListener(RoomActClickListener listener) {
-        this.listener = listener;
-    }
-
-    public interface RoomActClickListener {
-        void onWebClick(String url);
-    }
-}
--- a/app/src/main/java/com/bingchuang/app/home/event/ContactTrashEvent.java
+++ b/app/src/main/java/com/bingchuang/app/home/event/ContactTrashEvent.java
@@ -1,4 +0,0 @@
-package com.bingchuang.app.home.event;
-
-public class ContactTrashEvent {
-}
--- a/app/src/main/java/com/bingchuang/app/home/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/bingchuang/app/home/fragment/HomeFragment.kt
@@ -1,152 +0,0 @@
-package com.bingchuang.app.home.fragment
-
-import android.view.View
-import android.widget.TextView
-import androidx.fragment.app.activityViewModels
-import com.bingchuang.app.R
-import com.bingchuang.app.application.IReportConstants
-import com.bingchuang.app.application.ReportManager
-import com.bingchuang.app.base.BaseViewBindingFragment
-import com.bingchuang.app.databinding.FragmentHomeBinding
-import com.bingchuang.app.home.HomeViewModel
-import com.bingchuang.app.home.adapter.HomeBannerAdapter
-import com.bingchuang.app.home.dialog.RecommendRoomDialog
-import com.bingchuang.app.home.helper.OpenRoomHelper
-import com.bingchuang.app.ui.im.avtivity.NimP2PMessageActivity
-import com.bingchuang.app.ui.search.SearchActivity
-import com.bingchuang.app.ui.user.adapter.MainIndicatorAdapter
-import com.bingchuang.app.ui.webview.CommonWebViewActivity
-import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil
-import com.bingchuang.app.utils.CommonJumpHelper
-import com.bingchuang.core.DemoCache
-import com.bingchuang.core2.UriProvider
-import com.bingchuang.core2.home.bean.BannerInfo
-import com.bingchuang.library.utils.ListUtils
-import com.zhpan.bannerview.BannerViewPager
-
-/**
- * Peki首页
- */
-class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), View.OnClickListener,
-    MainIndicatorAdapter.OnItemSelectListener {
-
-    private val homeViewModel: HomeViewModel by activityViewModels()
-
-    private var mBanner: BannerViewPager<BannerInfo>? = null
-
-    override fun init() {
-        mBanner = view?.findViewById(R.id.banner)
-        initTitleTab()
-        initListener()
-        homeViewModel.bannerLiveData.observe(this) {
-            it?.let {
-                if (ListUtils.isListEmpty(it)) {
-                    mBanner?.visibility = View.GONE
-                    return@let
-                }
-                mBanner?.visibility = View.VISIBLE
-                mBanner?.adapter = HomeBannerAdapter()
-                mBanner?.post {
-                    mBanner?.apply {
-                        this.setPageMargin(UIUtil.dip2px(mContext, 8.0))
-                            .setScrollDuration(800)
-                            .setOnPageClickListener { _: View?, position: Int ->
-                                //首页_banner
-                                ReportManager.get().reportEvent(
-                                    IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf(
-                                        Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.SIX),
-                                        Pair(
-                                            IReportConstants.MODULE,
-                                            IReportConstants.PEKO_HOMEPAGE
-                                        )
-                                    )
-                                )
-                                CommonJumpHelper.bannerJump(context, it[position])
-                            }
-                            .create(it)
-                    }
-                }
-            }
-        }
-        homeViewModel.resourceJumpLiveData.observe(this) {
-            dialogManager.dismissDialog()
-            it?.let {
-                if (it.isPick) {
-                    com.bingchuang.app.avroom.activity.AVRoomActivity.start(context, it.uid)
-                } else {
-                    RecommendRoomDialog.newInstance(it).show(context)
-                }
-            }
-        }
-
-        homeViewModel.homeChatPickLiveData.observe(viewLifecycleOwner) {
-            dialogManager.dismissDialog()
-            it?.let {
-                if (it.isNotEmpty()) {
-                    NimP2PMessageActivity.start(context, it)
-                }
-            }
-        }
-        homeViewModel.getBannerInfo()
-        homeViewModel.getCurrentResourceInfo()
-    }
-
-    private fun initListener() {
-        binding.ivSearch.setOnClickListener(this)
-        binding.ivRanking.setOnClickListener(this)
-        binding.ivMyRoom.setOnClickListener(this)
-    }
-
-    override fun onClick(v: View) {
-        when (v.id) {
-            R.id.iv_search -> {
-                //首页_搜索
-                ReportManager.get().reportEvent(
-                    IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf(
-                        Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.ONE),
-                        Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE)
-                    )
-                )
-                SearchActivity.start(activity)
-                //为啥触发条件这么恶心
-                if (DemoCache.readAnchorCardView() == 0) {
-                    DemoCache.saveAnchorCardView(1)
-                }
-            }
-
-            R.id.iv_ranking -> {
-                //首页_排行榜
-                ReportManager.get().reportEvent(
-                    IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf(
-                        Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.THREE),
-                        Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE)
-                    )
-                )
-                CommonWebViewActivity.start(mContext, UriProvider.getRanking())
-            }
-
-            R.id.iv_my_room -> {
-                //首页_创建房间
-                ReportManager.get().reportEvent(
-                    IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf(
-                        Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.TWO),
-                        Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE)
-                    )
-                )
-                OpenRoomHelper.openRoom(baseActivity)
-            }
-        }
-    }
-
-    /**
-     * 初始化推荐
-     */
-    private fun initTitleTab() {
-        childFragmentManager.beginTransaction()
-            .add(R.id.frameLayout, RecommendFragment(), "RecommendFragment")
-            .commitAllowingStateLoss()
-    }
-
-    override fun onItemSelect(position: Int, view: TextView?) {
-    }
-}
--- a/app/src/main/java/com/bingchuang/app/other/present/SplashPresenter.java
+++ b/app/src/main/java/com/bingchuang/app/other/present/SplashPresenter.java
@@ -1,15 +0,0 @@
-package com.bingchuang.app.other.present;
-
-import com.bingchuang.app.base.BaseMvpPresenter;
-import com.bingchuang.app.other.view.ISplashView;
-
-/**
- * <p>  </p>
- *
- * @author jiahui
- * @date 2017/12/8
- */
-public class SplashPresenter extends BaseMvpPresenter<ISplashView> {
-
-
-}
--- a/app/src/main/java/com/bingchuang/app/radish/task/presenter/TaskCenterFrgPresenter.java
+++ b/app/src/main/java/com/bingchuang/app/radish/task/presenter/TaskCenterFrgPresenter.java
@@ -1,7 +0,0 @@
-package com.bingchuang.app.radish.task.presenter;
-
-import com.bingchuang.app.base.BaseMvpPresenter;
-import com.bingchuang.app.radish.task.view.ITaskCenterViewFrg;
-
-public class TaskCenterFrgPresenter extends BaseMvpPresenter<ITaskCenterViewFrg> {
-}
--- a/app/src/main/java/com/bingchuang/app/radish/task/presenter/TaskCenterPresenter.java
+++ b/app/src/main/java/com/bingchuang/app/radish/task/presenter/TaskCenterPresenter.java
@@ -1,12 +0,0 @@
-package com.bingchuang.app.radish.task.presenter;
-
-import com.bingchuang.app.base.BaseMvpPresenter;
-import com.bingchuang.app.radish.task.view.ITaskCenterView;
-
-/**
- * create by lvzebiao @2019/3/27
- */
-public class TaskCenterPresenter extends BaseMvpPresenter<ITaskCenterView> {
-
-
-}
--- a/app/src/main/java/com/bingchuang/app/radish/task/view/ITaskCenterView.java
+++ b/app/src/main/java/com/bingchuang/app/radish/task/view/ITaskCenterView.java
@@ -1,11 +0,0 @@
-package com.bingchuang.app.radish.task.view;
-
-import com.bingchuang.core.radish.task.bean.TaskInfo;
-import com.bingchuang.library.base.IMvpBaseView;
-
-/**
- * create by lvzebiao @2019/3/27
- */
-public interface ITaskCenterView extends IMvpBaseView {
-    void playPriceAnim(TaskInfo info);
-}
--- a/app/src/main/java/com/bingchuang/app/radish/task/view/ITaskCenterViewFrg.java
+++ b/app/src/main/java/com/bingchuang/app/radish/task/view/ITaskCenterViewFrg.java
@@ -1,6 +0,0 @@
-package com.bingchuang.app.radish.task.view;
-
-import com.bingchuang.library.base.IMvpBaseView;
-
-public interface ITaskCenterViewFrg extends IMvpBaseView {
-}
--- a/app/src/main/java/com/bingchuang/app/radish/view/IRadishRecordView.java
+++ b/app/src/main/java/com/bingchuang/app/radish/view/IRadishRecordView.java
@@ -1,6 +0,0 @@
-package com.bingchuang.app.radish.view;
-
-import com.bingchuang.library.base.IMvpBaseView;
-
-public interface IRadishRecordView extends IMvpBaseView {
-}
--- a/app/src/main/java/com/bingchuang/app/support/IMUserInfoProvider.kt
+++ b/app/src/main/java/com/bingchuang/app/support/IMUserInfoProvider.kt
@@ -1,19 +0,0 @@
-package com.bingchuang.app.support
-
-import com.netease.nim.uikit.impl.provider.DefaultUserInfoProvider
-import com.bingchuang.core.settings.SettingsModel
-
-/**
- * Created by Max on 2023/11/10 16:38
- * Desc:IM用户信息提供者
- **/
-class IMUserInfoProvider : DefaultUserInfoProvider() {
-
-    override fun getUserAvatar(account: String?): String? {
-        if (account != null && account == SettingsModel.get().secretaryUid) {
-            // 小秘书头像
-            return "https://piko-1320554189.cos.ap-singapore.myqcloud.com/%E5%B0%8F%E7%A7%98%E4%B9%A6.png"
-        }
-        return super.getUserAvatar(account)
-    }
-}
--- a/app/src/main/java/com/bingchuang/app/ui/utils/sys/PermissionUtil.kt
+++ b/app/src/main/java/com/bingchuang/app/ui/utils/sys/PermissionUtil.kt
@@ -1,4 +0,0 @@
-package com.bingchuang.app.ui.utils.sys
-
-class PermissionUtil {
-}
--- a/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java
+++ b/app/src/main/java/com/bingchuang/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/ThemePagerIndicator.java
@@ -1,26 +0,0 @@
-package com.bingchuang.app.ui.widget.magicindicator.buildins.commonnavigator.indicators;
-
-import android.content.Context;
-import android.graphics.Canvas;
-
-import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
-
-/**
- * 实现指示器帮助类
- */
-public class ThemePagerIndicator extends LinePagerIndicator {
-
-    private Context mContext;
-
-    public ThemePagerIndicator(Context context) {
-        super(context);
-        mContext = context;
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        getPaint().setColor(0xFFFF84C0);
-        canvas.drawRoundRect(getLineRect(), UIUtil.dip2px(mContext, 5), UIUtil.dip2px(mContext, 5), getPaint());
-    }
-
-}
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java
@@ -13,8 +13,8 @@ import com.jph.takephoto.permission.InvokeListener;
 import com.jph.takephoto.permission.PermissionManager;
 import com.jph.takephoto.permission.PermissionManager.TPermissionType;
 import com.jph.takephoto.permission.TakePhotoInvocationHandler;
-import com.bingchuang.app.R;
-import com.bingchuang.app.base.BaseActivity;
+import com.yizhuan.erban.R;
+import com.yizhuan.erban.base.BaseActivity;

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

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

 /**
 * 继承这个类来让Activity获取拍照的能力<br>
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
@@ -35,8 +35,8 @@ import com.jph.takephoto.uitl.TUriParse;
 import com.jph.takephoto.uitl.TUtils;
 import com.orhanobut.logger.Logger;
 import com.soundcloud.android.crop.Crop;
-import com.bingchuang.app.R;
-import com.bingchuang.library.utils.SingleToastUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil;

 import java.io.File;
 import java.util.ArrayList;
--- a/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java
+++ b/app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java
@@ -7,8 +7,8 @@ import android.graphics.BitmapFactory;
 import android.os.Handler;

 import com.jph.takephoto.uitl.TFileUtils;
-import com.bingchuang.app.R;
-import com.bingchuang.library.utils.ResUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;

 import java.io.ByteArrayOutputStream;
 import java.io.File;
--- a/app/src/main/java/com/jph/takephoto/model/TExceptionType.java
+++ b/app/src/main/java/com/jph/takephoto/model/TExceptionType.java
@@ -1,6 +1,6 @@
 package com.jph.takephoto.model;
-import com.bingchuang.app.R;
-import com.bingchuang.library.utils.ResUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;

 /**
 * Author: JPH
--- a/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java
+++ b/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java
@@ -13,9 +13,9 @@ import com.jph.takephoto.app.TakePhoto;
 import com.jph.takephoto.model.InvokeParam;
 import com.jph.takephoto.model.TContextWrap;
 import com.jph.takephoto.uitl.TConstant;
-import com.bingchuang.app.R;
-import com.bingchuang.library.utils.ResUtil;
-import com.bingchuang.library.utils.SingleToastUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil;

 import java.lang.reflect.Method;
 import java.util.ArrayList;
--- a/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java
+++ b/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java
@@ -12,9 +12,9 @@ import android.webkit.MimeTypeMap;

 import com.jph.takephoto.model.TException;
 import com.jph.takephoto.model.TExceptionType;
-import com.bingchuang.app.R;
-import com.bingchuang.library.utils.ResUtil;
-import com.bingchuang.library.utils.SingleToastUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil;

 import java.io.ByteArrayOutputStream;
 import java.io.File;
--- a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java
+++ b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java
@@ -20,8 +20,8 @@ import com.jph.takephoto.model.TExceptionType;
 import com.jph.takephoto.model.TImage;
 import com.jph.takephoto.model.TIntentWap;
 import com.soundcloud.android.crop.Crop;
-import com.bingchuang.app.R;
-import com.bingchuang.library.utils.SingleToastUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil;

 import java.io.File;
 import java.util.ArrayList;
--- a/app/src/main/java/com/vele/pekolive/lineapi/LineAuthenticationCallbackActivity.java
+++ b/app/src/main/java/com/vele/pekolive/lineapi/LineAuthenticationCallbackActivity.java
@@ -1,4 +1,4 @@
-package fun.peki.live.lineapi;
+package com.vele.pekolive.lineapi;

 import cn.sharesdk.line.LineHandlerActivity;

--- a/app/src/main/java/com/yizhuan/erban/AgentActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/AgentActivity.java
@@ -0,0 +1,120 @@
+package com.yizhuan.erban;
+
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Build;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.mob.moblink.MobLink;
+import com.mob.moblink.Scene;
+import com.mob.moblink.SceneRestorable;
+import com.netease.nim.uikit.common.util.log.LogUtil;
+import com.yizhuan.erban.other.activity.SplashActivity;
+import com.yizhuan.xchat_android_core.linked.LinkedModel;
+import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
+import com.yizhuan.xchat_android_core.user.UserModel;
+import com.yizhuan.xchat_android_core.utils.TextUtils;
+
+import java.util.HashMap;
+import java.util.List;
+
+public class AgentActivity extends AppCompatActivity implements SceneRestorable {
+
+
+    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;
+        }
+
+    }
+}
--- a/app/src/main/java/com/bingchuang/app/ErbanTakePhotoActivity.java
+++ b/app/src/main/java/com/bingchuang/app/ErbanTakePhotoActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app;
+package com.yizhuan.erban;

 import android.content.Context;
 import android.content.Intent;
@@ -9,9 +9,8 @@ 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.bingchuang.app.common.permission.PermissionActivity;
-import com.bingchuang.app.R;
-import com.bingchuang.library.utils.file.JXFileUtils;
+import com.yizhuan.erban.common.permission.PermissionActivity;
+import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;

 import java.io.File;

--- a/app/src/main/java/com/bingchuang/app/GuideAdapter.java
+++ b/app/src/main/java/com/bingchuang/app/GuideAdapter.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app;
+package com.yizhuan.erban;

 import android.content.Context;
 import android.view.View;
--- a/app/src/main/java/com/bingchuang/app/MainActivity.java
+++ b/app/src/main/java/com/bingchuang/app/MainActivity.java
@@ -1,6 +1,6 @@
-package com.bingchuang.app;
+package com.yizhuan.erban;

-import static com.bingchuang.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
+import static com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;

 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -37,90 +37,89 @@ 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.bingchuang.app.upgrade.AppUpgradeHelper;
-import com.bingchuang.core.settings.SettingsModel;
+import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-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 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.CurrentTimeUtils;
+import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
+import com.yizhuan.xchat_android_core.utils.StringUtils;
+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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -284,7 +283,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
        ThreadPoolManager.instance().init();
        IMBroadcastManager.get().onCreate();
        ImageLoadUtilsV2.init(context);
-        SettingsModel.get().checkSysAccount();
    }

    @Override
@@ -412,6 +410,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
        }
        onParseIntent();
        handleNimIntent();
+        InitialModel.get().regionCheck();
    }

    private void onParseIntent() {
@@ -521,6 +520,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onLoadLoginUserInfoEvent(LoadLoginUserInfoEvent event) {
        firstLoadedUserInfo();
+        InitialModel.get().regionCheck();
    }

    public void onLogout() {
@@ -568,7 +568,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
                .subscribe(new BeanObserver<Boolean>() {
                    @Override
                    public void onErrorMsg(String error) {
-                        com.bingchuang.core.utils.Logger.info("isBoundAuthCode", error);
+                        com.yizhuan.xchat_android_core.utils.Logger.info("isBoundAuthCode", error);
                    }

                    @Override
@@ -860,7 +860,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onImPushMsgPmLimitTimeEvent(ImPushMsgPmLimitTimeEvent event) {
        //先判断Avroom存不存在，存在的话则不处理，avroom会处理
-        Activity reference = App.gStack.getAvRoomActivity();
+        Activity reference = XChatApplication.gStack.getAvRoomActivity();
        if (reference != null) {
            return;
        }
--- a/app/src/main/java/com/bingchuang/app/NimMiddleActivity.java
+++ b/app/src/main/java/com/bingchuang/app/NimMiddleActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app;
+package com.yizhuan.erban;

 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.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 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 java.util.ArrayList;
 import java.util.Map;
--- a/app/src/main/java/com/bingchuang/app/UIHelper.java
+++ b/app/src/main/java/com/bingchuang/app/UIHelper.java
@@ -1,22 +1,22 @@
-package com.bingchuang.app;
+package com.yizhuan.erban;

 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;

-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;
+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;


 /**
@@ -108,7 +108,7 @@ public class UIHelper {

    public static void showMonsterResult(Context context, String monsterId) {
        CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL +
-                "/peki/modules/monster/index.html?monsterId=" + monsterId);
+                "/peko/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 +
-                "/peki/modules/recommend-card/index.html";
+                "/peko/modules/recommend-card/index.html";
        CommonWebViewActivity.start(context, cardUrl);
    }

    public static void openContactUs(Context context) {
-        CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/peki/modules/contact/contact.html");
+        CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/peko/modules/contact/contact.html");
    }
 }
--- a/app/src/main/java/com/bingchuang/app/UserGuideActivity.java
+++ b/app/src/main/java/com/bingchuang/app/UserGuideActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app;
+package com.yizhuan.erban;

 import android.content.Context;
 import android.content.Intent;
@@ -8,9 +8,8 @@ import android.widget.ImageView;

 import androidx.viewpager.widget.ViewPager;

-import com.bingchuang.app.base.BaseActivity;
-import com.bingchuang.app.R;
-import com.bingchuang.core.PreferencesUtils;
+import com.yizhuan.erban.base.BaseActivity;
+import com.yizhuan.xchat_android_core.PreferencesUtils;


 public class UserGuideActivity extends BaseActivity {
--- a/app/src/main/java/com/bingchuang/app/application/GlobalHandleManager.java
+++ b/app/src/main/java/com/bingchuang/app/application/GlobalHandleManager.java
@@ -1,27 +1,27 @@
-package com.bingchuang.app.application;
+package com.yizhuan.erban.application;

 import android.app.Activity;

-import com.bingchuang.app.upgrade.AppUpgradeHelper;
+import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
 import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
-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 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.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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -50,7 +50,7 @@ public class GlobalHandleManager {
    }

    public Activity getActivity() {
-        return App.gStack.getTopActivity();
+        return XChatApplication.gStack.getTopActivity();
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
--- a/app/src/main/java/com/bingchuang/app/application/IReportConstants.java
+++ b/app/src/main/java/com/bingchuang/app/application/IReportConstants.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.application;
+package com.yizhuan.erban.application;

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

 import android.os.Bundle;

--- a/app/src/main/java/com/yizhuan/erban/application/ReportManager.java
+++ b/app/src/main/java/com/yizhuan/erban/application/ReportManager.java
@@ -0,0 +1,130 @@
+package com.yizhuan.erban.application;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+
+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 com.google.gson.Gson;
+import com.orhanobut.logger.Logger;
+import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.yizhuan.xchat_android_core.auth.AuthModel;
+import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
+
+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);
+    }
+
+
+}
--- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
+++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
@@ -1,8 +1,9 @@
-package com.bingchuang.app.application;
+package com.yizhuan.erban.application;

-import static com.bingchuang.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
+import static com.yizhuan.xchat_android_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;
@@ -15,10 +16,15 @@ 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;
@@ -34,61 +40,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.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 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 org.greenrobot.eventbus.EventBus;

@@ -107,9 +113,12 @@ import io.realm.RealmConfiguration;
 * @date 2017/2/11
 */

-public class App extends BaseApp {
-    public static final String TAG = "App";
+public class XChatApplication extends BaseApp {
+    public static final String TAG = "XChatApplication";
    public static Application gContext;
+
+    // 接收到退出登录事件（跳转到登录页了）
+    private static long logoutEventTime = 0;
    private static final MessageNotifierCustomization messageNotifierCustomization = new MessageNotifierCustomization() {
        @Override
        public String makeNotifyContent(String nick, IMMessage message) {
@@ -122,7 +131,7 @@ public class App extends BaseApp {
                }
            }
            // 采用SDK默认文案
-            return ResUtil.getString(R.string.erban_application_01);
+            return ResUtil.getString(R.string.erban_application_xchatapplication_01);
        }

        @Override
@@ -138,7 +147,7 @@ public class App extends BaseApp {
                }
            }
            // 采用SDK默认文案
-            return ResUtil.getString(R.string.erban_application_02);
+            return ResUtil.getString(R.string.erban_application_xchatapplication_02);
        }

        private String getContentFromOpenSignIn(CustomAttachment attachment) {
@@ -150,7 +159,7 @@ public class App extends BaseApp {
                }
            }
            if (TextUtils.isEmpty(result)) {
-                result = ResUtil.getString(R.string.erban_application_03);
+                result = ResUtil.getString(R.string.erban_application_xchatapplication_03);
            }
            return result;
        }
@@ -165,7 +174,7 @@ public class App extends BaseApp {
            return null;
        }
    };
-    private static App instance;
+    private static XChatApplication instance;
    //生命周期监听
    private static AppLifeCycleHelper lifeCycleHelper;
    public static ActivityStack gStack = new ActivityStack();
@@ -184,7 +193,7 @@ public class App extends BaseApp {
                (context, layout) -> new ClassicsFooter(context).setDrawableSize(20));
    }

-    public static App instance() {
+    public static XChatApplication instance() {
        return instance;
    }

@@ -198,10 +207,11 @@ public class App 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);
@@ -240,6 +250,13 @@ public class App 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;
@@ -275,21 +292,21 @@ public class App extends BaseApp {
     * 初始化linkedMe
     */
    private static void initLinkedMe() {
-        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) {
-//            }
-//        });
+        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) {
+            }
+        });
    }


@@ -395,10 +412,11 @@ public class App 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()));
+        httpParams.put("appVersionCode", String.valueOf(AppUtils.getVersionCode(context)));
        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)
@@ -476,7 +494,7 @@ public class App extends BaseApp {

    private static void initNimUIKit() {
        // 初始化
-        NimUIKit.init(BasicConfig.INSTANCE.getAppContext(), new IMUserInfoProvider(), null);
+        NimUIKit.init(BasicConfig.INSTANCE.getAppContext());
    }

    /**
--- a/app/src/main/java/com/bingchuang/app/audio/AudioRecordActivity.java
+++ b/app/src/main/java/com/bingchuang/app/audio/AudioRecordActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio;
+package com.yizhuan.erban.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.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 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 java.io.File;

--- a/app/src/main/java/com/bingchuang/app/audio/MyVoiceActivity.java
+++ b/app/src/main/java/com/bingchuang/app/audio/MyVoiceActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio;
+package com.yizhuan.erban.audio;

 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -10,22 +10,21 @@ import android.view.View;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

-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 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 java.util.List;

@@ -99,7 +98,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 OnPlayListener() {
+        AudioPlayerHelper.get().playInThread(voice, new com.yizhuan.erban.audio.helper.OnPlayListener() {
            @Override
            public void onError(String error) {
                if (adapter != null) {
--- a/app/src/main/java/com/bingchuang/app/audio/RecordingVoiceActivity.java
+++ b/app/src/main/java/com/bingchuang/app/audio/RecordingVoiceActivity.java
@@ -1,8 +1,8 @@
-package com.bingchuang.app.audio;
+package com.yizhuan.erban.audio;

-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 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 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.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 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 java.lang.ref.WeakReference;
 import java.util.ArrayList;
--- a/app/src/main/java/com/bingchuang/app/audio/SoundSignatureActivity.kt
+++ b/app/src/main/java/com/bingchuang/app/audio/SoundSignatureActivity.kt
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio
+package com.yizhuan.erban.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.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 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 io.reactivex.SingleObserver
 import io.reactivex.disposables.Disposable
 import java.util.*
--- a/app/src/main/java/com/bingchuang/app/audio/VoiceMatchActivity.java
+++ b/app/src/main/java/com/bingchuang/app/audio/VoiceMatchActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio;
+package com.yizhuan.erban.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.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 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 java.util.List;
 import java.util.Locale;
--- a/app/src/main/java/com/bingchuang/app/audio/adapter/CardAdapter.java
+++ b/app/src/main/java/com/bingchuang/app/audio/adapter/CardAdapter.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.adapter;
+package com.yizhuan.erban.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.bingchuang.app.R;
-import com.bingchuang.core2.audio.bean.VoiceCardInfo;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;

 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/bingchuang/app/audio/adapter/MyVoiceListAdapter.java
+++ b/app/src/main/java/com/bingchuang/app/audio/adapter/MyVoiceListAdapter.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.adapter;
+package com.yizhuan.erban.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.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 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.StringUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;

 import java.util.List;
 import java.util.Locale;
--- a/app/src/main/java/com/bingchuang/app/audio/helper/AudioPlayerHelper.java
+++ b/app/src/main/java/com/bingchuang/app/audio/helper/AudioPlayerHelper.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.helper;
+package com.yizhuan.erban.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.bingchuang.app.R;
-import com.bingchuang.library.utils.ResUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;

 import java.io.IOException;

--- a/app/src/main/java/com/bingchuang/app/audio/helper/OnPlayListener.java
+++ b/app/src/main/java/com/bingchuang/app/audio/helper/OnPlayListener.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.helper;
+package com.yizhuan.erban.audio.helper;

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

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

 import android.annotation.SuppressLint;
 import android.content.Context;
--- a/app/src/main/java/com/bingchuang/app/audio/helper/VmSoundManager.java
+++ b/app/src/main/java/com/bingchuang/app/audio/helper/VmSoundManager.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.helper;
+package com.yizhuan.erban.audio.helper;


 import lombok.Getter;
--- a/app/src/main/java/com/bingchuang/app/audio/helper/VoiceMacthHelper.java
+++ b/app/src/main/java/com/bingchuang/app/audio/helper/VoiceMacthHelper.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.helper;
+package com.yizhuan.erban.audio.helper;

 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
--- a/app/src/main/java/com/bingchuang/app/audio/presenter/MyVoicePresenter.java
+++ b/app/src/main/java/com/bingchuang/app/audio/presenter/MyVoicePresenter.java
@@ -1,12 +1,12 @@
-package com.bingchuang.app.audio.presenter;
+package com.yizhuan.erban.audio.presenter;

-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 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 java.util.List;

--- a/app/src/main/java/com/bingchuang/app/audio/presenter/RecordingVoicePresenter.java
+++ b/app/src/main/java/com/bingchuang/app/audio/presenter/RecordingVoicePresenter.java
@@ -1,4 +1,8 @@
-package com.bingchuang.app.audio.presenter;
+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;

 import android.content.Context;
 import android.content.Intent;
@@ -9,26 +13,25 @@ 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.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 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 java.io.File;
 import java.util.List;
@@ -298,8 +301,8 @@ public class RecordingVoicePresenter extends BaseMvpPresenter<IRecordingVoiceVie

                                SingleToastUtil.showToast(ResUtil.getString(R.string.audio_presenter_recordingvoicepresenter_03));
                                Intent intent = new Intent();
-                                intent.putExtra(RecordingVoiceActivity.AUDIO_FILE, audioUrl);
-                                intent.putExtra(RecordingVoiceActivity.AUDIO_DURA, audioDur);
+                                intent.putExtra(AUDIO_FILE, audioUrl);
+                                intent.putExtra(AUDIO_DURA, audioDur);
                                getMvpView().finishView(intent);// 上传声音成功之后退出页面
                            } else {
                                SingleToastUtil.showToast(error);
@@ -358,7 +361,7 @@ public class RecordingVoicePresenter extends BaseMvpPresenter<IRecordingVoiceVie
                        + "   dura:" + dura
                        + "   length:" + audioDur
                        + "   type:" + recordType.name());
-                if (audioDur < RecordingVoiceActivity.MIN_RECORD_VOICE_DURATION) {
+                if (audioDur < MIN_RECORD_VOICE_DURATION) {
                    recordFailWithDurationShort();// 时长小于5s：Toast提示录音时间太短
                } else {
                    showRecordSuccessState();// 否则：【跳转到试听状态】
--- a/app/src/main/java/com/bingchuang/app/audio/view/BottleContainer.java
+++ b/app/src/main/java/com/bingchuang/app/audio/view/BottleContainer.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.view;
+package com.yizhuan.erban.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.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
-import com.bingchuang.core2.audio.bean.VoiceMatchInfo;
-import com.bingchuang.library.utils.ListUtils;
+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 java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/bingchuang/app/audio/view/BottleLayout.java
+++ b/app/src/main/java/com/bingchuang/app/audio/view/BottleLayout.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.view;
+package com.yizhuan.erban.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.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 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 java.math.BigDecimal;
 import java.text.DecimalFormat;
--- a/app/src/main/java/com/bingchuang/app/audio/view/IBottleOpListener.java
+++ b/app/src/main/java/com/bingchuang/app/audio/view/IBottleOpListener.java
@@ -1,6 +1,6 @@
-package com.bingchuang.app.audio.view;
+package com.yizhuan.erban.audio.view;

-import com.bingchuang.core2.audio.bean.VoiceMatchInfo;
+import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;

 /**
 * create by lvzebiao @2019/6/19
--- a/app/src/main/java/com/bingchuang/app/audio/view/IMyVoiceView.java
+++ b/app/src/main/java/com/bingchuang/app/audio/view/IMyVoiceView.java
@@ -1,7 +1,7 @@
-package com.bingchuang.app.audio.view;
+package com.yizhuan.erban.audio.view;

-import com.bingchuang.core2.audio.bean.UserVoiceInfo;
-import com.bingchuang.library.base.IMvpBaseView;
+import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
+import com.yizhuan.xchat_android_library.base.IMvpBaseView;

 import java.util.List;

--- a/app/src/main/java/com/bingchuang/app/audio/view/IRecordingVoiceView.java
+++ b/app/src/main/java/com/bingchuang/app/audio/view/IRecordingVoiceView.java
@@ -1,9 +1,9 @@
-package com.bingchuang.app.audio.view;
+package com.yizhuan.erban.audio.view;

 import android.content.Intent;

-import com.bingchuang.core2.audio.bean.VoiceCardInfo;
-import com.bingchuang.library.base.IMvpBaseView;
+import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
+import com.yizhuan.xchat_android_library.base.IMvpBaseView;

 import java.util.List;

--- a/app/src/main/java/com/bingchuang/app/audio/view/PlayLoadingImageView.java
+++ b/app/src/main/java/com/bingchuang/app/audio/view/PlayLoadingImageView.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.view;
+package com.yizhuan.erban.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.bingchuang.app.R;
-import com.bingchuang.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;

 import lombok.Setter;

--- a/app/src/main/java/com/bingchuang/app/audio/viewmodel/SoundViewModel.kt
+++ b/app/src/main/java/com/bingchuang/app/audio/viewmodel/SoundViewModel.kt
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.viewmodel
+package com.yizhuan.erban.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.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 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.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 java.io.File

 /**
@@ -339,8 +339,7 @@ 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)
        }
    }

--- a/app/src/main/java/com/bingchuang/app/audio/widget/DynamicWave.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/DynamicWave.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.audio.widget;

 import android.content.Context;
 import android.graphics.Canvas;
--- a/app/src/main/java/com/bingchuang/app/audio/widget/OnSwipeListener.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/OnSwipeListener.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.audio.widget;

 import androidx.recyclerview.widget.RecyclerView;

--- a/app/src/main/java/com/bingchuang/app/audio/widget/RingProgressView.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/RingProgressView.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.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.bingchuang.app.R;
+import com.yizhuan.erban.R;

 /**
 * 录制声音页面的环形进度条
--- a/app/src/main/java/com/bingchuang/app/audio/widget/RoundProgressView.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/RoundProgressView.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.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.bingchuang.app.R;
+import com.yizhuan.erban.R;

 public class RoundProgressView extends View {
    // 画实心圆的画笔
--- a/app/src/main/java/com/bingchuang/app/audio/widget/VoiceBottleFilterGenderBottomDialog.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/VoiceBottleFilterGenderBottomDialog.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.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.bingchuang.app.R;
+import com.yizhuan.erban.R;

 /**
 * 声音瓶子.筛选性别Dialog
--- a/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardConfig.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardConfig.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.audio.widget;

 /**
 * 录制声音页面.声音卡片滑动配置
--- a/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardItemTouchHelperCallback.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardItemTouchHelperCallback.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.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.bingchuang.app.R;
-import com.bingchuang.library.utils.ResUtil;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;

 /**
 * 录制声音页面.声音卡片滑动列表ItemTouchHelperCallback
--- a/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardLayoutManager.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardLayoutManager.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.audio.widget;

 import android.view.MotionEvent;
 import android.view.View;
--- a/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardRecyclerView.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/VoiceCardRecyclerView.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.audio.widget;

 import android.content.Context;
 import android.graphics.Canvas;
--- a/app/src/main/java/com/bingchuang/app/audio/widget/VoiceLine.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/VoiceLine.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.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.bingchuang.app.R;
+import com.yizhuan.erban.R;

 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/bingchuang/app/audio/widget/VoiceWave.java
+++ b/app/src/main/java/com/bingchuang/app/audio/widget/VoiceWave.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.audio.widget;
+package com.yizhuan.erban.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.bingchuang.app.R;
+import com.yizhuan.erban.R;

 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/bingchuang/app/avroom/BottomViewListenerWrapper.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/BottomViewListenerWrapper.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom;
+package com.yizhuan.erban.avroom;

 /**
 * Created by chenran on 2017/11/21.
--- a/app/src/main/java/com/bingchuang/app/avroom/ButtonItemFactory.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/ButtonItemFactory.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom;
+package com.yizhuan.erban.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.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 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 java.util.ArrayList;
 import java.util.HashMap;
--- a/app/src/main/java/com/bingchuang/app/avroom/ChatMemberDiffUtilCallback.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/ChatMemberDiffUtilCallback.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom;
+package com.yizhuan.erban.avroom;

 import androidx.recyclerview.widget.DiffUtil;

--- a/app/src/main/java/com/bingchuang/app/avroom/SoftKeyBoardListener.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/SoftKeyBoardListener.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom;
+package com.yizhuan.erban.avroom;

 import android.app.Activity;
 import android.graphics.Rect;
--- a/app/src/main/java/com/bingchuang/app/avroom/UserCardButtonManager.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/UserCardButtonManager.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom;
+package com.yizhuan.erban.avroom;

 /**
 * 用户卡片的管理
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/AVRoomActivity.java
@@ -1,19 +1,19 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.avroom.activity;

 import static android.view.View.VISIBLE;
-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 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 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.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 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.erban.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.MonsterHuntingResult;
+import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo;
+import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol;
+import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager;
+import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
+import com.yizhuan.xchat_android_core.noble.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.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.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.StringUtils;
+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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/CpRoomInviteActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/CpRoomInviteActivity.java
@@ -1,21 +1,21 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.avroom.activity;

 import android.view.View;

-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 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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/CreatePKActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/CreatePKActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.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.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 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 java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RecordForPKActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RecordForPKActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.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.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 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.erban.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 java.util.List;

--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RoomBlackListActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RoomBlackListActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.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.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 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 java.util.List;
 import java.util.ListIterator;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RoomInviteActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RoomInviteActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.avroom.activity;

 import android.content.Intent;
 import android.os.Bundle;
@@ -10,22 +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.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 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.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 java.util.List;
 import java.util.Map;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RoomManagerListActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RoomManagerListActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.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.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 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 java.util.List;
 import java.util.ListIterator;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RoomOnlineUserActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RoomOnlineUserActivity.java
@@ -1,17 +1,17 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.avroom.activity;

 import android.content.Context;
 import android.content.Intent;

 import com.netease.nim.uikit.StatusBarUtil;
-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;
+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;

@ActLayoutRes(R.layout.activity_room_online_user)
 public class RoomOnlineUserActivity extends BaseBindingActivity<ActivityRoomOnlineUserBinding> {
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RoomRankListActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RoomRankListActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.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.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 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 java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RoomSettingActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RoomSettingActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.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.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 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 org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
--- a/app/src/main/java/com/bingchuang/app/avroom/activity/RoomTitleEditActivity.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/activity/RoomTitleEditActivity.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.activity;
+package com.yizhuan.erban.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.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 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 io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
--- a/app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListAdapter.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListAdapter.java
@@ -1,7 +1,7 @@
-package com.bingchuang.app.avroom.adapter;
+package com.yizhuan.erban.avroom.adapter;

-import com.bingchuang.library.list.ArrayListAdapter;
-import com.bingchuang.library.list.ListItem;
+import com.yizhuan.xchat_android_library.list.ArrayListAdapter;
+import com.yizhuan.xchat_android_library.list.ListItem;

 import java.util.List;

--- a/app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListEmptyItem.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListEmptyItem.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.adapter;
+package com.yizhuan.erban.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.bingchuang.app.R;
-import com.bingchuang.library.list.BaseGroupItem;
-import com.bingchuang.library.list.ViewHolder;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.list.BaseGroupItem;
+import com.yizhuan.xchat_android_library.list.ViewHolder;

 /**
 * Created by chenran on 2017/8/9.
--- a/app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListHeaderItem.java
+++ b/app/src/main/java/com/bingchuang/app/avroom/adapter/AuctionListHeaderItem.java
@@ -1,4 +1,4 @@
-package com.bingchuang.app.avroom.adapter;
+package com.yizhuan.erban.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.bingchuang.app.R;
-import com.bingchuang.library.list.BaseGroupItem;
-import com.bingchuang.library.list.ViewHolder;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.list.BaseGroupItem;
+import com.yizhuan.xchat_android_library.list.ViewHolder;

 /**
 * Created by chenran on 2017/8/9.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max	9096a9b57f	fix:修复输入密码进入游戏房的房间状态不一致问题	2023-12-04 18:54:11 +08:00
Max	c46c49715c	feat：补充日志信息	2023-12-04 17:42:29 +08:00
Max	31b785c511	fix:调整礼物飘窗样式问题	2023-12-04 17:42:14 +08:00
Max	6f01c5ddad	fix:修复进入有密码的房间，游戏未加载问题	2023-12-04 17:34:47 +08:00
Max	306f15f7f9	feat：通过时间，简单过滤多次重复401异常处理	2023-12-04 16:58:11 +08:00
Max	0babbedeb9	feat:同步habu完成房间banner资源位展示优化	2023-12-01 16:54:21 +08:00
Max	d09e60d206	feat:同步hubu完成【升级飘窗、加入公会】功能优化	2023-12-01 16:31:06 +08:00
Max	e37796286b	feat:同步Habu完成地区隔离功能	2023-12-01 16:10:22 +08:00