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

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

android_crop_lib/src/main/AndroidManifest.xml

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

app/build.gradle

@@ -1,28 +1,31 @@
 apply plugin: 'com.android.application'
-//apply plugin: 'com.google.gms.google-services'
-//apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.tencent.vasdolly'
-apply from: '../mob.gradle'
+apply from: '../project.gradle'
 
-def onlyArm64 = Boolean.parseBoolean(only_arm64)
+apply plugin: "com.bytedance.android.aabResGuard"
+apply plugin: "xml-class-guard"
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
-        applicationId "com.vele.habuplay"
+        applicationId isolationMode ? 'com.example.gogo' : 'app.hiyoo.fun'
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
         versionCode Integer.valueOf(version_code)
         versionName version_name
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
         flavorDimensions 'default'
+        buildConfigField "boolean", "ISOLATION_MODE", "$isolationMode"
 
-//        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
+        if (isolationMode) {
+            resValue "string", "app_name", "Hi-debug"
+        } else {
+            resValue "string", "app_name", "Hiyoo"
+        }
     }
 
     splits {
@@ -60,7 +63,7 @@ android {
             if (abi == null) {
                 abi = "universal"
             }
-            outputFileName = "habu_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
+            outputFileName = "hiyoo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
         }
     }
 
@@ -80,24 +83,23 @@ android {
 
     signingConfigs {
 
-        v2 {
-            storeFile file('../ananplay.jks')
-            storePassword "vele2021"
-            keyAlias "ananplay"
-            keyPassword "vele2021"
+        debug {
+            storeFile file('../app_debug.jks')
+            storePassword "debug2023"
+            keyAlias "debug"
+            keyPassword "debug2023"
             v2SigningEnabled true
             v1SigningEnabled true
         }
 
-        v1 {
-            storeFile file('../ananplay.jks')
-            storePassword "vele2021"
-            keyAlias "ananplay"
-            keyPassword "vele2021"
-            v2SigningEnabled false
+        release {
+            storeFile file('../hiyoo.jks')
+            storePassword "hiyoo2023"
+            keyAlias "hiyoo"
+            keyPassword "hiyoo2023"
+            v2SigningEnabled true
             v1SigningEnabled true
         }
-
     }
 
     sourceSets {
@@ -147,8 +149,8 @@ android {
     }
 
     buildTypes {
-        def server_url_debug = '"http://beta.api.pekolive.com/"'
-        def server_url_release = '"https://api.anan.chat/"'
+        def server_url_debug = '"http://beta.api.hiyoo.fun/"'
+        def server_url_release = '"https://api.hiyoo.fun/"'
 
         debug {
             println("minifyEnabled = " + minify_enabled)
@@ -163,7 +165,7 @@ android {
             minifyEnabled minify_enabled.toBoolean() // 是否混淆
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             crunchPngs false // 停用 PNG 压缩
-            signingConfig signingConfigs.v2
+            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
             gradle.taskGraph.whenReady {
                 tasks.each { task ->
                     if (task.name.contains("Test") || task.name.contains("Lint")) {
@@ -189,7 +191,7 @@ android {
             shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件
             zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列
             crunchPngs true // 启用 PNG 压缩
-            signingConfig signingConfigs.v2
+            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -212,14 +214,8 @@ def Lombok = "1.18.24"
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation fileTree(dir: 'aliyun-libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     api 'androidx.multidex:multidex:2.0.1'
 
@@ -239,9 +235,8 @@ dependencies {
     api "com.github.zyyoona7:EasyPopup:1.0.2"
     api "com.github.donkingliang:LabelsView:1.6.5"
     api "com.github.yyued:SVGAPlayer-Android:2.6.1"
-    implementation "com.orhanobut:logger:2.2.0"
     api "com.ms-square:expandableTextView:0.1.4"
-    annotationProcessor 'androidx.annotation:annotation:1.4.0'
+    annotationProcessor 'androidx.annotation:annotation:1.6.0'
 
     implementation 'io.github.h07000223:flycoTabLayout:3.0.0'
 
@@ -262,7 +257,7 @@ dependencies {
     //数字滚动效果
     implementation 'com.github.YvesCheung:RollingText:1.2.3'
     // 引入原有第三方裁图源码，方便修改
-    api project(':android_crop_lib')
+    api project(':libs:lib_crop')
 
     //rx权限请求框架
     implementation('com.github.tbruyelle:rxpermissions:0.10.2') {
@@ -275,12 +270,12 @@ dependencies {
 
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
 
-    api 'com.tencent.vasdolly:helper:3.0.3'
+    api 'com.tencent.vasdolly:helper:3.0.6'
     implementation "io.github.tencent:vap:2.0.24"
 
     implementation 'com.github.mmin18:realtimeblurview:1.2.1'
 
-    implementation 'com.appsflyer:af-android-sdk:6.8.2'
+//    implementation 'com.appsflyer:af-android-sdk:6.8.2'
 
     implementation 'com.github.zhpanvip:BannerViewPager:3.5.6'
 
@@ -302,15 +297,19 @@ dependencies {
     //wheelView
     implementation 'com.contrarywind:wheelview:4.1.0'
 
-    implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
+//    implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
+
+    implementation project(':modules:module_base')
+    if (!isolationMode && file("../modules/module_google/build.gradle").exists()) {
+        implementation project(':modules:module_google')
+    }
 }
 
 channel {
     //多渠道包的输出目录，默认为new File(project.buildDir,"channel")
     outputDir = new File(project.buildDir, "channelapk")
     //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
-    def only64 = onlyArm64 ? "-only64" : ""
-    apkNameFormat = 'habu-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
+    apkNameFormat = 'hiyoo-${buildType}-${flavorName}-v${versionName}-${buildTime}'
     //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
     fastMode = false
     //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss
@@ -318,3 +317,31 @@ channel {
     //低内存模式（仅针对V2签名，默认为false）：只把签名块、中央目录和EOCD读取到内存，不把最大头的内容块读取到内存，在手机上合成APK时，可以使用该模式
     lowMemory = false
 }
+
+aabResGuard {
+    mappingFile = file("aab-res-guard-mapping.txt").toPath() // Mapping file used for incremental obfuscation
+    whiteList = [ // White list rules
+                  "*.R.raw.*",
+                  "*.R.drawable.icon"
+    ]
+    obfuscatedBundleFileName = "duplicated-app.aab" // Obfuscated file name, must end with '.aab'
+    mergeDuplicatedRes = true // Whether to allow the merge of duplicate resources
+    enableFilterFiles = false // Whether to allow filter files
+    filterList = [ // file filter rules
+//                   "*/arm64-v8a/*",
+//                   "META-INF/*"
+    ]
+
+    enableFilterStrings = false // switch of filter strings
+    unusedStringPath = file("unused.txt").toPath() // strings will be filtered in this file
+    languageWhiteList = ["en", "zh"] // keep en,en-xx,zh,zh-xx etc. remove others.
+}
+
+//以下均为非必须
+xmlClassGuard {
+    findAabConstraintReferencedIds = true
+    //用于增量混淆的 mapping 文件
+    mappingFile = file("xml-class-mapping.txt")
+    //更改manifest文件的package属性，即包名
+    packageChange = ["com.chwl.app": "co.ch.a"]
+}

app/proguard-rules.pro

@@ -116,20 +116,15 @@
 -dontwarn com.netease.**
 -keep class com.netease.** {*;}
 
-# Presenter 相关
--keep class com.yizhuan.habu.base.** { *; }
--keep public class * extends com.yizhuan.habu.base.BaseMvpPresenter
--keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
-
 # 云信自定义 ViewHolder 配置
--dontwarn com.yizhuan.habu.ui.im.recent.holder.**
--keep class com.yizhuan.habu.ui.im.recent.holder.** {*;}
--keep class com.yizhuan.habu.ui.im.chat.** {*;}
--keep class com.yizhuan.habu.luckymoney.viewholder.** {*;}
--keep class com.yizhuan.habu.share.viewholder.** {*;}
--keep class com.yizhuan.habu.public_chat_hall.msg.viewholder.** {*;}
--keep class com.yizhuan.habu.module_hall.im.msgholder.** {*;}
--keep class com.yizhuan.habu.mentoring_relationship.viewholder.** {*;}
+-dontwarn com.chwl.app.ui.im.recent.holder.**
+-keep class com.chwl.app.ui.im.recent.holder.** {*;}
+-keep class com.chwl.app.ui.im.chat.** {*;}
+-keep class com.chwl.app.luckymoney.viewholder.** {*;}
+-keep class com.chwl.app.share.viewholder.** {*;}
+-keep class com.chwl.app.public_chat_hall.msg.viewholder.** {*;}
+-keep class com.chwl.app.module_hall.im.msgholder.** {*;}
+-keep class com.chwl.app.mentoring_relationship.viewholder.** {*;}
 -keep public class * extends com.netease.nim.uikit.common.ui.recyclerview.holder.RecyclerViewHolder {*;}
 -keep public class * extends com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase {*;}
 
@@ -177,8 +172,8 @@
 -keep class com.darsh.multipleimageselect.** { *; }
 -dontwarn com.darsh.multipleimageselect.**
 
--keep class com.soundcloud.android.crop.** { *; }
--dontwarn com.soundcloud.android.crop.**
+-keep class com.soundcloud.crop.** { *; }
+-dontwarn com.soundcloud.crop.**
 
 # glide4.0
 -keep public class * implements com.bumptech.glide.module.GlideModule
@@ -190,6 +185,11 @@
 # for DexGuard only
 #-keepresourcexmlelements manifest/application/meta-data@value=GlideModule
 
+# Presenter 相关
+-keep class com.chwl.app.base.** { *; }
+-keep public class * extends com.chwl.app.base.BaseMvpPresenter
+-keep public class * extends com.chwl.library.base.factory.AbstractMvpPresenter
+
 # BaseAdapter
 -keep class com.chad.library.adapter.** {
 *;
@@ -201,8 +201,8 @@
      <init>(...);
 }
 
--dontwarn com.yizhuan.habu.bindadapter.**
--keep class com.yizhuan.habu.bindadapter.** {*;}
+-dontwarn com.chwl.app.bindadapter.**
+-keep class com.chwl.app.bindadapter.** {*;}
 
 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -233,11 +233,9 @@
 
 # TODO 网络加载 一些业务bean gson 时候混淆问题
 -keep class org.json.** {*;}
--dontwarn com.yizhuan.xchat_android_core.**
--keep class com.yizhuan.xchat_android_core.** {*;}
--keep class com.yizhuan.treasure_box.bean.** {*;}
--keep class com.yizhuan.habu.avroom.bean.** {*;}
-
+-keep class com.chwl.**.bean.** {*;}
+-keep class com.chwl.**.result.** {*;}
+-keep class com.chwl.**.entity.** {*;}
 
 #百度统计
 -keep class com.baidu.bottom.** { *; }
@@ -310,8 +308,8 @@
 -keep class com.autonavi.aps.amapapi.model.**{*;}
 
 #暂时keep这个View排查华为oom问题
--keep class com.yizhuan.habu.avroom.widget.MicroView{*;}
--keep class com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView{*;}
+-keep class com.chwl.app.avroom.widget.MicroView{*;}
+-keep class com.chwl.app.ui.widget.rollviewpager.RollPagerView{*;}
 
 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -369,7 +367,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}
 
--keep class com.yizhuan.habu.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.chwl.app.ui.widget.AppBarLayoutBehavior {*;}
 
 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {
@@ -454,7 +452,7 @@
 }
 
 ## EasyPhotos
--keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; }
+-keep class com.chwl.library.easyphoto.models.** { *; }
 
 ## 图片裁剪UCrop
 -dontwarn com.yalantis.ucrop.**
@@ -479,4 +477,8 @@
 }
 -keep public class com.android.installreferrer.**{ *; }
 
--keep public class * extends java.lang.Exception
+-keep public class * extends java.lang.Exception
+
+-keep public class com.alibaba.android.arouter.routes.**{*;}
+-keep public class com.alibaba.android.arouter.facade.**{*;}
+-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}

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

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

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yizhuan.habu">
+    package="com.chwl.app">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
 
@@ -19,8 +19,8 @@
         android:protectionLevel="signature" />
 
     <queries>
-        <package android:name="com.facebook.katana" />
-        <package android:name="jp.naver.line.android" />
+<!--        <package android:name="com.facebook.katana" />-->
+<!--        <package android:name="jp.naver.line.android" />-->
         <package android:name="com.android.vending" />
     </queries>
 
@@ -84,9 +84,9 @@
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application
-        android:name=".application.XChatApplication"
+        android:name=".application.App"
         android:allowBackup="false"
-        android:icon="@mipmap/app_logo"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -94,7 +94,7 @@
         android:supportsRtl="true"
         android:testOnly="false"
         android:theme="@style/MyMaterialTheme"
-        tools:replace="android:name,android:allowBackup"
+        tools:replace="android:name,android:label,android:allowBackup"
         tools:targetApi="n">
 
         <activity
@@ -132,7 +132,7 @@
 <!--            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
         <!-- 小米 -->
         <activity
-            android:name="com.soundcloud.android.crop.CropImageActivity"
+            android:name="com.soundcloud.crop.CropImageActivity"
             android:screenOrientation="portrait" /> <!-- 华为 -->
         <activity
             android:name="com.darsh.multipleimageselect.activities.AlbumSelectActivity"
@@ -152,31 +152,31 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity> <!-- 刘海屏适配 end -->
-        <activity
-            android:name="com.mob.tools.MobUIShell"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:windowSoftInputMode="stateHidden|adjustResize" /> <!-- 云信配置 begin ##################################################### -->
+<!--        <activity-->
+<!--            android:name="com.mob.tools.MobUIShell"-->
+<!--            android:configChanges="keyboardHidden|orientation|screenSize"-->
+<!--            android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
+<!--            android:windowSoftInputMode="stateHidden|adjustResize" /> &lt;!&ndash; 云信配置 begin ##################################################### &ndash;&gt;-->
         <!--
            APP key, 可以在这里设置，也可以在 SDKOptions 中提供。
            如果 SDKOptions 中提供了，取 SDKOptions 中的值。
         -->
-        <activity
-            android:name="com.vele.habuplay.lineapi.LineAuthenticationCallbackActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:noHistory="true">
+<!--        <activity-->
+<!--            android:name="app.hiyoo.fun.lineapi.LineAuthenticationCallbackActivity"-->
+<!--            android:exported="true"-->
+<!--            android:launchMode="singleTask"-->
+<!--            android:noHistory="true">-->
 
-            <!-- 集成line客户端登录授权，需要添如下格式的过滤器 -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+<!--            &lt;!&ndash; 集成line客户端登录授权，需要添如下格式的过滤器 &ndash;&gt;-->
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
 
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
 
-                <data android:scheme="lineauth" />
-            </intent-filter>
-        </activity>
+<!--                <data android:scheme="lineauth" />-->
+<!--            </intent-filter>-->
+<!--        </activity>-->
         <!--
             声明云信后台服务，如需保持后台推送，使用独立进程效果会更好。
             ca46478c438dda51d25306f52fe7506b
@@ -223,7 +223,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Habu Live"
+            android:label="Hiyoo"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -260,12 +260,12 @@
             android:label="房间流水"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.habu.music.activity.AddLocalMusicListActivity"
+            android:name="com.chwl.app.music.activity.AddLocalMusicListActivity"
             android:label="@string/main_androidmanifest_010"
             android:screenOrientation="portrait"
             android:theme="@style/AVRoomTheme" />
         <activity
-            android:name="com.yizhuan.habu.music.activity.MusicListActivity"
+            android:name="com.chwl.app.music.activity.MusicListActivity"
             android:label="@string/main_androidmanifest_011"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -520,15 +520,6 @@
             android:name=".family.view.activity.FamilyGameListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".treasure_box.activity.TreasureBoxActivity"
-            android:theme="@style/dialog_web_view_activity" />
-        <activity
-            android:name=".treasure_box.activity.BoxRankingActivity"
-            android:theme="@style/room_message_activity" />
-        <activity
-            android:name=".treasure_box.activity.TreasureBoxHonourActivity"
-            android:theme="@style/dialog_web_view_activity" />
         <activity android:name=".ui.setting.VerifyPhoneActivity" />
         <activity android:name=".ui.setting.ModifyPwdActivity" />
         <activity
@@ -650,7 +641,7 @@
             android:name=".module_hall.team.activity.HTeamMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.habu.mentoring_relationship.activity.MentoringRelationshipActivity"
+            android:name="com.chwl.app.mentoring_relationship.activity.MentoringRelationshipActivity"
             android:label="@string/main_androidmanifest_030"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
@@ -659,26 +650,26 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.RoomMsgActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomMsgActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomNewbieActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomNewbieMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.RoomInviteFansActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomInviteFansActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.NimTeamRoomMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.NimHallTeamRoomMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
@@ -763,7 +754,7 @@
             android:name=".bank_card.activity.AddBankCardAgreementActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.habu.sadmin.RoomSAdminManagerActivity"
+            android:name="com.chwl.app.sadmin.RoomSAdminManagerActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".home.activity.CommunityNoticeAct"
@@ -784,13 +775,13 @@
             android:name=".community.photo.BigPhotoActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.zhihu.matisse.ui.MatisseActivity"
+            android:name="com.example.matisse.ui.MatisseActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.zhihu.matisse.internal.ui.AlbumPreviewActivity"
+            android:name="com.example.matisse.internal.ui.AlbumPreviewActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.zhihu.matisse.internal.ui.SelectedPreviewActivity"
+            android:name="com.example.matisse.internal.ui.SelectedPreviewActivity"
             android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
         <activity
             android:name=".ui.wallet.sendgold.SendGoldActivity"
@@ -946,7 +937,7 @@
             android:name=".earn.activity.EarnWithdrawActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
-            android:screenOrientation="portrait" /> <!-- com.yizhuan.xchat_android_core.skill -->
+            android:screenOrientation="portrait" /> <!-- com.chwl.core.skill -->
         <activity
             android:name=".earn.activity.BindWithdrawMsgActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
@@ -982,10 +973,6 @@
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".treasurefairy.HomeFairyActivity"
-            android:exported="false"
-            android:theme="@style/transparent_activity" />
 
         <activity
             android:name=".ui.webview.FairyDialogWebViewActivity"
@@ -1015,9 +1002,9 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
-        <meta-data
-            android:name="Mob-Https"
-            android:value="yes" />
+<!--        <meta-data-->
+<!--            android:name="Mob-Https"-->
+<!--            android:value="yes" />-->
 
         <provider
             android:name="com.netease.nimlib.ipc.NIMContentProvider"

app/src/main/assets/hot_region.json

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

app/src/main/assets/supplierconfig.json

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

app/src/main/java/com/chwl/app/AgentActivity.java

@@ -1,4 +1,4 @@
-package com.yizhuan.habu;
+package com.chwl.app;
 
 import android.app.ActivityManager;
 import android.content.ComponentName;
@@ -7,14 +7,6 @@ import android.os.Build;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.netease.nim.uikit.common.util.log.LogUtil;
-import com.yizhuan.habu.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 {

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu;
+package com.chwl.app;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,8 +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.yizhuan.habu.common.permission.PermissionActivity;
-import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;
+import com.chwl.app.common.permission.PermissionActivity;
+import com.chwl.library.utils.file.JXFileUtils;
 
 import java.io.File;
 

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

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

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

@@ -1,6 +1,6 @@
-package com.yizhuan.habu;
+package com.chwl.app;
 
-import static com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
+import static com.chwl.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -23,6 +23,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.chwl.core.settings.SettingsModel;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nim.uikit.common.util.string.StringUtil;
@@ -37,86 +38,84 @@ 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.yizhuan.habu.upgrade.AppUpgradeHelper;
+import com.chwl.app.upgrade.AppUpgradeHelper;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.habu.application.IReportConstants;
-import com.yizhuan.habu.application.ReportManager;
-import com.yizhuan.habu.application.XChatApplication;
-import com.yizhuan.habu.avroom.activity.AVRoomActivity;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.common.widget.DragLayout;
-import com.yizhuan.habu.community.dynamic.view.DynamicDetailActivity;
-import com.yizhuan.habu.community.publish.view.PublishActivity;
-import com.yizhuan.habu.community.square.SquareFragment;
-import com.yizhuan.habu.family.view.activity.FamilyHomeActivity;
-import com.yizhuan.habu.home.HomeViewModel;
-import com.yizhuan.habu.home.dialog.NewUserHelloDialog;
-import com.yizhuan.habu.home.dialog.ProtocolUpdateDialog;
-import com.yizhuan.habu.home.fragment.ContactsListFragment;
-import com.yizhuan.habu.home.fragment.HomeFragment;
-import com.yizhuan.habu.home.fragment.MeFragment;
-import com.yizhuan.habu.home.presenter.MainPresenter;
-import com.yizhuan.habu.home.view.IMainView;
-import com.yizhuan.habu.home.widget.AnchorCardView;
-import com.yizhuan.habu.main.helper.NoticationsUiHelper;
-import com.yizhuan.habu.miniworld.activity.MiniWorldGuestPageActivity;
-import com.yizhuan.habu.module.Extras;
-import com.yizhuan.habu.module_hall.secretcode.PwdCodeMgr;
-import com.yizhuan.habu.service.DaemonService;
-import com.yizhuan.habu.ui.im.ImInitHelper;
-import com.yizhuan.habu.ui.im.avtivity.NimP2PMessageActivity;
-import com.yizhuan.habu.ui.login.BindPhoneActivity;
-import com.yizhuan.habu.ui.login.LoginActivity;
-import com.yizhuan.habu.ui.login.fragment.AddUserInfoFragment;
-import com.yizhuan.habu.ui.patriarch.help.LimitEnterRoomHelper;
-import com.yizhuan.habu.ui.patriarch.help.PmDialogShowMrg;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity;
-import com.yizhuan.habu.ui.widget.LivingIconView;
-import com.yizhuan.habu.ui.widget.MainTabLayout;
-import com.yizhuan.habu.utils.CleanLeakUtils;
-import com.yizhuan.habu.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.utils.CurrentTimeUtils;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.utils.StringUtils;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.application.IReportConstants;
+import com.chwl.app.application.ReportManager;
+import com.chwl.app.application.App;
+import com.chwl.app.avroom.activity.AVRoomActivity;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.common.widget.DragLayout;
+import com.chwl.app.community.dynamic.view.DynamicDetailActivity;
+import com.chwl.app.community.publish.view.PublishActivity;
+import com.chwl.app.family.view.activity.FamilyHomeActivity;
+import com.chwl.app.home.HomeViewModel;
+import com.chwl.app.home.dialog.NewUserHelloDialog;
+import com.chwl.app.home.dialog.ProtocolUpdateDialog;
+import com.chwl.app.home.fragment.ContactsListFragment;
+import com.chwl.app.home.fragment.HomeFragment;
+import com.chwl.app.home.fragment.MeFragment;
+import com.chwl.app.home.presenter.MainPresenter;
+import com.chwl.app.home.view.IMainView;
+import com.chwl.app.home.widget.AnchorCardView;
+import com.chwl.app.main.helper.NoticationsUiHelper;
+import com.chwl.app.miniworld.activity.MiniWorldGuestPageActivity;
+import com.chwl.app.module.Extras;
+import com.chwl.app.module_hall.secretcode.PwdCodeMgr;
+import com.chwl.app.service.DaemonService;
+import com.chwl.app.ui.im.ImInitHelper;
+import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity;
+import com.chwl.app.ui.login.BindPhoneActivity;
+import com.chwl.app.ui.login.LoginActivity;
+import com.chwl.app.ui.login.fragment.AddUserInfoFragment;
+import com.chwl.app.ui.patriarch.help.LimitEnterRoomHelper;
+import com.chwl.app.ui.patriarch.help.PmDialogShowMrg;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.utils.ImageLoadUtilsV2;
+import com.chwl.app.ui.webview.CommonWebViewActivity;
+import com.chwl.app.ui.widget.LivingIconView;
+import com.chwl.app.ui.widget.MainTabLayout;
+import com.chwl.app.utils.CleanLeakUtils;
+import com.chwl.app.utils.PushMessageHandler;
+import com.chwl.core.Constants;
+import com.chwl.core.DemoCache;
+import com.chwl.core.UriProvider;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.auth.event.KickOutEvent;
+import com.chwl.core.auth.event.LoginEvent;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.channel_page.model.ChannelPageModel;
+import com.chwl.core.community.event.SquareTaskEvent;
+import com.chwl.core.community.event.UnReadCountEvent;
+import com.chwl.core.home.bean.MainTabType;
+import com.chwl.core.home.event.RefreshHomeDataEvent;
+import com.chwl.core.home.event.VisitorUnreadCountEvent;
+import com.chwl.core.home.model.GameHomeModel;
+import com.chwl.core.home.model.HomeModel;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.linked.LinkedModel;
+import com.chwl.core.linked.bean.LinkedInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMBroadcastManager;
+import com.chwl.core.manager.IMMessageManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.patriarch.event.CloseMinRoomEvent;
+import com.chwl.core.patriarch.event.ImPushMsgPmLimitTimeEvent;
+import com.chwl.core.patriarch.event.PmDismissAllLimitDialogEvent;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.user.event.LoadLoginUserInfoEvent;
+import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
+import com.chwl.core.user.event.NeedBindPhoneEvent;
+import com.chwl.core.user.event.NeedCompleteInfoEvent;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.StringFormatUtils;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.threadmgr.ThreadPoolManager;
+import com.chwl.library.utils.JavaUtil;
+import com.chwl.library.utils.ResUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -139,7 +138,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         implements MainTabLayout.OnTabClickListener, IMainView, View.OnClickListener {
 
     public static final String MSG_TAB = "msgTab";
-    public static final String GAME_TAB = "gameTab";
     private static final String TAG = "MainActivity";
     private static final String EXTRA_APP_QUIT = "APP_QUIT";
     private final SparseArray<Fragment> fragmentArray = new SparseArray<>();
@@ -168,7 +166,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
 
     {
         fragmentArray.put(MainTabType.TAB_TYPE_HOME, new HomeFragment());
-        fragmentArray.put(MainTabType.TAB_TYPE_SQUARE, new SquareFragment());
+//        fragmentArray.put(MainTabType.TAB_TYPE_SQUARE, new SquareFragment());
         fragmentArray.put(MainTabType.TAB_TYPE_MSG, new ContactsListFragment());
         fragmentArray.put(MainTabType.TAB_TYPE_ME, new MeFragment());
     }
@@ -251,7 +249,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
                 mMainTabLayout.setMainTabInfoList(mainTabInfo);
             }
         });
-        InitialModel.get().regionCheck();
         //检测更新
         AppUpgradeHelper.checkAppUpgrade(this);
         initMaterialView();
@@ -281,6 +278,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         ThreadPoolManager.instance().init();
         IMBroadcastManager.get().onCreate();
         ImageLoadUtilsV2.init(context);
+        SettingsModel.get().checkSysAccount();
     }
 
     @Override
@@ -340,22 +338,22 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         }
     }
 
-    private void checkShowAnchorCardView() {
-        if (touchRunnable != null || !mResumed || AvRoomDataManager.get().mCurrentRoomInfo != null)
-            return;
-        int anchorCardViewType = DemoCache.readAnchorCardView();
-        if (anchorCardViewType == 2) {
-            if (CurrentTimeUtils.getCurrentTime() - DemoCache.readAnchorCardViewTime() > 15 * 60 * 1000) {
-                touchRunnable = () -> {
-                    touchRunnable = null;
-                    homeViewModel.requestAnchorInfo();
-                };
-                mMainTabLayout.postDelayed(touchRunnable, 5000);
-            }
-        } else if (anchorCardViewType == 1 || DemoCache.readLaunchCount() == 1) {
-            homeViewModel.requestAnchorInfo();
-        }
-    }
+//    private void checkShowAnchorCardView() {
+//        if (touchRunnable != null || !mResumed || AvRoomDataManager.get().mCurrentRoomInfo != null)
+//            return;
+//        int anchorCardViewType = DemoCache.readAnchorCardView();
+//        if (anchorCardViewType == 2) {
+//            if (CurrentTimeUtils.getCurrentTime() - DemoCache.readAnchorCardViewTime() > 15 * 60 * 1000) {
+//                touchRunnable = () -> {
+//                    touchRunnable = null;
+//                    homeViewModel.requestAnchorInfo();
+//                };
+//                mMainTabLayout.postDelayed(touchRunnable, 5000);
+//            }
+//        } else if (anchorCardViewType == 1 || DemoCache.readLaunchCount() == 1) {
+//            homeViewModel.requestAnchorInfo();
+//        }
+//    }
 
     @Override
     protected void onPause() {
@@ -518,6 +516,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLoadLoginUserInfoEvent(LoadLoginUserInfoEvent event) {
         firstLoadedUserInfo();
+        InitialModel.get().regionCheck();
     }
 
     public void onLogout() {
@@ -794,8 +793,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         GameHomeModel.get().getRoomShortcut()
                 .compose(bindUntilEvent(ActivityEvent.DESTROY))
                 .subscribe(uid -> {
-                            if (StringUtils.toLong(uid) != 0) {
-                                AVRoomActivity.start(context, StringUtils.toLong(uid));
+                            if (StringFormatUtils.toLong(uid) != 0) {
+                                AVRoomActivity.start(context, StringFormatUtils.toLong(uid));
                             }
                         },
                         Throwable::printStackTrace);
@@ -834,7 +833,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onImPushMsgPmLimitTimeEvent(ImPushMsgPmLimitTimeEvent event) {
         //先判断Avroom存不存在，存在的话则不处理，avroom会处理
-        Activity reference = XChatApplication.gStack.getAvRoomActivity();
+        Activity reference = App.gStack.getAvRoomActivity();
         if (reference != null) {
             return;
         }

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

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

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

@@ -1,22 +1,22 @@
-package com.yizhuan.habu;
+package com.chwl.app;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 
-import com.yizhuan.habu.audio.MyVoiceActivity;
-import com.yizhuan.habu.audio.RecordingVoiceActivity;
-import com.yizhuan.habu.audio.SoundSignatureActivity;
-import com.yizhuan.habu.ui.login.AddUserInfoActivity;
-import com.yizhuan.habu.ui.login.ModifyInfoActivity;
-import com.yizhuan.habu.ui.setting.SettingActivity;
-import com.yizhuan.habu.ui.user.activity.EditUserLabelActivity;
-import com.yizhuan.habu.ui.user.activity.UserInfoActivity;
-import com.yizhuan.habu.ui.user.activity.UserInfoModifyActivity;
-import com.yizhuan.habu.ui.user.activity.UserModifyPhotosActivity;
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.chwl.app.audio.MyVoiceActivity;
+import com.chwl.app.audio.RecordingVoiceActivity;
+import com.chwl.app.audio.SoundSignatureActivity;
+import com.chwl.app.ui.login.AddUserInfoActivity;
+import com.chwl.app.ui.login.ModifyInfoActivity;
+import com.chwl.app.ui.setting.SettingActivity;
+import com.chwl.app.ui.user.activity.EditUserLabelActivity;
+import com.chwl.app.ui.user.activity.UserInfoActivity;
+import com.chwl.app.ui.user.activity.UserInfoModifyActivity;
+import com.chwl.app.ui.user.activity.UserModifyPhotosActivity;
+import com.chwl.app.ui.webview.CommonWebViewActivity;
+import com.chwl.core.UriProvider;
+import com.chwl.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 +
-                "/anan_vestBag/modules/monster/index.html?monsterId=" + monsterId);
+                "/hiyoo/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 +
-                "/anan_vestBag/modules/recommend-card/index.html";
+                "/hiyoo/modules/recommend-card/index.html";
         CommonWebViewActivity.start(context, cardUrl);
     }
 
     public static void openContactUs(Context context) {
-        CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/anan_vestBag/modules/contact/contact.html");
+        CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/hiyoo/modules/contact/contact.html");
     }
 }

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

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

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

@@ -1,6 +1,6 @@
-package com.yizhuan.habu.application;
+package com.chwl.app.application;
 
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
 
 import android.annotation.SuppressLint;
 import android.app.Application;
@@ -14,12 +14,13 @@ import android.util.Log;
 
 import androidx.multidex.MultiDex;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.request.target.ViewTarget;
-import com.chuhai.utils.LanguageUtils;
+import com.chwl.app.support.IMUserInfoProvider;
+import com.example.lib_utils.LanguageUtils;
 import com.coorchice.library.utils.LogUtils;
-import com.facebook.stetho.Stetho;
+import com.example.lib_utils.ServiceTime;
 import com.hjq.toast.ToastUtils;
-import com.mob.MobSDK;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nimlib.sdk.NIMClient;
@@ -39,56 +40,56 @@ import com.scwang.smartrefresh.header.MaterialHeader;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.tencent.vasdolly.helper.ChannelReaderUtil;
-import com.yizhuan.habu.BuildConfig;
-import com.yizhuan.habu.NimMiddleActivity;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.common.app.ActivityStack;
-import com.yizhuan.habu.common.util.AppLifeCycleHelper;
-import com.yizhuan.habu.module_hall.HallDataManager;
-import com.yizhuan.habu.radish.wallet.RadishWalletManager;
-import com.yizhuan.habu.utils.PushMessageHandler;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.DemoCache;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.channel.ChannelModel;
-import com.yizhuan.xchat_android_core.family.model.FamilyModel;
-import com.yizhuan.xchat_android_core.gift.GiftModel;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
-import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor;
-import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor;
-import com.yizhuan.xchat_android_core.interceptor.TimeSyncInterceptor;
-import com.yizhuan.xchat_android_core.manager.IMMessageManager;
-import com.yizhuan.xchat_android_core.manager.IMSystemMsgManager;
-import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
-import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel;
-import com.yizhuan.xchat_android_core.pay.PayModel;
-import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel;
-import com.yizhuan.xchat_android_core.radish.RadishModel;
-import com.yizhuan.xchat_android_core.radish.signin.bean.ImNotice;
-import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.utils.net.ServerException;
-import com.yizhuan.xchat_android_library.common.application.BaseApp;
-import com.yizhuan.xchat_android_library.common.application.Env;
-import com.yizhuan.xchat_android_library.common.file.FileHelper;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.net.rxnet.converter.GsonConverterPlugins;
-import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
-import com.yizhuan.xchat_android_library.utils.AppUtils;
-import com.yizhuan.xchat_android_library.utils.DeviceUuidFactory;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.SystemUtils;
-import com.yizhuan.xchat_android_library.utils.VersionUtil;
-import com.yizhuan.xchat_android_library.utils.codec.MD5Utils;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.app.BuildConfig;
+import com.chwl.app.NimMiddleActivity;
+import com.chwl.app.R;
+import com.chwl.app.common.app.ActivityStack;
+import com.chwl.app.common.util.AppLifeCycleHelper;
+import com.chwl.app.module_hall.HallDataManager;
+import com.chwl.app.radish.wallet.RadishWalletManager;
+import com.chwl.app.utils.PushMessageHandler;
+import com.chwl.core.XConstants;
+import com.chwl.core.Constants;
+import com.chwl.core.DemoCache;
+import com.chwl.core.UriProvider;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.channel.ChannelModel;
+import com.chwl.core.family.model.FamilyModel;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.OpenSignInAttachment;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.interceptor.NoParamsInterceptor;
+import com.chwl.core.interceptor.ParamsInterceptor;
+import com.chwl.core.interceptor.TimeSyncInterceptor;
+import com.chwl.core.manager.IMMessageManager;
+import com.chwl.core.manager.IMSystemMsgManager;
+import com.chwl.core.market_verify.MarketVerifyModel;
+import com.chwl.core.mentoring_relationship.model.MentoringRelationshipModel;
+import com.chwl.core.pay.PayModel;
+import com.chwl.core.public_chat_hall.model.PublicChatHallModel;
+import com.chwl.core.radish.RadishModel;
+import com.chwl.core.radish.signin.bean.ImNotice;
+import com.chwl.core.room.face.DynamicFaceModel;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.event.NeedCompleteInfoEvent;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.ServerException;
+import com.chwl.library.common.application.BaseApp;
+import com.chwl.library.common.application.Env;
+import com.chwl.library.common.file.FileHelper;
+import com.chwl.library.net.rxnet.RxNet;
+import com.chwl.library.net.rxnet.converter.GsonConverterPlugins;
+import com.chwl.library.utils.AppMetaDataUtil;
+import com.chwl.library.utils.AppUtils;
+import com.chwl.library.utils.DeviceUuidFactory;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.SystemUtils;
+import com.chwl.library.utils.VersionUtil;
+import com.chwl.library.utils.codec.MD5Utils;
+import com.chwl.library.utils.config.BasicConfig;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -107,9 +108,13 @@ import io.realm.RealmConfiguration;
  * @date 2017/2/11
  */
 
-public class XChatApplication extends BaseApp {
+public class App 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) {
@@ -165,7 +170,7 @@ public class XChatApplication extends BaseApp {
             return null;
         }
     };
-    private static XChatApplication instance;
+    private static App instance;
     //生命周期监听
     private static AppLifeCycleHelper lifeCycleHelper;
     public static ActivityStack gStack = new ActivityStack();
@@ -184,7 +189,7 @@ public class XChatApplication extends BaseApp {
                 (context, layout) -> new ClassicsFooter(context).setDrawableSize(20));
     }
 
-    public static XChatApplication instance() {
+    public static App instance() {
         return instance;
     }
 
@@ -198,16 +203,24 @@ public class XChatApplication extends BaseApp {
 
         String channel = "";
         channel = ChannelReaderUtil.getChannel(instance);
+        Log.d("APP", "localChannel:" + channel);
         if (TextUtils.isEmpty(channel)) {
             channel = Constants.GOOGLE;
         }
-
+        Log.d("APP", "finalChannel:" + channel);
         BasicConfig.INSTANCE.setOriginalChannel(channel);
 
         BasicConfig.INSTANCE.setChannel(channel);
 
         initEnv();
 
+        // ARouter
+        if (isDebug()) {           // These two lines must be written before init, otherwise these configurations will be invalid in the init process
+            ARouter.openLog();     // Print log
+            ARouter.openDebug();   // Turn on debugging mode (If you are running in InstantRun mode, you must turn on debug mode! Online version needs to be closed, otherwise there is a security risk)
+        }
+        ARouter.init(application); // As early as possible, it is recommended to initialize in the Application
+
         //延迟初始化云信
         NIMClient.init(context, null, options());
 
@@ -241,8 +254,11 @@ public class XChatApplication extends BaseApp {
                         EventBus.getDefault().post(new NeedCompleteInfoEvent());
                         throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
                     } else if (serviceResult.getCode() == 401) {
-                        SingleToastUtil.showToast(serviceResult.getMessage());
-                        AuthModel.get().cleanLogInfo();
+                        if ((ServiceTime.INSTANCE.getTime() - logoutEventTime) > 800) {
+                            logoutEventTime = ServiceTime.INSTANCE.getTime();
+                            SingleToastUtil.showToast(serviceResult.getMessage());
+                            AuthModel.get().cleanLogInfo();
+                        }
                         throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
                     }
                 }
@@ -254,7 +270,6 @@ public class XChatApplication extends BaseApp {
             //fixed: Glide Exception:"You must not call setTag() on a view Glide is targeting"
             ViewTarget.setTagId(R.id.tag_glide);
 
-            initStetho(context);
             init(channel);
 
             //生命周期监听
@@ -262,9 +277,9 @@ public class XChatApplication extends BaseApp {
                 lifeCycleHelper = new AppLifeCycleHelper();
             }
             registerActivityLifecycleCallback(lifeCycleHelper);
-            initLinkedMe();
-            MobSDK.init(context);
-            MobSDK.submitPolicyGrantResult(true);
+//            initLinkedMe();
+//            MobSDK.init(context);
+//            MobSDK.submitPolicyGrantResult(true);
         }
 
         LogUtils.d("init time = " + (System.currentTimeMillis() - startTime) + "ms");
@@ -275,11 +290,11 @@ public class XChatApplication extends BaseApp {
         ((Application) BasicConfig.INSTANCE.getAppContext().getApplicationContext()).registerActivityLifecycleCallbacks(callbacks);
     }
 
-    /**
-     * 初始化linkedMe
-     */
-    private static void initLinkedMe() {
-        MobSDK.init(instance, "32fd2f8457880", "ef796ca85e8cd95a76929663de133214");
+//    /**
+//     * 初始化linkedMe
+//     */
+//    private static void initLinkedMe() {
+//        MobSDK.init(instance, "32fd2f8457880", "ef796ca85e8cd95a76929663de133214");
 //        MobLink.setRestoreSceneListener(new RestoreSceneListener() {
 //            @Override
 //            public Class<? extends Activity> willRestoreScene(Scene scene) {
@@ -294,7 +309,7 @@ public class XChatApplication extends BaseApp {
 //            public void notFoundScene(Scene scene) {
 //            }
 //        });
-    }
+//    }
 
 
     private static void initEnv() {
@@ -394,7 +409,7 @@ public class XChatApplication extends BaseApp {
         Map<String, String> httpParams = new ConcurrentHashMap<>();
         httpParams.put("os", "android");
         httpParams.put("osVersion", Build.VERSION.RELEASE);
-        httpParams.put("app", XChatConstants.APP_MARK);
+        httpParams.put("app", XConstants.APP_MARK);
         httpParams.put("ispType", String.valueOf(SystemUtils.getIspType(context)));
         httpParams.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
         httpParams.put("model", SystemUtils.getPhoneModel());
@@ -405,7 +420,7 @@ public class XChatApplication extends BaseApp {
         httpParams.put("channel", AppMetaDataUtil.getChannelID());
         httpParams.put("lang", LanguageUtils.INSTANCE.getSystemLanguage().toLanguageTag());
         RxNet.init(context)
-                .debug(BuildConfig.DEBUG)
+                .debug(Env.isDebug())
                 .setBaseUrl(url)
                 .addInterceptors(new ParamsInterceptor(httpParams))
                 .addInterceptors(new NoParamsInterceptor())//注意:拦截器的添加顺序,请求的拦截顺序
@@ -481,7 +496,7 @@ public class XChatApplication extends BaseApp {
 
     private static void initNimUIKit() {
         // 初始化
-        NimUIKit.init(BasicConfig.INSTANCE.getAppContext());
+        NimUIKit.init(BasicConfig.INSTANCE.getAppContext(), new IMUserInfoProvider(), null);
     }
 
     /**
@@ -548,18 +563,4 @@ public class XChatApplication extends BaseApp {
             unregisterActivityLifecycleCallbacks(lifeCycleHelper);
         }
     }
-
-    /**
-     * 初始化Stetho（网络调试）
-     */
-    private static void initStetho(Context context) {
-        if (Env.isDebug()) {
-            Stetho.initialize(
-                    Stetho.newInitializerBuilder(context)
-                            .enableDumpapp(Stetho.defaultDumperPluginsProvider(context))
-                            .enableWebKitInspector(Stetho.defaultInspectorModulesProvider(context))
-                            .build()
-            );
-        }
-    }
 }

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu.application;
+package com.chwl.app.application;
 
 import android.os.Bundle;
 import java.util.Map;

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

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

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu.audio;
+package com.chwl.app.audio;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -10,21 +10,21 @@ import android.view.View;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.audio.adapter.MyVoiceListAdapter;
-import com.yizhuan.habu.audio.helper.AudioPlayerHelper;
-import com.yizhuan.habu.audio.presenter.MyVoicePresenter;
-import com.yizhuan.habu.audio.view.IMyVoiceView;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.NoDataFragment;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.ui.widget.recyclerview.decoration.HorizontalDecoration;
-import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.audio.adapter.MyVoiceListAdapter;
+import com.chwl.app.audio.helper.AudioPlayerHelper;
+import com.chwl.app.audio.presenter.MyVoicePresenter;
+import com.chwl.app.audio.view.IMyVoiceView;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.app.common.NoDataFragment;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.ui.widget.recyclerview.decoration.HorizontalDecoration;
+import com.chwl.core.audio.bean.UserVoiceInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.log.MLog;
 
 import java.util.List;
 
@@ -98,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 com.yizhuan.habu.audio.helper.OnPlayListener() {
+        AudioPlayerHelper.get().playInThread(voice, new com.chwl.app.audio.helper.OnPlayListener() {
             @Override
             public void onError(String error) {
                 if (adapter != null) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-package com.yizhuan.habu.audio.presenter;
+package com.chwl.app.audio.presenter;
 
-import static com.yizhuan.habu.audio.RecordingVoiceActivity.AUDIO_DURA;
-import static com.yizhuan.habu.audio.RecordingVoiceActivity.AUDIO_FILE;
-import static com.yizhuan.habu.audio.RecordingVoiceActivity.MIN_RECORD_VOICE_DURATION;
+import static com.chwl.app.audio.RecordingVoiceActivity.AUDIO_DURA;
+import static com.chwl.app.audio.RecordingVoiceActivity.AUDIO_FILE;
+import static com.chwl.app.audio.RecordingVoiceActivity.MIN_RECORD_VOICE_DURATION;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,25 +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.yizhuan.habu.R;
-import com.yizhuan.habu.audio.helper.AudioPlayerHelper;
-import com.yizhuan.habu.audio.helper.OnPlayListener;
-import com.yizhuan.habu.audio.view.IRecordingVoiceView;
-import com.yizhuan.habu.base.BaseMvpPresenter;
-import com.yizhuan.xchat_android_core.audio.AudioModel;
-import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager;
-import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.file.FileModel;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_library.base.PresenterEvent;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
+import com.chwl.app.R;
+import com.chwl.app.audio.helper.AudioPlayerHelper;
+import com.chwl.app.audio.helper.OnPlayListener;
+import com.chwl.app.audio.view.IRecordingVoiceView;
+import com.chwl.app.base.BaseMvpPresenter;
+import com.chwl.core.audio.AudioModel;
+import com.chwl.core.audio.AudioPlayAndRecordManager;
+import com.chwl.core.audio.bean.SaveVoiceSuccessResultInfo;
+import com.chwl.core.audio.bean.VoiceCardInfo;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.file.FileModel;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.library.base.PresenterEvent;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.log.MLog;
 
 import java.io.File;
 import java.util.List;

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

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

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu.audio.view;
+package com.chwl.app.audio.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -14,24 +14,24 @@ import androidx.annotation.NonNull;
 
 import com.coorchice.library.SuperTextView;
 import com.opensource.svgaplayer.SVGAImageView;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.UIHelper;
-import com.yizhuan.habu.audio.VoiceMatchActivity;
-import com.yizhuan.habu.audio.helper.OnPlayListener;
-import com.yizhuan.habu.audio.helper.SvgaCacheManager;
-import com.yizhuan.habu.audio.helper.VmSoundManager;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.chwl.app.R;
+import com.chwl.app.UIHelper;
+import com.chwl.app.audio.VoiceMatchActivity;
+import com.chwl.app.audio.helper.OnPlayListener;
+import com.chwl.app.audio.helper.SvgaCacheManager;
+import com.chwl.app.audio.helper.VmSoundManager;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.core.XConstants;
+import com.chwl.core.audio.bean.VoiceMatchInfo;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.utils.SharedPreferenceUtils;
+import com.chwl.core.utils.net.DontWarnObserver;
+import com.chwl.core.utils.net.RxHelper;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.TimeUtils;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -428,7 +428,7 @@ public class BottleLayout extends FrameLayout {
 
         ivReport.setOnClickListener(view -> {
             // 跳转到举报页面
-            UIHelper.showReportPage(context, info.getUid(), XChatConstants.REPORT_TYPE_VOICE);
+            UIHelper.showReportPage(context, info.getUid(), XConstants.REPORT_TYPE_VOICE);
         });
 
     }

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu.audio.viewmodel
+package com.chwl.app.audio.viewmodel
 
 import android.content.Intent
 import android.util.Log
@@ -6,22 +6,22 @@ import androidx.lifecycle.MutableLiveData
 import com.netease.nimlib.sdk.media.record.AudioRecorder
 import com.netease.nimlib.sdk.media.record.IAudioRecordCallback
 import com.netease.nimlib.sdk.media.record.RecordType
-import com.yizhuan.habu.R
-import com.yizhuan.habu.audio.SoundSignatureActivity
-import com.yizhuan.habu.audio.helper.AudioPlayerHelper
-import com.yizhuan.habu.audio.helper.OnPlayListener
-import com.yizhuan.habu.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 com.chwl.app.R
+import com.chwl.app.audio.SoundSignatureActivity
+import com.chwl.app.audio.helper.AudioPlayerHelper
+import com.chwl.app.audio.helper.OnPlayListener
+import com.chwl.app.base.BaseViewModel
+import com.chwl.core.Constants
+import com.chwl.core.audio.AudioPlayAndRecordManager
+import com.chwl.core.auth.AuthModel
+import com.chwl.core.manager.AudioEngineManager
+import com.chwl.core.manager.AvRoomDataManager
+import com.chwl.core.sound.model.SoundModel
+import com.chwl.core.utils.extension.toast
+import com.chwl.library.common.application.BaseApp
+import com.chwl.library.utils.ResUtil
+import com.chwl.library.utils.SingleToastUtil
+import com.chwl.library.utils.log.MLog
 import java.io.File
 
 /**

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,19 +1,19 @@
-package com.yizhuan.habu.avroom.activity;
+package com.chwl.app.avroom.activity;
 
 import static android.view.View.VISIBLE;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -44,6 +44,7 @@ import androidx.viewpager2.widget.ViewPager2;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.chwl.core.monsterhunting.bean.MonsterDataBean;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nimlib.sdk.NIMSDK;
 import com.netease.nimlib.sdk.Observer;
@@ -57,100 +58,99 @@ import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.orhanobut.logger.Logger;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.dialog.NewUserGiftDialog;
-import com.yizhuan.habu.avroom.dialog.SingleRoomTipDialog;
-import com.yizhuan.habu.avroom.firstcharge.FirstChargeDialog;
-import com.yizhuan.habu.avroom.fragment.FakeSingleRoomBackFragment;
-import com.yizhuan.habu.avroom.fragment.FakeSingleRoomFragment;
-import com.yizhuan.habu.avroom.fragment.HomePartyFragment;
-import com.yizhuan.habu.avroom.fragment.InputPwdDialogFragment;
-import com.yizhuan.habu.avroom.presenter.AvRoomPresenter;
-import com.yizhuan.habu.avroom.presenter.HomePartyPresenter;
-import com.yizhuan.habu.avroom.redpackage.RedPackageHandler;
-import com.yizhuan.habu.avroom.view.IAvRoomView;
-import com.yizhuan.habu.avroom.widget.VerticalViewPagerAdapter;
-import com.yizhuan.habu.base.BaseMvpActivity;
-import com.yizhuan.habu.common.util.Utils;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.common.widget.CustomImageSpan;
-import com.yizhuan.habu.common.widget.dialog.DialogManager;
-import com.yizhuan.habu.home.dialog.HelloMessageDialog;
-import com.yizhuan.habu.treasure_box.activity.TreasureBoxActivity;
-import com.yizhuan.habu.ui.patriarch.help.LimitEnterRoomHelper;
-import com.yizhuan.habu.ui.user.activity.UserInfoActivity;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.webview.CommonWebViewActivity;
-import com.yizhuan.habu.ui.webview.DialogWebViewActivity;
-import com.yizhuan.habu.ui.widget.NobleOpenNoticeView;
-import com.yizhuan.habu.ui.widget.dialog.AllServiceGiftLevelDialog;
-import com.yizhuan.habu.ui.widget.dialog.MonsterDialog;
-import com.yizhuan.habu.utils.UserUtils;
-import com.yizhuan.habu.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 com.chwl.app.R;
+import com.chwl.app.avroom.dialog.NewUserGiftDialog;
+import com.chwl.app.avroom.dialog.SingleRoomTipDialog;
+import com.chwl.app.avroom.firstcharge.FirstChargeDialog;
+import com.chwl.app.avroom.fragment.FakeSingleRoomBackFragment;
+import com.chwl.app.avroom.fragment.FakeSingleRoomFragment;
+import com.chwl.app.avroom.fragment.HomePartyFragment;
+import com.chwl.app.avroom.fragment.InputPwdDialogFragment;
+import com.chwl.app.avroom.presenter.AvRoomPresenter;
+import com.chwl.app.avroom.presenter.HomePartyPresenter;
+import com.chwl.app.avroom.redpackage.RedPackageHandler;
+import com.chwl.app.avroom.view.IAvRoomView;
+import com.chwl.app.avroom.widget.VerticalViewPagerAdapter;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.library.common.util.Utils;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.common.widget.CustomImageSpan;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.home.dialog.HelloMessageDialog;
+import com.chwl.app.ui.patriarch.help.LimitEnterRoomHelper;
+import com.chwl.app.ui.user.activity.UserInfoActivity;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.webview.CommonWebViewActivity;
+import com.chwl.app.ui.webview.DialogWebViewActivity;
+import com.chwl.app.ui.widget.NobleOpenNoticeView;
+import com.chwl.app.ui.widget.dialog.AllServiceGiftLevelDialog;
+import com.chwl.app.ui.widget.dialog.MonsterDialog;
+import com.chwl.app.utils.UserUtils;
+import com.chwl.app.room_chat.activity.RoomMsgActivity;
+import com.chwl.core.Constants;
+import com.chwl.core.DemoCache;
+import com.chwl.core.auth.AuthModel;
+import com.chwl.core.auth.event.LogoutEvent;
+import com.chwl.core.bean.BaseProtocol;
+import com.chwl.core.channel_page.bean.HelloMessageInfo;
+import com.chwl.core.gift.GiftModel;
+import com.chwl.core.gift.bean.GiftInfo;
+import com.chwl.core.gift.bean.LuckyBagNoticeInfo;
+import com.chwl.core.im.custom.bean.CustomAttachment;
+import com.chwl.core.im.custom.bean.FairyMsgAttachment;
+import com.chwl.core.im.custom.bean.NotifyH5Attachment;
+import com.chwl.core.im.custom.bean.NotifyH5Info;
+import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment;
+import com.chwl.core.im.custom.bean.RoomBoxPrizeInfo;
+import com.chwl.core.im.custom.bean.RoomLuckySeaAttachment;
+import com.chwl.core.im.custom.bean.RoomLuckySeaMsgBean;
+import com.chwl.core.im.custom.bean.RoomPKAttachment;
+import com.chwl.core.im.custom.bean.RoomPkBean;
+import com.chwl.core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
+import com.chwl.core.im.custom.bean.TarotAttachment;
+import com.chwl.core.im.custom.bean.TarotMsgBean;
+import com.chwl.core.initial.InitialModel;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.manager.IMNetEaseManager;
+import com.chwl.core.manager.RoomEvent;
+import com.chwl.core.module_hall.hall.HallModel;
+import com.chwl.core.module_hall.hall.bean.SuperAdminInfo;
+import com.chwl.core.monsterhunting.bean.MonsterHuntingResult;
+import com.chwl.core.monsterhunting.bean.MonsterInfo;
+import com.chwl.core.monsterhunting.bean.MonsterProtocol;
+import com.chwl.core.monsterhunting.manager.MonsterDataManager;
+import com.chwl.core.noble.bean.AllServiceGiftProtocol;
+import com.chwl.core.noble.bean.NobleInfo;
+import com.chwl.core.noble.NobleResourceType;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.patriarch.event.CloseMinRoomEvent;
+import com.chwl.core.patriarch.event.ImPushMsgPmLimitTimeEvent;
+import com.chwl.core.patriarch.event.PmDismissAllLimitDialogEvent;
+import com.chwl.core.patriarch.exception.PmRoomLimitException;
+import com.chwl.core.redpackage.bean.RedPackageNotifyInfo;
+import com.chwl.core.room.anotherroompk.ShowGiftDialogEvent;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.bean.RoomModeType;
+import com.chwl.core.room.dragonball.DragonBallModel;
+import com.chwl.core.room.event.FinishAvRoomEvent;
+import com.chwl.core.room.event.RoomExitEvent;
+import com.chwl.core.room.event.RoomTaskTipsEvent;
+import com.chwl.core.room.pk.event.PKStateEvent;
+import com.chwl.core.super_admin.util.SAdminOptUtil;
+import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.support.room.RoomContext;
+import com.chwl.core.support.room.RoomView;
+import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.user.bean.FirstChargeInfo;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.core.utils.LogUtils;
+import com.chwl.core.utils.StringFormatUtils;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.rxbus.RxBus;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
+import com.chwl.library.utils.UIUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -225,6 +225,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     private SingleRoomTipDialog singleRoomTipDialog;
     // 通过红包进来时，有该参数
     private RedPackageNotifyInfo redPackageNotifyInfo;
+
+    // 是否禁用VP滑动（true：不允许滑动；false：某些条件下可以滑动）
+    private boolean viewPagerInputDisable;
+
     public static void start(Context context, long roomUid) {
         startForFromType(context, roomUid, FROM_TYPE_NORMAL, null, null);
     }
@@ -296,7 +300,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
 
     public static void setBackBg(Context context, RoomInfo roomInfo, SVGAImageView svgaRoomBg, String[] bgPicture) {
         if (roomInfo != null && svgaRoomBg != null) {
-            if (!StringUtils.isBlank(roomInfo.getBackPic())) {
+            if (!StringFormatUtils.isBlank(roomInfo.getBackPic())) {
                 int resourceType = NobleUtil.getResourceType(roomInfo.getBackPic());
                 if (resourceType == NobleResourceType.URLS) {
                     if (!roomInfo.getBackPic().equals(bgPicture[0])) {
@@ -319,7 +323,8 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                     }
                 } else if (roomInfo.getType() == RoomInfo.ROOM_TYPE_SINGLE) {
                     bgPicture[0] = "";
-                    svgaRoomBg.setImageResource(R.drawable.bg_room_single_pic);
+//                    svgaRoomBg.setImageResource(R.drawable.bg_room_single_pic);
+                    playSvgaBg(svgaRoomBg, "svga/room_bg_single.svga");
                 } else {
                     bgPicture[0] = "";
                     if (roomInfo.getRoomModeType() == RoomModeType.OPEN_PK_MODE) {
@@ -396,7 +401,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     public void setCurrentItem(int item) {
         dismissLoadingDialog();
         if (viewpager != null) {
-            viewpager.setUserInputEnabled(true);
+            tryEnabledViewPagerInput();
             viewpager.setCurrentItem(item, false);
         }
     }
@@ -411,7 +416,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         Object notifyInfo = intent.getSerializableExtra("notifyInfo");
         if (notifyInfo instanceof RedPackageNotifyInfo) {
             redPackageNotifyInfo = (RedPackageNotifyInfo) notifyInfo;
-        }else{
+        } else {
             redPackageNotifyInfo = null;
         }
         if (mRoomInfo != null) {
@@ -445,7 +450,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             viewpager.setOffscreenPageLimit(2);
             viewpager.setOrientation(ViewPager2.ORIENTATION_VERTICAL);
             viewpager.getChildAt(0).setOverScrollMode(View.OVER_SCROLL_NEVER);
-            viewpager.setUserInputEnabled(false);
+            disableViewPagerInput();
             viewpager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
                 @Override
                 public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -472,11 +477,11 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                     if (state == 0 && viewpager.getCurrentItem() == 2) {
                         showLoadingDialog();
                         ((FakeSingleRoomFragment) mAdapter.getItem(2)).tryJumpRoom();
-                        viewpager.setUserInputEnabled(false);
+                        disableViewPagerInput();
                     } else if (state == 0 && viewpager.getCurrentItem() == 0) {
                         showLoadingDialog();
                         ((FakeSingleRoomBackFragment) mAdapter.getItem(0)).tryJumpRoom();
-                        viewpager.setUserInputEnabled(false);
+                        disableViewPagerInput();
                     }
                 }
             });
@@ -556,7 +561,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                 }
                 break;
             case RoomEvent.MONSTER_STATUS_CHANGED:
-                MonsterProtocol.DataBean dataBean = roomEvent.getMonsterStatusAttachment().getDataBean();
+                MonsterDataBean dataBean = roomEvent.getMonsterStatusAttachment().getDataBean();
                 Log.e(TAG, "onRoomEventReceive: monster status changed: " + dataBean);
                 RoomInfo myRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
                 // 当前为房间页面并且当前房间为怪兽出现房间时才出现通知
@@ -604,7 +609,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                 // 当前为房间页面并且当前房间为怪兽出现房间时才出现通知
                 if (UIUtils.isTopActivity(AVRoomActivity.this) && currentRoomInfo != null &&
                         currentRoomInfo.getUid() == monsterHuntingResult.getMonster().getAppearRoomUid()) {
-                    MonsterProtocol.DataBean monsterInfo = monsterHuntingResult.getMonster();
+                    MonsterDataBean monsterInfo = monsterHuntingResult.getMonster();
                     if (monsterDialog != null && monsterDialog.isShowing()) {
                         monsterDialog.dismiss();
                     }
@@ -663,7 +668,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
      */
     private void showRoomFragment(boolean isRoomMin) {
         mCurrentFragment = (HomePartyFragment) mAdapter.getItem(1);
-        viewpager.setUserInputEnabled(AvRoomDataManager.get().isSingleRoom());
+        tryEnabledViewPagerInput();
         viewpager.setCurrentItem(1, false);
         if (isRoomMin) {
             RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
@@ -681,7 +686,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
          * TODO 临时方案：后续逐步完善整个房间的RoomContext替换计划
          * PS:目前房间进入的逻辑有些凌乱，没有明确的生命周期，看代码逻辑，无论是第一次还是再次进入都会走这里，所以在这里绑定View
          */
-        getRoomContext().onViewAttach(this);
+        RoomContext roomContext = getRoomContext();
+        if (roomContext != null) {
+            roomContext.onViewAttach(this);
+        }
 
         /**
          * 每次View重新创建（意味着可能在房间外点了红包），就重新尝试加载红包并展示
@@ -1362,7 +1370,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                 .doOnSuccess(aLong -> {
                     if (!DemoCache.readBoolean("FirstCharge", false) &&
                             (UIUtils.isTopActivity(AVRoomActivity.this)
-                                    || UIUtils.isTopActivity(this, TreasureBoxActivity.class.getName())
+//                                    || UIUtils.isTopActivity(this, TreasureBoxActivity.class.getName())
                                     || UIUtils.isTopActivity(this, DialogWebViewActivity.class.getName())
                                     || UIUtils.isTopActivity(this, RoomMsgActivity.class.getName()))) {
                         FirstChargeDialog.start(this);
@@ -1427,4 +1435,41 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             }
         }
     }
+
+    @Override
+    protected void onReceiveChatRoomEvent(RoomEvent roomEvent) {
+        super.onReceiveChatRoomEvent(roomEvent);
+        switch (roomEvent.getEvent()) {
+            case RoomEvent.UP_MIC:
+            case RoomEvent.DOWN_MIC:
+                resetViewPagerInputEnabled();
+                break;
+        }
+    }
+
+    /**
+     * 禁用VP滑动
+     */
+    private void disableViewPagerInput() {
+        this.viewPagerInputDisable = true;
+        resetViewPagerInputEnabled();
+    }
+
+    private void tryEnabledViewPagerInput() {
+        this.viewPagerInputDisable = false;
+        resetViewPagerInputEnabled();
+    }
+
+    private void resetViewPagerInputEnabled() {
+        if (viewPagerInputDisable) {
+            viewpager.setUserInputEnabled(false);
+        } else {
+            if (AvRoomDataManager.get().isSingleRoom() && !AvRoomDataManager.get().isOwnerOnMic()) {
+                // 个播+没在麦位=可以滑动
+                viewpager.setUserInputEnabled(true);
+            } else {
+                viewpager.setUserInputEnabled(false);
+            }
+        }
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu.avroom.activity;
+package com.chwl.app.avroom.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -13,19 +13,19 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.adapter.RoomInviteAdapter;
-import com.yizhuan.habu.avroom.presenter.RoomInvitePresenter;
-import com.yizhuan.habu.avroom.view.IRoomInviteView;
-import com.yizhuan.habu.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 com.chwl.app.R;
+import com.chwl.app.avroom.adapter.RoomInviteAdapter;
+import com.chwl.app.avroom.presenter.RoomInvitePresenter;
+import com.chwl.app.avroom.view.IRoomInviteView;
+import com.chwl.app.base.BaseMvpActivity;
+import com.chwl.core.Constants;
+import com.chwl.core.noble.NobleResourceType;
+import com.chwl.core.room.bean.OnlineChatMember;
+import com.chwl.core.user.bean.UserInfo;
+import com.chwl.library.base.factory.CreatePresenter;
+import com.chwl.library.utils.ListUtils;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.SingleToastUtil;
 
 import java.util.List;
 import java.util.Map;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu.avroom.adapter;
+package com.chwl.app.avroom.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -6,7 +6,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
@@ -16,32 +15,32 @@ import androidx.annotation.Nullable;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.coorchice.library.SuperTextView;
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.opensource.svgaplayer.SVGAImageView;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.common.widget.CircleImageView;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.webview.DialogWebViewActivity;
-import com.yizhuan.habu.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.habu.utils.RegexUtil;
-import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
-import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.noble.NobleResourceType;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData;
-import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueFormat;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
-import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.utils.ActivityUtil;
-import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.chwl.app.R;
+import com.chwl.app.common.widget.CircleImageView;
+import com.chwl.app.ui.utils.ImageLoadUtils;
+import com.chwl.app.ui.webview.DialogWebViewActivity;
+import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
+import com.chwl.app.utils.RegexUtil;
+import com.chwl.core.UriProvider;
+import com.chwl.core.bean.RoomMicInfo;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
+import com.chwl.core.manager.AvRoomDataManager;
+import com.chwl.core.noble.NobleResourceType;
+import com.chwl.core.noble.NobleUtil;
+import com.chwl.core.room.bean.RoomInfo;
+import com.chwl.core.room.giftvalue.bean.GiftValueData;
+import com.chwl.core.room.giftvalue.helper.GiftValueFormat;
+import com.chwl.core.room.pk.bean.PKTeamInfo;
+import com.chwl.core.room.queue.bean.MicMemberInfo;
+import com.chwl.core.user.UserModel;
+import com.chwl.core.utils.ActivityUtil;
+import com.chwl.library.utils.ResUtil;
+import com.chwl.library.utils.config.BasicConfig;
 
 /**
  * @author xiaoyu
@@ -295,7 +294,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
             if (tvNumber != null) {
                 if (AvRoomDataManager.get().isOpenPKMode()) { // pk模式不加性别背景
                     tvNumber.setBackgroundResource(R.drawable.icon_bg_number_default);
-                    tvNumber.setTextColor(context.getResources().getColor(R.color.white_transparent_30));
+                    tvNumber.setTextColor(context.getResources().getColor(R.color.white));
                 } else {
                     tvNumber.setBackgroundResource(gender == 1 ? R.drawable.bg_number_male : R.drawable.bg_number_female);
                     tvNumber.setTextColor(context.getResources().getColor(R.color.white));
@@ -527,7 +526,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         /**
          * 主席位特有
          */
-        FrameLayout frTitle;
+        View frTitle;
         TextView tvRoomDesc;
         ImageView ivTag;
         TextView tvLabelLeaveMode;

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

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

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

@@ -1,4 +1,4 @@
-package com.yizhuan.habu.avroom.adapter;
+package com.chwl.app.avroom.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -11,9 +11,9 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.yizhuan.habu.R;
-import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.chwl.app.R;
+import com.chwl.core.bean.RoomQueueInfo;
+import com.chwl.library.utils.ResUtil;
 
 public class CpMicroViewAdapter extends BaseMicroViewAdapter {
 

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

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

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

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