feat ; 去掉 carshCat

fix：UI问题修复

android_crop_lib/build.gradle

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

android_crop_lib/src/main/AndroidManifest.xml

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

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

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

android_crop_lib/src/main/res/values/strings.xml

@@ -1,10 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <string name="crop__saving">正在儲存相片…</string>
-    <string name="crop__wait">請稍候…</string>
-    <string name="crop__pick_error">沒有可用的圖片來源</string>
-
-    <string name="crop__done">完成</string>
-    <string name="crop__cancel" tools:ignore="ButtonCase">取消</string>
-
-</resources>

android_crop_lib/src/main/res/values/styles.xml

@@ -1,44 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="Crop"></style>
-
-    <style name="Crop.DoneCancelBar">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/crop__bar_height</item>
-        <item name="android:orientation">horizontal</item>
-        <item name="android:divider">@drawable/crop__divider</item>
-        <item name="android:showDividers" tools:ignore="NewApi">middle</item>
-        <item name="android:dividerPadding" tools:ignore="NewApi">12dp</item>
-        <item name="android:background">@color/crop__button_bar</item>
-    </style>
-
-    <style name="Crop.ActionButton">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:background">@drawable/crop__selectable_background</item>
-    </style>
-
-    <style name="Crop.ActionButtonText">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingRight">20dp</item> <!-- Offsets left drawable -->
-        <item name="android:drawablePadding">8dp</item>
-        <item name="android:textColor">@color/crop__button_text</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="Crop.ActionButtonText.Done">
-        <item name="android:drawableLeft">@drawable/crop__ic_done</item>
-        <item name="android:text">@string/crop__done</item>
-    </style>
-
-    <style name="Crop.ActionButtonText.Cancel">
-        <item name="android:drawableLeft">@drawable/crop__ic_cancel</item>
-        <item name="android:text">@string/crop__cancel</item>
-    </style>
-
-</resources>

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,164 @@
 }
 -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{*;}
+-keep class tech.sud.mgp.SudMGPWrapper.** {*;}
+
+#new after proguard
+-dontwarn bdcb.eedb.**
+-keep class bdcb.eedb.** {*;}
+-keep class cddcabe.afbdedeb.** {*;}
+-keep class dfedf.eedab.** {*;}
+-keep class dcdaef.bbcdfa.** {*;}
+-keep class com.chwl.app.public_chat_hall.msg.viewholder.** {*;}
+-keep class decfc.acfca.** {*;}
+-keep class com.chwl.app.mentoring_relationship.viewholder.** {*;}
+-keep class b.** { *; }
+-keep class cb.** { *; }
+-keep public class * extends b.NP
+-keep public class * extends ddbfbdf.acbaddc.AbstractMvpPresenter
+-dontwarn bacefd.cdbedf.**
+-keep class bacefd.cdbedf.** {*;}
+-keep class f.DG{*;}
+-keep class bf.CA{*;}
+-keep class q.Y {*;}
+
+-keep class bacccfc.abbadfec.** { *; }
+-keep class edecfbdbb.fbdcbfaaed.** { *; }
+-keep class bbfeef.fdaefba.** { *; }
+-keep class cfeefddf.daadadef.** { *; }
+-keep class eadfab.aaffafa.** { *; }
+-keep class cbbfdd.fdbaab.** { *; }
+-keep class fcffbcef.cbefeefa.** { *; }
+-keep class bbacbff.ecbddeb.** { *; }
+-keep class ebbbf.bfcbc.** { *; }
+-keep class afbfbfd.dffbcec.** { *; }
+-keep class el.** {*;}
+-keep class baf.edaf.** { *; }
+-keep class daddbf.cebdcdd.** { *; }
+-keep class adecece.cdedecc.** { *; }
+
+-keep class fbbaffa.faecdbe.** { *; }
+-keep class accbfce.fccdabb.** { *; }
+-keep class afbfaa.afcdcd.** { *; }
+-keep class aecbcaf.acdbabae.** { *; }
+-keep class edeebee.fefabfb.** { *; }
+-dontwarn fbbaffa.faecdbe.**
+-dontwarn accbfce.fccdabb.**
+-dontwarn afbfaa.afcdcd.**
+-dontwarn aecbcaf.acdbabae.**
+-dontwarn edeebee.fefabfb.**
+
+-keep class cp.** { *; }
+-dontwarn cp.**
+-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 {*;}
+
+-keep class aea.baaf.** { *; }
+-keep class ddfb.edcab.** { *; }
+-keep class aeaaa.dedad.** { *; }
+-keep class acbfad.dcbefe.** { *; }
+-keep class deafc.bebac.** { *; }
+-keep class ffbe.bdac.** { *; }
+-keep class eaedcce.eebdfabf.** { *; }
+-keep class edcbb.bcfca.** { *; }
+-keep class ffdab.eabbd.** { *; }
+-keep class fcfc.debbb.** { *; }
+-keep class bfbcaedcbf.fddedfaafe.** { *; }
+-keep class eacfafb.adbcafda.** { *; }
+-keep class aedfcaaf.cdfbbcce.** { *; }
+-keep class bbcf.abac.** { *; }
+-keep class edfea.cddcb.** { *; }
+-keep class ccaad.bddfa.** { *; }
+-keep class aaffcba.daeefdac.** { *; }
+-keep class cbcdae.acdabfe.** { *; }
+-keep class eedbaeb.defbdfae.** { *; }
+-keep class cfeddda.aafffbc.** { *; }
+-keep class y.** {*;}
+-keep class eaffcdbc.daeffdba.** { *; }
+-keep class bfbdcd.fafefd.** { *; }
+-keep class ba.** {*;}
+-keep class aceac.ecabfe.** { *; }
+-keep class cdccdab.ebdbacb.** { *; }
+-keep class bababbc.cecaffca.** { *; }
+-keep class edbce.fdbbbc.** { *; }
+-keep class dfaabac.aabbefcc.** { *; }
+-keep class edccdc.abfbfcc.** { *; }
+-keep class eebfd.aaccca.** { *; }
+-keep class ecaed.eebace.** { *; }
+-keep class cfeee.cdeea.** { *; }
+-keep class afb.eaca.** { *; }
+-keep class bdebccd.fbfaecdb.** { *; }
+-keep class eacfafb.aadfdcee.** { *; }
+-keep class bceba.bbfce.** { *; }
+-keep class cd.** {*;}
+-keep class fddadcc.fbdbaaa.** { *; }
+-keep class bdabfb.aecccbc.** { *; }
+-keep class g.** {*;}
+-keep class edbaad.bbdcdfc.** { *; }
+-keep class acdfe.ebeaed.** { *; }
+-keep class fabffdc.ffcdadbe.** { *; }
+-keep class abbefdab.daeaadad.** { *; }
+-keep class def.cff.** { *; }
+-keep class fbefaae.fddefebe.** { *; }
+-keep class fbdfcae.fefbfee.** { *; }
+-keep class dfefd.bacabc.** { *; }
+-keep class ffedae.acfcdbb.** { *; }
+-keep class ddeeb.bdcdf.** { *; }
+-keep class dcabc.bbdaea.** { *; }
+-keep class adbaee.fffffc.** { *; }
+-keep class bb.** {*;}
+-keep class fffba.cdbfee.** { *; }
+-keep class cbeee.efcdfb.** { *; }
+-keep class cdaabd.cfabfca.** { *; }
+-keep class dbeef.acefca.** { *; }
+-keep class edbabbab.acdccacc.** { *; }
+-keep class dedfdbd.ebffbcba.** { *; }
+-keep class dfdefbe.fedadcf.** { *; }
+-keep class accd.bbdff.** { *; }
+-keep class u.** {*;}
+-keep class ebbffdf.beebece.** { *; }
+-keep class fcfdaa.edabfab.** { *; }
+-keep class afbba.abdcd.** { *; }
+-keep class dbcce.ecaeff.** { *; }
+-keep class fbbcdb.ddfadba.** { *; }
+-keep class bbecb.daedaf.** { *; }
+-keep class cdade.adeda.** { *; }
+-keep class bg.** {*;}
+-keep class bbcabbb.dcabfcd.** { *; }
+-keep class cfadf.caddb.** { *; }
+-keep class bdbabbdc.ffafceeac.** { *; }
+-keep class bd.** {*;}
+-keep class ccbd.abca.** { *; }
+-keep class j.** {*;}
+-keep class fbeebae.ebcadebe.** { *; }
+-keep class aaecbd.bfafacd.** { *; }
+-keep class fcef.caffe.** { *; }
+-keep class decd.efffc.** { *; }
+-keep class cdfaac.caaeba.** { *; }
+-keep class fdab.dbaad.** { *; }
+-keep class dbcdb.edafab.** { *; }
+-keep class feacbcff.edcaafbbb.** { *; }
+-keep class ebdeaeb.dbccefdb.** { *; }
+-keep class feacdf.cefdbd.** { *; }
+-keep class efbbc.adeda.** { *; }
+-keep class bccd.dddee.** { *; }
+-keep class faafdf.cefbbcb.** { *; }
+-keep class fcebb.eebee.** { *; }
+-keep class cedec.faddde.** { *; }
+-keep class affae.fcdff.** { *; }
+
+-keep class eecdc.cddbfa.** { *; }
+-keep class fddd.dbae.** { *; }
+-keep class defceb.bddedaa.** { *; }
+-keep class decd.efffc.** { *; }
+
+-keep class bbfeef.fdaefba.** { *; }
+-keep class baf.edaf.** { *; }
+-keep class acdb.aacb.** { *; }
+-keep class bacfcf.dddbef.** { *; }
+-keep class cfeaf.ddccec.** { *; }

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>
 
@@ -51,9 +51,9 @@
         tools:node="remove" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission tools:node="remove" android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission tools:node="remove" android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
@@ -82,19 +82,20 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <!-- 对于 Android 12.0 及以上设备，还需要添加如下权限： -->
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />
     <application
-        android:name=".application.XChatApplication"
+        android:name=".application.App"
         android:allowBackup="false"
-        android:icon="@mipmap/app_logo"
-        android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_launch_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:supportsRtl="true"
         android:testOnly="false"
         android:theme="@style/MyMaterialTheme"
-        tools:replace="android:name,android:allowBackup"
+        tools:replace="android:name,android:label,android:allowBackup"
         tools:targetApi="n">
 
         <activity
@@ -127,12 +128,30 @@
 <!--            </intent-filter>-->
         </activity>
 
+        <activity
+            android:name=".ui.link.LinkActivity"
+            android:configChanges="orientation|screenSize"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:theme="@style/transparent_activity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="app"
+                    android:scheme="molistar" />
+            </intent-filter>
+        </activity>
+
 <!--        <meta-data-->
 <!--            android:name="firebase_crashlytics_collection_enabled"-->
 <!--            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
         <!-- 小米 -->
         <activity
-            android:name="com.soundcloud.android.crop.CropImageActivity"
+            android:name="com.soundcloud.crop.CropImageActivity"
             android:screenOrientation="portrait" /> <!-- 华为 -->
         <activity
             android:name="com.darsh.multipleimageselect.activities.AlbumSelectActivity"
@@ -152,31 +171,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.molistar.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 +242,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Habu Live"
+            android:label="MoliStar"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -247,6 +266,12 @@
             android:name=".avroom.activity.RoomSettingActivity"
             android:label="@string/main_androidmanifest_07"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".avroom.activity.RoomTypeSwitchActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".avroom.activity.RoomBgSettingActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".avroom.activity.RoomManagerListActivity"
             android:label="@string/main_androidmanifest_08"
@@ -260,12 +285,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"
@@ -291,6 +316,9 @@
             android:name=".ui.user.activity.UserInfoActivity"
             android:label="@string/main_androidmanifest_016"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.user.activity.UserCpListActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".audio.AudioRecordActivity"
             android:label="@string/main_androidmanifest_017"
@@ -300,12 +328,11 @@
             android:label="@string/main_androidmanifest_018"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".home.activity.CollectionRoomActivity"
-            android:label="@string/main_androidmanifest_019"
+            android:name=".ui.wallet.WalletActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.wallet.ExchangeGoldActivity"
-            android:label="@string/main_androidmanifest_020"
+            android:name=".home.activity.CollectionRoomActivity"
+            android:label="@string/main_androidmanifest_019"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.setting.SettingActivity"
@@ -316,18 +343,6 @@
         <activity
             android:name=".ui.relation.FansListActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.withdraw.WithdrawActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.withdraw.bankcard.BindWithdrawBankCardActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.withdraw.WithdrawRuleActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.withdraw.BinderAlipayActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.user.activity.AboutActivity"
             android:screenOrientation="portrait" />
@@ -404,10 +419,6 @@
             android:name=".decoration.view.MyDecorationActivity"
             android:label="@string/main_androidmanifest_027"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".decoration.view.DecorationStoreActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".ui.user.activity.UserGiftActivity"
             android:screenOrientation="portrait"
@@ -416,42 +427,6 @@
             android:name=".friend.view.SelectFriendActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyPlazaActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyHomeActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilySearchActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyListActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyManageActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyCurrencyActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyMemberListActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyInfoActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyMemberSearchActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".team.view.NimTeamMessageActivity"
             android:screenOrientation="portrait"
@@ -496,10 +471,6 @@
             android:name=".luckymoney.view.LuckyMoneyDetailActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" /> <!-- android:launchMode="singleTask" -->
-        <activity
-            android:name=".family.view.activity.FamilyMemberCurrencyActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".ErbanTakePhotoActivity"
             android:screenOrientation="portrait"
@@ -508,21 +479,9 @@
             android:name=".team.view.UpdateTeamNameActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilySelectFriendActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".family.view.activity.FamilyTextInputActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            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" />
+            android:theme="@style/transparent_activity" />
         <activity
             android:name=".treasure_box.activity.BoxRankingActivity"
             android:theme="@style/room_message_activity" />
@@ -540,17 +499,6 @@
             android:name=".ui.widget.RecallDialog"
             android:screenOrientation="portrait"
             android:theme="@style/dialog_activity_close_inside" />
-        <activity
-            android:name=".public_chat_hall.activity.PublicChatHallHomeActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:label="@string/main_androidmanifest_028"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".public_chat_hall.activity.PublicChatHallAitFriendsActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:label="@string/main_androidmanifest_029"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.user.decorationsend.DecorationSendActivity"
             android:screenOrientation="portrait"
@@ -561,14 +509,6 @@
         <activity
             android:name=".avroom.activity.RoomOnlineUserActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".public_chat_hall.activity.PublicChatHallRelatedToMeActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".public_chat_hall.activity.AitFriendsSearchActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".ui.login.ShowBindPhoneActivity"
             android:screenOrientation="portrait" />
@@ -634,9 +574,6 @@
         <activity
             android:name=".module_hall.hall.activity.MemberSearchActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".avroom.activity.CpRoomInviteActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".module_hall.hall.activity.HallSearchActivity"
             android:screenOrientation="portrait" />
@@ -649,36 +586,25 @@
         <activity
             android:name=".module_hall.team.activity.HTeamMemberListActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name="com.yizhuan.habu.mentoring_relationship.activity.MentoringRelationshipActivity"
-            android:label="@string/main_androidmanifest_030"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".avroom.recommendcard.MyRecommendCardActivity"
             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.RoomInviteFansActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieMessageActivity"
-            android:theme="@style/room_message_activity" />
-        <activity
-            android:name="com.yizhuan.habu.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
@@ -687,9 +613,6 @@
         <activity
             android:name=".radish.activity.RadishRecordActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".radish.signin.SignInActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".radish.task.activity.TaskCenterActivity"
             android:screenOrientation="portrait" />
@@ -713,42 +636,6 @@
         <activity
             android:name=".audio.VoiceMatchActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".miniworld.activity.MiniWorldGuestPageActivity"
-            android:screenOrientation="portrait" /> <!-- 推荐位 -->
-        <activity
-            android:name=".miniworld.activity.TopicMainActivity"
-            android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
-        <activity
-            android:name=".miniworld.activity.MiniWorldEditActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".miniworld.activity.MiniWorldMemberListActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".miniworld.activity.MiniWorldTeamMessageActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".miniworld.activity.MWTeamRoomMessageAct"
-            android:screenOrientation="portrait"
-            android:theme="@style/room_message_activity" />
-        <activity
-            android:name=".miniworld.activity.MiniWorldGroupThemeActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".miniworld.activity.MiniWorldActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".miniworld.activity.AllTopicActivity"
-            android:screenOrientation="portrait" /> <!-- 房间内私聊 -->
-        <!-- 萝卜-签到-任务 -->
-        <activity
-            android:name=".miniworld.activity.MiniWorldSearchActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".miniworld.activity.MiniWorldMainActivity"
-            android:screenOrientation="portrait" />
         <activity android:name=".ui.im.friend.ActFriendList" />
         <activity
             android:name=".bank_card.activity.BankCardListActivity"
@@ -763,78 +650,58 @@
             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"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".community.publish.view.PublishActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustNothing" />
-        <activity
-            android:name=".community.dynamic.view.DynamicDetailActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".community.photo.PreviewPhotoActivity"
+            android:name=".photo.PreviewPhotoActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".community.photo.BigPhotoActivity"
+            android:name=".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"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".pay.activity.GiveGoldActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".pay.activity.GiveGoldDetailActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".pay.activity.GiveGoldToUserActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".pay.activity.GiveGoldSearchActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".ui.setting.PrivacySettingActivity"
             android:screenOrientation="portrait" /> <!-- 银行卡列表 -->
         <activity
             android:name=".ui.setting.NoticeSettingActivity"
             android:screenOrientation="portrait" /> <!-- 解除绑定银行卡 -->
-        <activity
-            android:name=".ui.login.LoginActivity"
-            android:label="@string/main_androidmanifest_031"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" /> <!-- 绑定银行卡 -->
         <activity
             android:name=".ui.webview.DialogWebViewActivity"
             android:theme="@style/dialog_web_view_activity"
-            android:windowSoftInputMode="adjustPan" /> <!-- 隐私政策 -->
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.webview.baishun.BaiShunGameWebActivity"
+            android:theme="@style/dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.webview.room_banner.RoomWebDialogActivity"
+            android:theme="@style/room_dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan" />
+        <!-- 隐私政策 -->
         <activity
             android:name=".ui.webview.DatingRuleWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
+        <activity
+            android:name=".ui.webview.room_banner.RoomBannerWebDialogActivity"
+            android:theme="@style/dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan"  />
         <activity
             android:name=".ui.webview.TarotPayWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
         <activity
             android:name=".ui.login.LoginPasswordActivity"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" /> <!-- 社区 -->
         <activity
             android:name=".ui.setting.ResetPasswordActivity"
@@ -862,9 +729,6 @@
             android:name=".avroom.singleroompk.SingleRoomPKSearchActivity"
             android:theme="@style/dialog_web_view_activity"
             android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".avroom.firstcharge.FirstChargeDialog"
-            android:theme="@style/dialogactivity" />
         <activity
             android:name=".ui.setting.GrantedPermissionsActivity"
             android:screenOrientation="portrait" />
@@ -872,8 +736,8 @@
             android:name=".ui.setting.PermissionGuideActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".vip.VipMainActivity"
-            android:screenOrientation="portrait" /> <!-- 隐私设置 -->
+            android:name=".vip.VipCenterActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".vip.VipSettingActivity"
             android:screenOrientation="portrait" /> <!-- 通知提醒设置 -->
@@ -904,21 +768,6 @@
         <activity
             android:name=".relation.cp.activity.CpInviteRecordActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".fansteam.FansTeamJoinActivity"
-            android:theme="@style/dialog_web_view_activity" />
-        <activity
-            android:name=".fansteam.FansTeamJoinedActivity"
-            android:theme="@style/dialog_web_view_activity" />
-        <activity
-            android:name=".fansteam.FansTeamListActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".shipantics.PullRadishActivity"
-            android:theme="@style/dialog_web_view_activity" />
-        <activity
-            android:name=".shipantics.RadishRankingActivity"
-            android:theme="@style/room_message_activity" />
         <activity
             android:name=".AgentActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
@@ -938,11 +787,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=".earn.activity.EarnWithdrawActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
-            android:exported="false"
-            android:screenOrientation="portrait" /> <!-- com.yizhuan.xchat_android_core.skill -->
         <activity
             android:name=".earn.activity.BindWithdrawMsgActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
@@ -958,11 +802,6 @@
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.login.LoginBoundAuthCodeActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.setting.ShieldManageActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
@@ -978,15 +817,6 @@
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.user.activity.EditUserLabelActivity"
-            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"
@@ -1016,9 +846,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"
@@ -1050,21 +880,86 @@
 
         <service
             android:name="com.netease.nimlib.service.NimService"
+            android:foregroundServiceType="remoteMessaging"
             android:process=":core" />
         <service
             android:name="com.netease.nimlib.service.NimService$Aux"
+            android:foregroundServiceType="remoteMessaging"
             android:process=":core" />
         <service
             android:name="com.netease.nimlib.job.NIMJobService"
+            android:foregroundServiceType="remoteMessaging"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:process=":core" />
-        <service android:name="com.netease.nimlib.service.ResponseService" />
+        <service android:name="com.netease.nimlib.service.ResponseService"
+            android:foregroundServiceType="remoteMessaging"/>
         <service
             android:name=".service.DaemonService"
+            android:foregroundServiceType="mediaPlayback"
             android:enabled="true" />
 
         <activity android:name=".avroom.room_album.RoomAlbumActivity" />
 
+        <activity android:name=".ui.language.LanguageActivity" />
+
+        <activity android:name=".public_chat.ui.message.PublicChatRoomMessageActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+
+        <activity
+            android:name=".fansteam.FansTeamJoinActivity"
+            android:theme="@style/dialog_web_view_activity" />
+        <activity
+            android:name=".fansteam.FansTeamJoinedActivity"
+            android:theme="@style/dialog_web_view_activity" />
+        <activity
+            android:name=".fansteam.FansTeamListActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".decoration.view.DecorationStoreActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".pay.activity.GiveGoldActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".pay.activity.GiveGoldDetailActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".pay.activity.GiveGoldToUserActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".pay.activity.GiveGoldSearchActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".game.ui.game.GameActivity"
+            android:hardwareAccelerated="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".community.dynamic.view.DynamicDetailActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".community.publish.view.PublishActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustNothing" />
+        <activity
+            android:windowSoftInputMode="adjustPan"
+            android:name=".ui.feedback.FeedbackActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".ui.debug.DebugActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".ui.game_team.record.GameTeamRecordActivity"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

app/src/main/assets/hot_region.json

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

app/src/main/assets/supplierconfig.json

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

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

@@ -0,0 +1,941 @@
+package com.chwl.app;
+
+import static com.chwl.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
+
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.LinearInterpolator;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.chwl.app.base.GlobalViewModelOwner;
+import com.chwl.app.common.widget.dialog.DialogManager;
+import com.chwl.app.community.square.SquareFragment;
+import com.chwl.app.game.core.GameStateAbility;
+import com.chwl.app.game.data.GameModel2;
+import com.chwl.app.game.ui.game.GameActivity;
+import com.chwl.app.game.ui.game.GameIntent;
+import com.chwl.app.game.ui.home.GameHomeFragment;
+import com.chwl.app.star.StarFragment;
+import com.chwl.app.support.PreloadResourceViewModel;
+import com.chwl.app.ui.login.LoginPasswordActivity;
+import com.chwl.core.home.bean.MainTabInfo;
+import com.chwl.core.settings.SettingsModel;
+import com.chwl.library.utils.JavaUtil;
+import com.netease.nim.uikit.StatusBarUtil;
+import com.netease.nim.uikit.common.util.log.LogUtil;
+import com.netease.nim.uikit.common.util.string.StringUtil;
+import com.netease.nimlib.sdk.NIMClient;
+import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent;
+import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
+import com.netease.nimlib.sdk.msg.model.RecentContact;
+import com.netease.nimlib.sdk.team.TeamService;
+import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum;
+import com.netease.nimlib.sdk.team.model.Team;
+import com.orhanobut.logger.Logger;
+import com.trello.rxlifecycle3.android.ActivityEvent;
+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.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.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.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.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.ResUtil;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@CreatePresenter(MainPresenter.class)
+public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
+        implements MainTabLayout.OnTabClickListener, IMainView, View.OnClickListener {
+
+    public static final String MSG_TAB = "msgTab";
+    private static final String TAG = "MainActivity";
+    private static final String EXTRA_APP_QUIT = "APP_QUIT";
+    private final SparseArray<Fragment> fragmentArray = new SparseArray<>();
+    private View avatarLayout;
+    private CircleImageView avatarImage;
+    private LivingIconView userLivingView;
+    private MainTabLayout mMainTabLayout;
+    private AnchorCardView anchorCardView;
+    private View viewClose;
+    private int mCurrentTabType = MainTabType.TAB_TYPE_HOME;
+    /**
+     * 房间最小化动画，换成属性动画，原先的补间动画影响了activity的生命周期
+     */
+    private ObjectAnimator roomMinAnim;
+    /**
+     * 管理限制进房
+     */
+    private LimitEnterRoomHelper limitEnterRoomHelper;
+    private HomeViewModel homeViewModel;
+    private boolean mResumed = false;
+    @Nullable
+    private Fragment tempFragment = null;
+    private DialogManager resumeGameDialogManager;
+
+    @Nullable
+    private Runnable touchRunnable;
+
+    {
+        fragmentArray.put(MainTabType.TAB_TYPE_HOME, new HomeFragment());
+        fragmentArray.put(MainTabType.TAB_TYPE_GAME, new GameHomeFragment());
+        fragmentArray.put(MainTabType.TAB_TYPE_SQUARE, new SquareFragment());
+        fragmentArray.put(MainTabType.TAB_TYPE_MSG, new ContactsListFragment());
+        fragmentArray.put(MainTabType.TAB_TYPE_ME, new MeFragment());
+    }
+
+    public static void start(Context context) {
+        start(context, null);
+    }
+
+    public static void start(Context context, Intent extras) {
+        Intent intent = new Intent();
+        intent.setClass(context, MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        if (extras != null) {
+            intent.putExtras(extras);
+        }
+        context.startActivity(intent);
+    }
+
+    /**
+     * @return true 如果处理了跳转
+     */
+    public static boolean handleLinkedJump(Context context) {
+        LinkedInfo linkedInfo = LinkedModel.get().getLinkedInfo();
+        LinkedModel.get().setLinkedInfo(null);
+
+        if (linkedInfo == null || linkedInfo.getType() == null || linkedInfo.getType().equals("null")) {
+            return false;
+        }
+        LogUtil.print(ResUtil.getString(R.string.yizhuan_erban_mainactivity_01));
+        // 跳转
+        if (!StringUtil.isEmpty(linkedInfo.getRoomUid()) && linkedInfo.getType().equals("2")) {
+            AVRoomActivity.start(context, Long.parseLong(linkedInfo.getRoomUid()));
+        } else if (!TextUtils.isEmpty(linkedInfo.getUrl()) && linkedInfo.getType().equals("3")) {
+            CommonWebViewActivity.start(context, UriProvider.getLinkUrl(linkedInfo.getUrl()));
+        } else if (linkedInfo.getType().equals("7") && !TextUtils.isEmpty(linkedInfo.getUid())) {
+            NimP2PMessageActivity.start(context, linkedInfo.getUid());
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(Constants.KEY_MAIN_POSITION, mCurrentTabType);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(@NotNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        mCurrentTabType = savedInstanceState.getInt(Constants.KEY_MAIN_POSITION);
+    }
+
+    @SuppressLint("CheckResult")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ViewModelProvider viewModelProvider = new ViewModelProvider(this);
+        homeViewModel = viewModelProvider.get(HomeViewModel.class);
+        NimMiddleActivity.firstEnter = false;
+        if (savedInstanceState != null) {
+            mCurrentTabType = savedInstanceState.getInt(Constants.KEY_MAIN_POSITION);
+        }
+        setContentView(R.layout.activity_main);
+        //自动登录
+        AuthModel.get().autoLogin()
+                .doOnError(throwable -> onNeedLogin())
+                .subscribe();
+        initView();
+        List<MainTabInfo> mainTabInfo = InitialModel.get().getMainTabInfosLiveData().getValue();
+        if (mainTabInfo != null) {
+            mMainTabLayout.setMainTabInfoList(mainTabInfo);
+        }
+        initMaterialView();
+        onParseIntent();
+        updateDatas();
+        updateRoomState();
+        ImInitHelper.get().init();
+        EventBus.getDefault().register(this);
+        otherModelInit();
+
+        homeViewModel.getAnchorInfoLiveData().observe(this, anchorInfo -> {
+            if (anchorInfo != null) {
+                anchorCardView.setAnchorInfo(anchorInfo);
+                DemoCache.saveAnchorCardView(2);
+            }
+        });
+        checkResumeGame();
+    }
+
+    private void otherModelInit() {
+        PwdCodeMgr.get().onCreateInit();
+        //初始化线程池
+        ThreadPoolManager.instance().init();
+        IMBroadcastManager.get().onCreate();
+        ImageLoadUtilsV2.init(context);
+        SettingsModel.get().checkSysAccount();
+        initPreloadResource();
+    }
+
+    @SuppressLint("CheckResult")
+    private void checkResumeGame() {
+        GameModel2.INSTANCE.getResumeGameRoomInfo().compose(bindToLifecycle()).subscribe(gameRoomInfo -> {
+            if (gameRoomInfo != null && gameRoomInfo.getData() != null) {
+                Integer state = gameRoomInfo.getData().getMatchStatus();
+                if (state != null && (state == GameStateAbility.STATE_MATCH_SUCCESS || state == GameStateAbility.STATE_MATCHING)) {
+                    if (resumeGameDialogManager == null) {
+                        resumeGameDialogManager = new DialogManager(this);
+                    }
+                    resumeGameDialogManager.showOkCancelDialog(getString(R.string.resume_game_tips), getString(R.string.join_organization_ok), getString(R.string.join_organization_no), false, new DialogManager.OkCancelDialogListener() {
+                        @Override
+                        public void onOk() {
+                            long gameId = JavaUtil.str2long(gameRoomInfo.getData().getMgId());
+                            int gameMode = 0;
+                            GameActivity.Companion.start(context, new GameIntent(gameId, gameMode));
+                        }
+
+                        @Override
+                        public void onCancel() {
+                            DialogManager.OkCancelDialogListener.super.onCancel();
+                            Long roomId = gameRoomInfo.getRoomId();
+                            if (roomId != null) {
+                                GameModel2.INSTANCE.closeGameRx(roomId).compose(bindToLifecycle()).subscribe(s -> {
+                                }, throwable -> {
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+        }, throwable -> {
+        });
+    }
+
+    private void initPreloadResource() {
+        PreloadResourceViewModel viewModel = new ViewModelProvider(
+                GlobalViewModelOwner.Companion.getInstance()
+        ).get(PreloadResourceViewModel.class);
+        viewModel.start();
+    }
+
+    @Override
+    protected void onReceiveChatRoomEvent(RoomEvent roomEvent) {
+        super.onReceiveChatRoomEvent(roomEvent);
+        if (roomEvent == null || roomEvent.getEvent() == RoomEvent.NONE) return;
+        int event = roomEvent.getEvent();
+        if (event == RoomEvent.ENTER_ROOM) {
+            onEnter(AvRoomDataManager.get().mCurrentRoomInfo);
+        } else if (event == RoomEvent.KICK_OUT_ROOM) {
+
+            ChatRoomKickOutEvent reason = roomEvent.getReason();
+            if (reason == null) return;
+            //加入黑名单，踢出房间回调
+            ChatRoomKickOutEvent.ChatRoomKickOutReason reasonReason = reason.getReason();
+            if (reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.BE_BLACKLISTED
+                    || reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.KICK_OUT_BY_MANAGER
+                    || reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.KICK_OUT_BY_CONFLICT_LOGIN
+                    || reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.CHAT_ROOM_INVALID) {
+                exitRoom(AvRoomDataManager.get().mCurrentRoomInfo);
+            }
+        } else if (event == RoomEvent.ROOM_EXIT) {
+            exitRoom(roomEvent.getRoomInfo());
+        } else if (event == RoomEvent.ROOM_CHAT_RECONNECTION) {
+            updateRoomState();
+        } else if (event == RoomEvent.MY_SELF_KICK_OUT_ROOM_BY_S_ADMIN) {
+            AvRoomDataManager.get().addCurrentRoomLimitEnter();
+            toast(R.string.kick_out_room_by_s_admin);
+            getMvpPresenter().exitRoom();
+        }
+    }
+
+    private void closeOpenRoomAnimation() {
+        stopRoomMinAnim();
+        avatarLayout.setVisibility(View.GONE);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mResumed = true;
+        if (avatarLayout.getVisibility() == View.VISIBLE) {
+            userLivingView.start();
+        }
+        //这里是为了处理APP后台运行的情况下点击分享房间等LinkedMe链接的情况
+        UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
+        if (userInfo != null) {
+            handleLinkedJump(this);
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mResumed = false;
+        if (avatarLayout.getVisibility() == View.VISIBLE) {
+            userLivingView.stop();
+        }
+        mMainTabLayout.removeCallbacks(touchRunnable);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (touchRunnable == null) return super.onTouchEvent(event);
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                mMainTabLayout.removeCallbacks(touchRunnable);
+                break;
+            case MotionEvent.ACTION_UP:
+                mMainTabLayout.postDelayed(touchRunnable, 5000);
+                break;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    private void initView() {
+        mMainTabLayout = findViewById(R.id.main_tab_layout);
+        avatarLayout = findViewById(R.id.avatar_image_layout);
+        viewClose = findViewById(R.id.view_close);
+        avatarImage = findViewById(R.id.avatar_image);
+        userLivingView = findViewById(R.id.liv_user);
+        userLivingView.setColor(Color.WHITE);
+        mMainTabLayout.setOnTabClickListener(this);
+        anchorCardView = findViewById(R.id.vs_anchor_card);
+        mMainTabLayout.setDefaultTabType(mCurrentTabType);
+    }
+
+    private void updateDatas() {
+        handleNimIntent();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        //这里退出登录，实际上mainActivity是没有销毁的，当从linkme 调起来时候这里需要检查一下登录状态。
+        if (TextUtils.isEmpty(AuthModel.get().getTicket())) {
+            onNeedLogin();
+            return;
+        }
+        onParseIntent();
+        handleNimIntent();
+        InitialModel.get().regionCheck();
+    }
+
+    private void onParseIntent() {
+        Intent intent = getIntent();
+        if (intent.hasExtra(EXTRA_APP_QUIT)) {
+            onLogout();
+        } else if (intent.hasExtra(Extras.EXTRA_JUMP_P2P)) {
+            Intent data = intent.getParcelableExtra(Extras.EXTRA_DATA);
+            String account = data.getStringExtra(Extras.EXTRA_ACCOUNT);
+            if (!TextUtils.isEmpty(account)) {
+                NimP2PMessageActivity.start(this, account);
+            }
+        } else if (intent.hasExtra(MSG_TAB) && intent.getBooleanExtra(MSG_TAB, false)) {
+            if (mMainTabLayout != null) {
+                mMainTabLayout.setDefaultTabType(MainTabType.TAB_TYPE_MSG);
+            }
+        }
+    }
+
+    private void initMaterialView() {
+        avatarLayout.setVisibility(View.GONE);
+        avatarImage.setOnClickListener(this);
+        viewClose.setOnClickListener(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        CleanLeakUtils.fixInputMethodManagerLeak(MainActivity.this);
+        super.onDestroy();
+        if (resumeGameDialogManager != null) {
+            resumeGameDialogManager.dismissDialog();
+        }
+        ImInitHelper.get().unInit();
+        EventBus.getDefault().unregister(this);
+        stopRoomMinAnim();
+        if (limitEnterRoomHelper != null) {
+            limitEnterRoomHelper.release();
+        }
+        IMBroadcastManager.get().onDestroy();
+    }
+
+    /**
+     * 双击返回键退出
+     */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+
+            /**
+             * 防止华为机型未加入白名单时按返回键回到桌面再锁屏后几秒钟进程被杀
+             */
+            try {
+                Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
+                launcherIntent.addCategory(Intent.CATEGORY_HOME);
+                startActivity(launcherIntent);
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+
+            try {
+                moveTaskToBack(false);
+            } catch (Exception e) {
+                return super.onKeyDown(keyCode, event);
+            }
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public void onBackPressed() {
+        try {
+            moveTaskToBack(false);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLoginEvent(LoginEvent event) {
+        onLogin(AuthModel.get().getCurrentUid());
+    }
+
+    /**
+     * 检查是否绑定手机
+     */
+    private void checkBindPhone() {
+        BindPhoneActivity.start(context);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLogoutEvent(LogoutEvent event) {
+        PwdCodeMgr.get().onLogout();
+        onLogout();
+    }
+
+    @SuppressLint("CheckResult")
+    public void onLogin(long uid) {
+        Logger.e(TAG, "onLogin Success ~~~~");
+
+        Log.i("checkLostUser", "onLogin");
+
+        int unreadCount = IMMessageManager.get().queryUnreadMsg();
+        mMainTabLayout.setMsgNum(unreadCount);
+        openCommunityNotice();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLoadLoginUserInfoEvent(LoadLoginUserInfoEvent event) {
+        firstLoadedUserInfo();
+        InitialModel.get().regionCheck();
+    }
+
+    public void onLogout() {
+        Logger.e(TAG, "onLogout Success ~~~~");
+        getMvpPresenter().exitRoom();
+        LoginPasswordActivity.start(MainActivity.this);
+        PmDialogShowMrg.get().onLogout();
+        finish();
+    }
+
+    public void onNeedLogin() {
+        NimMiddleActivity.openCommunity = false;
+        LoginPasswordActivity.start(MainActivity.this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onKickedOutEvent(KickOutEvent event) {
+        toast(getString(R.string.you_have_been_kicked_offline));
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onReceiveRecentContactChanged(List<RecentContact> imMessages) {
+
+        int countIgnore = 0;
+        for (RecentContact recentContact : imMessages) {
+
+            if (recentContact.getSessionType() == SessionTypeEnum.Team) {
+                Team team = NIMClient.getService(TeamService.class).queryTeamBlock(recentContact.getContactId());
+                if (team != null && team.getMessageNotifyType() == TeamMessageNotifyTypeEnum.Mute) {
+                    countIgnore += recentContact.getUnreadCount();
+                }
+
+            }
+
+        }
+        int unreadCount = IMMessageManager.get().queryUnreadMsg() + countIgnore;
+        mMainTabLayout.setMsgNum(unreadCount);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onNeedCompleteInfo(NeedCompleteInfoEvent event) {
+        getDialogManager().dismissDialog();
+        UIHelper.showAddInfoAct(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLoginUserInfoUpdateEvent(LoginUserInfoUpdateEvent event) {
+        int unreadCount = IMMessageManager.get().queryUnreadMsg();
+        mMainTabLayout.setMsgNum(unreadCount);
+    }
+
+    @SuppressLint("CheckResult")
+    private void updateRoomState() {
+        RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
+        if (roomInfo != null) {
+            displayAvatarLayout(roomInfo.getAvatar(), roomInfo.getTitle(), roomInfo.getUid());
+        }
+    }
+
+    private void startRoomMinAnim() {
+        roomMinAnim = ObjectAnimator.ofFloat(avatarImage, "rotation", 0f, 360f);
+        roomMinAnim.setDuration(10000);
+        roomMinAnim.setRepeatCount(-1);
+        roomMinAnim.setInterpolator(new LinearInterpolator());
+        roomMinAnim.start();
+    }
+
+    private void stopRoomMinAnim() {
+        if (roomMinAnim != null) {
+            roomMinAnim.cancel();
+            roomMinAnim = null;
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void displayAvatarLayout(String avatar, String nickName, long uid) {
+        RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
+        if (roomInfo != null) {
+            avatarLayout.clearAnimation();
+            avatarLayout.setVisibility(View.VISIBLE);
+            userLivingView.start();
+            stopRoomMinAnim();
+            startRoomMinAnim();
+            ImageLoadUtils.loadAvatar(MainActivity.this, avatar, avatarImage);
+        }
+    }
+
+    public void onEnter(RoomInfo roomInfo) {
+        updateRoomState();
+        DaemonService.start(this, roomInfo);
+    }
+
+    @SuppressLint("RestrictedApi")
+    @Override
+    public void onTabClick(int tabType) {
+
+        Fragment showFragment = fragmentArray.get(tabType);
+        if (showFragment == tempFragment) return;
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        if (!showFragment.isAdded()) {
+            transaction.add(R.id.main_fragment, showFragment, null);
+        }
+        transaction.show(showFragment);
+        if (tempFragment != null) {
+            transaction.hide(tempFragment);
+        }
+        tempFragment = showFragment;
+        if (!isDestroyed()) {
+            transaction.commitNowAllowingStateLoss();
+        }
+        mCurrentTabType = tabType;
+
+        //每次点击我的都更新当前用户信息
+        if (mCurrentTabType == MainTabType.TAB_TYPE_ME) {
+            UserModel.get().updateCurrentUserInfo().subscribe();
+        }
+
+        switch (tabType) {
+            case MainTabType.TAB_TYPE_HOME:
+                reportTabClick(IReportConstants.ELEVEN);
+                break;
+            case MainTabType.TAB_TYPE_MSG:
+                reportTabClick(IReportConstants.THIRTEEN);
+                break;
+            case MainTabType.TAB_TYPE_ME:
+                reportTabClick(IReportConstants.FOURTEEN);
+                break;
+        }
+    }
+
+    /**
+     * 导航栏tab板块点击
+     *
+     * @param type
+     */
+    private void reportTabClick(int type) {
+        //登录页展示时
+        HashMap<String, Object> map = new HashMap<>(3);
+        map.put(IReportConstants.HOMEPAGE_TYPE, type);
+        map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE);
+        ReportManager.get().reportEvent(IReportConstants.MODULE_HOMEPAGE_CLICK, map);
+    }
+
+    @Override
+    public void exitRoom(RoomInfo roomInfo) {
+        closeOpenRoomAnimation();
+        DaemonService.stop(MainActivity.this);
+    }
+
+    /**
+     * 第一次加载到用户信息
+     */
+    @SuppressLint("CheckResult")
+    private void firstLoadedUserInfo() {
+        //青少年弹窗处理
+        PmDialogShowMrg.get().handle(new WeakReference<>(this));
+
+        handleChannelPageInfo();
+
+        checkProtocolUpdate();
+
+        // 互动消息未读数量
+        HomeModel.INSTANCE.getUnreadCount(AuthModel.get().getCurrentUid())
+                .compose(bindUntilEvent(ActivityEvent.DESTROY))
+                .subscribe((integer, throwable) -> {
+                    if (integer != null) {
+                        EventBus.getDefault().post(new UnReadCountEvent(integer));
+                    }
+                });
+//        checkShowAnchorCardView();
+    }
+
+    @SuppressLint("CheckResult")
+    private void checkProtocolUpdate() {
+        UserModel.get()
+                .getProtocolInfo()
+                .compose(bindUntilEvent(ActivityEvent.DESTROY))
+                .subscribe(protocolInfo -> {
+                    float version = (float) SharedPreferenceUtils.get(ProtocolUpdateDialog.SP_KEY, 0f);
+                    //第一次打开APP不弹,因为闪屏页已经弹了!
+                    if (version == 0f) {
+                        SharedPreferenceUtils.put(ProtocolUpdateDialog.SP_KEY, protocolInfo.getVer());
+                    } else if (version < protocolInfo.getVer()) {
+                        new ProtocolUpdateDialog(MainActivity.this, protocolInfo).show();
+                    }
+                });
+    }
+
+    /**
+     * 跳转优先级  闪屏→linkedMe→邀请码→新用户打招呼引导→渠道指定房间
+     */
+    @SuppressLint("CheckResult")
+    private void handleChannelPageInfo() {
+
+        if (handleSplashJump()) return;
+        if (handleLinkedJump(this)) return;
+
+        //渠道落地页和邀请码跳转只需要完善资料后处理一次
+        String spKey = KEY_FLAG_VALID_CHANNEL_PAGE + AuthModel.get().getCurrentUid();
+        if ((boolean) SharedPreferenceUtils.get(spKey, true)) {
+            SharedPreferenceUtils.put(spKey, false);
+            checkInviteUserInRoom();
+        }
+    }
+
+    /**
+     * 检查邀请码跳转
+     */
+    @SuppressLint("CheckResult")
+    private void checkInviteUserInRoom() {
+        if (!TextUtils.isEmpty(AddUserInfoFragment.INVITE_USER_CODE)) {
+            ChannelPageModel.get().checkInviteUserInRoom(AddUserInfoFragment.INVITE_USER_CODE)
+                    .subscribe(inviteUserInfo -> {
+                        if (inviteUserInfo.isInRoom()) {
+                            if (inviteUserInfo.getFromType() == 0) {
+                                AVRoomActivity.start(context, inviteUserInfo.getRoomUid());
+                            } else {
+                                AVRoomActivity.startForFromType(context,
+                                        inviteUserInfo.getRoomUid(),
+                                        inviteUserInfo.getFromType(),
+                                        inviteUserInfo.getInviteNick(),
+                                        String.valueOf(inviteUserInfo.getInviteUid()));
+                            }
+                        } else {
+                            checkNewUserInRoom();
+                        }
+                    }, throwable -> checkNewUserInRoom());
+            AddUserInfoFragment.INVITE_USER_CODE = "";
+        } else {
+            checkNewUserInRoom();
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    private void checkNewUserInRoom() {
+        ChannelPageModel.get().checkNewUserInRoom()
+                .subscribe(newUserHelloInfo -> {
+                    if (newUserHelloInfo.getSayHello()) {
+                        NewUserHelloDialog.Companion.newInstance(newUserHelloInfo).show(context);
+                    } else {
+                        checkChannelPageInRoom();
+                    }
+                }, throwable -> checkChannelPageInRoom());
+    }
+
+    /**
+     * 处理渠道落地页
+     */
+    @SuppressLint("CheckResult")
+    private void checkChannelPageInRoom() {
+        GameHomeModel.get().getRoomShortcut()
+                .compose(bindUntilEvent(ActivityEvent.DESTROY))
+                .subscribe(uid -> {
+                            if (StringFormatUtils.toLong(uid) != 0) {
+                                AVRoomActivity.start(context, StringFormatUtils.toLong(uid));
+                            }
+                        },
+                        Throwable::printStackTrace);
+    }
+
+    /**
+     * @return true 如果处理了跳转
+     */
+    private boolean handleSplashJump() {
+        if (getIntent().hasExtra("url") && getIntent().hasExtra("type")) {
+            LogUtil.print(getString(R.string.clicked_the_splash_screen));
+            //如果没有渠道页，就按原来的逻辑即可
+            int type = getIntent().getIntExtra("type", 0);
+            String url = getIntent().getStringExtra("url");
+            if (type == 3) {
+                Intent intent = new Intent(context, CommonWebViewActivity.class);
+                intent.putExtra("url", url);
+                startActivity(intent);
+            } else if (type == 2) {
+                AVRoomActivity.start(context, Long.parseLong(url));
+            } else {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public LimitEnterRoomHelper getLimitEnterRoomHelper() {
+        if (limitEnterRoomHelper == null) {
+            limitEnterRoomHelper = new LimitEnterRoomHelper();
+        }
+        return limitEnterRoomHelper;
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onImPushMsgPmLimitTimeEvent(ImPushMsgPmLimitTimeEvent event) {
+        //先判断Avroom存不存在，存在的话则不处理，avroom会处理
+        Activity reference = App.gStack.getAvRoomActivity();
+        if (reference != null) {
+            return;
+        }
+        getLimitEnterRoomHelper().handleThisContext(this, event.getData(), true, this::handlePmExitRoom);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onPmDismissAllLimitDialogEvent(PmDismissAllLimitDialogEvent event) {
+        if (limitEnterRoomHelper != null) {
+            limitEnterRoomHelper.dismissDialog();
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void SquarePublish(SquareTaskEvent event) {
+    }
+
+    private void handlePmExitRoom() {
+        if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
+            closeOpenRoomAnimation();
+            getMvpPresenter().exitRoom();
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onCloseMinRoomEvent(CloseMinRoomEvent event) {
+        //如果房间存在，就关闭
+        if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
+            handlePmExitRoom();
+        }
+    }
+
+    /**
+     * 处理开房限制时长
+     */
+    public void handleOpenRoomWhenPmLimit(String error) {
+        getLimitEnterRoomHelper().handleThisContext(this, error, false, this::handlePmExitRoom);
+    }
+
+    /**
+     * 云信通知栏跳转的处理
+     */
+    private void handleNimIntent() {
+        openCommunityNotice();
+
+        Intent intent = getIntent();
+        if (intent == null) {
+            return;
+        }
+        boolean isNimPush = intent.getBooleanExtra(NimMiddleActivity.EXTRA_IS_NIM_PUSH, false);
+        if (isNimPush && mMainTabLayout != null) {
+            mMainTabLayout.setDefaultTabType(MainTabType.TAB_TYPE_MSG);
+        }
+    }
+
+    /**
+     * 点击互动通知通知栏,重启进程打开互动通知页
+     */
+    private void openCommunityNotice() {
+        if (NimMiddleActivity.delayOpenCommunity) {
+            return;
+        }
+        if (NimMiddleActivity.openCommunity) {
+            NimMiddleActivity.openCommunity = false;
+            if (NimMiddleActivity.skipType == 0) return;
+            new Handler().postDelayed(() -> {
+                if (NimMiddleActivity.skipType == PushMessageHandler.PAYLOAD_SKIPTYPE_INVITE_FANS &&
+                        NimMiddleActivity.payloadUid > 0) {
+                    AVRoomActivity.start(MainActivity.this, NimMiddleActivity.payloadUid);
+                } else if (NimMiddleActivity.skipType == PushMessageHandler.PAYLOAD_SKIPTYPE_PRIVATE_MSG &&
+                        NimMiddleActivity.payloadUid > 0) {
+                    NimP2PMessageActivity.start(MainActivity.this, NimMiddleActivity.payloadUid + "");
+                } else if (NimMiddleActivity.skipType == PushMessageHandler.PAYLOAD_SKIPTYPE_H5 &&
+                        !TextUtils.isEmpty(NimMiddleActivity.payloadUrl)) {
+                    CommonWebViewActivity.start(MainActivity.this, NimMiddleActivity.payloadUrl);
+                }
+            }, 2000);
+        }
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onNeedBindPhoneEvent(NeedBindPhoneEvent event) {
+//        checkBindPhone();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    public void onVisitorUnreadCountEvent(VisitorUnreadCountEvent event) {
+        if (mMainTabLayout != null) {
+            mMainTabLayout.setUnreadVisitorCount(event.getVisitNum());
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.avatar_image:
+                RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
+                if (roomInfo != null) {
+                    AVRoomActivity.start(MainActivity.this, roomInfo.getUid());
+                } else {
+                    toast(getString(R.string.room_information_is_empty));
+                }
+
+                break;
+            case R.id.view_close:
+                MainActivity.this.getMvpPresenter().exitRoom();
+                break;
+        }
+    }
+
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
+    }
+
+    @Override
+    protected void setStatusBar() {
+        super.setStatusBar();
+        StatusBarUtil.transparencyBar(this);
+        StatusBarUtil.StatusBarLightMode(this);
+    }
+
+}

app/src/main/java/com/chwl/app/MainTabContentView.kt

@@ -0,0 +1,4 @@
+package com.chwl.app
+
+interface MainTabContentView {
+}

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,18 @@ 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.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;
@@ -106,11 +105,6 @@ public class NimMiddleActivity extends BaseActivity {
                         if (noticeAttachment.getUid() > 0) {
                             AVRoomActivity.start(this, noticeAttachment.getUid());
                         }
-                    } else if (attachment instanceof OpenSignInAttachment) {
-                        if (AuthModel.get().isImLogin()
-                                && !UIUtils.isTopActivity(this, SignInActivity.class.getSimpleName())) {
-                            SignInActivity.start(this);
-                        }
                     } else if (attachment.getFirst() == CustomAttachment.CUSTOM_MSG_RED_PACKAGE) {
                         if (attachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND) {
                             RedPackageAttachment redPackageAttachment = (RedPackageAttachment) attachment;

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

@@ -1,22 +1,21 @@
-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.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,12 +107,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);
-    }
-
-    public static void showLabelInfoAct(Activity mActivity, int requestCode) {
-        Intent intent = new Intent(mActivity, EditUserLabelActivity.class);
-        mActivity.startActivityForResult(intent, requestCode);
+                "/molistar/modules/monster/index.html?monsterId=" + monsterId);
     }
 
     /**
@@ -132,11 +126,11 @@ public class UIHelper {
      */
     public static void showRecommendPosH5(Context context) {
         String cardUrl = UriProvider.JAVA_WEB_URL +
-                "/anan_vestBag/modules/recommend-card/index.html";
+                "/molistar/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 + "/molistar/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

@@ -0,0 +1,575 @@
+package com.chwl.app.application;
+
+import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.net.http.HttpResponseCache;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.core.util.Supplier;
+import androidx.multidex.MultiDex;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.bumptech.glide.request.target.ViewTarget;
+import com.chwl.app.support.IMUserInfoProvider;
+import com.chwl.library.language.LanguageHelper;
+import com.coorchice.library.utils.LogUtils;
+import com.example.lib_utils.ServiceTime;
+import com.hjq.toast.ToastUtils;
+import com.liulishuo.filedownloader.FileDownloader;
+import com.netease.nim.uikit.api.NimUIKit;
+import com.netease.nim.uikit.common.util.log.LogUtil;
+import com.netease.nimlib.sdk.NIMClient;
+import com.netease.nimlib.sdk.NotificationFoldStyle;
+import com.netease.nimlib.sdk.SDKOptions;
+import com.netease.nimlib.sdk.StatusBarNotificationConfig;
+import com.netease.nimlib.sdk.mixpush.MixPushConfig;
+import com.netease.nimlib.sdk.mixpush.NIMPushClient;
+import com.netease.nimlib.sdk.msg.MessageNotifierCustomization;
+import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
+import com.netease.nimlib.sdk.msg.model.IMMessage;
+import com.netease.nimlib.sdk.util.NIMUtil;
+import com.opensource.svgaplayer.SVGAParser;
+import com.orhanobut.logger.AndroidLogAdapter;
+import com.orhanobut.logger.Logger;
+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.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.pay.PayModel;
+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.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;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import io.reactivex.plugins.RxJavaPlugins;
+import io.realm.Realm;
+import io.realm.RealmConfiguration;
+
+/**
+ * @author chenran
+ * @date 2017/2/11
+ */
+
+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) {
+            if (message.getMsgType() == MsgTypeEnum.custom) {
+                CustomAttachment customAttachment = (CustomAttachment) message.getAttachment();
+                if (customAttachment.getFirst() == CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI) {
+                    return message.getFromNick();
+                } else if (customAttachment instanceof OpenSignInAttachment) {
+                    return getContentFromOpenSignIn(customAttachment);
+                }
+            }
+            // 采用SDK默认文案
+            return ResUtil.getString(R.string.erban_application_xchatapplication_01);
+        }
+
+        @Override
+        public String makeTicker(String nick, IMMessage message) {
+            if (message.getMsgType() == MsgTypeEnum.custom) {
+                CustomAttachment customAttachment = (CustomAttachment) message.getAttachment();
+                if (customAttachment != null) {
+                    if (customAttachment.getFirst() == CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI) {
+                        return message.getFromNick();
+                    } else if (customAttachment instanceof OpenSignInAttachment) {
+                        return getContentFromOpenSignIn(customAttachment);
+                    }
+                }
+            }
+            // 采用SDK默认文案
+            return ResUtil.getString(R.string.erban_application_xchatapplication_02);
+        }
+
+        private String getContentFromOpenSignIn(CustomAttachment attachment) {
+            String result = null;
+            if (attachment instanceof OpenSignInAttachment) {
+                ImNotice notice = ((OpenSignInAttachment) attachment).getImNotice();
+                if (notice != null) {
+                    result = notice.getContent();
+                }
+            }
+            if (TextUtils.isEmpty(result)) {
+                result = ResUtil.getString(R.string.erban_application_xchatapplication_03);
+            }
+            return result;
+        }
+
+        @Override
+        public String makeRevokeMsgTip(String s, IMMessage imMessage) {
+            return null;
+        }
+
+        @Override
+        public String makeCategory(IMMessage message) {
+            return null;
+        }
+    };
+    private static App instance;
+    //生命周期监听
+    private static AppLifeCycleHelper lifeCycleHelper;
+    public static ActivityStack gStack = new ActivityStack();
+    private static boolean isInitOtherSDK = false;
+
+    //static 代码段可以防止内存泄露
+    static {
+        SmartRefreshLayout.setDefaultRefreshHeaderCreater(
+                (context, layout) -> {
+                    layout.setEnableHeaderTranslationContent(false);
+                    MaterialHeader materialHeader = new MaterialHeader(context);
+                    materialHeader.setShowBezierWave(false);
+                    return materialHeader;
+                });
+        SmartRefreshLayout.setDefaultRefreshFooterCreater(
+                (context, layout) -> new ClassicsFooter(context).setDrawableSize(20));
+    }
+
+    public static App instance() {
+        return instance;
+    }
+
+    public static void initOtherSDK() {
+        if (isInitOtherSDK) return;
+        isInitOtherSDK = true;
+        Context context = BasicConfig.INSTANCE.getAppContext();
+        Application application = (Application) context.getApplicationContext();
+        // 初始化 sp
+        long startTime = System.currentTimeMillis();
+
+        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());
+
+        //logger 配置
+        Logger.addLogAdapter(new AndroidLogAdapter() {
+            @Override
+            public boolean isLoggable(int priority, String tag) {
+                return BuildConfig.DEBUG;
+            }
+        });
+
+        ToastUtils.init(application);
+
+        if (inMainProcess(context)) {
+            DemoCache.saveLaunchCount();
+            // 注册自定义推送消息处理，这个是可选项
+            NIMPushClient.registerMixPushMessageHandler(new PushMessageHandler());
+
+            RxJavaPlugins.setErrorHandler(throwable -> {
+                if (BuildConfig.DEBUG) {
+                    Log.e(TAG, "the subscribe() method default error handler", throwable);
+                }
+            });
+
+            //需要完善资料错误码全局处理
+            GsonConverterPlugins.setResultHandler(result -> {
+                if (result instanceof ServiceResult<?>) {
+                    ServiceResult<?> serviceResult = (ServiceResult<?>) result;
+                    if (serviceResult.getCode() == ServiceResult.CODE_NEED_COMPLETE_USER_INFO) {
+                        SingleToastUtil.showToast(serviceResult.getMessage());
+                        EventBus.getDefault().post(new NeedCompleteInfoEvent());
+                        throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
+                    } else if (serviceResult.getCode() == 401) {
+                        if ((ServiceTime.INSTANCE.getTime() - logoutEventTime) > 800) {
+                            logoutEventTime = ServiceTime.INSTANCE.getTime();
+                            SingleToastUtil.showToast(serviceResult.getMessage());
+                            AuthModel.get().cleanLogInfo();
+                        }
+                        throw new ServerException(serviceResult.getMessage(), serviceResult.getCode());
+                    }
+                }
+                return null;
+            });
+            GsonConverterPlugins.lockdown();
+
+
+            //fixed: Glide Exception:"You must not call setTag() on a view Glide is targeting"
+            ViewTarget.setTagId(R.id.tag_glide);
+
+            init(channel);
+
+            //生命周期监听
+            if (lifeCycleHelper == null) {
+                lifeCycleHelper = new AppLifeCycleHelper();
+            }
+            registerActivityLifecycleCallback(lifeCycleHelper);
+//            initLinkedMe();
+//            MobSDK.init(context);
+//            MobSDK.submitPolicyGrantResult(true);
+        }
+
+        LogUtils.d("init time = " + (System.currentTimeMillis() - startTime) + "ms");
+
+    }
+
+    public static void registerActivityLifecycleCallback(Application.ActivityLifecycleCallbacks callbacks) {
+        ((Application) BasicConfig.INSTANCE.getAppContext().getApplicationContext()).registerActivityLifecycleCallbacks(callbacks);
+    }
+
+//    /**
+//     * 初始化linkedMe
+//     */
+//    private static void initLinkedMe() {
+//        MobSDK.init(instance, "32fd2f8457880", "ef796ca85e8cd95a76929663de133214");
+//        MobLink.setRestoreSceneListener(new RestoreSceneListener() {
+//            @Override
+//            public Class<? extends Activity> willRestoreScene(Scene scene) {
+//                return AgentActivity.class;
+//            }
+//
+//            @Override
+//            public void completeRestore(Scene scene) {
+//            }
+//
+//            @Override
+//            public void notFoundScene(Scene scene) {
+//            }
+//        });
+//    }
+
+
+    private static void initEnv() {
+        //首先初始化环境
+        Env.initEnv(BuildConfig.BUILD_TYPE, BuildConfig.DEBUG);
+        //切换生产坏境和测试环境 true/测试环境 false/生产环境
+        BasicConfig.INSTANCE.setDebuggable(Env.isDebug());
+        BasicConfig.INSTANCE.setRootDir(Constants.ERBAN_DIR_NAME);
+        BasicConfig.INSTANCE.setLogDir(Constants.LOG_DIR);
+        BasicConfig.INSTANCE.setConfigDir(Constants.CONFIG_DIR);
+        BasicConfig.INSTANCE.setVoiceDir(Constants.VOICE_DIR);
+        BasicConfig.INSTANCE.setCacheDir(Constants.CACHE_DIR);
+        BasicConfig.INSTANCE.setImageDir(Constants.IMAGE_CACHE_DIR);
+        com.example.lib_utils.log.LogUtil.INSTANCE.setConsolePrinterEnabled(BuildConfig.DEBUG);
+    }
+
+    /**
+     * 云信配置
+     *
+     * @return
+     */
+    public static SDKOptions options() {
+        SDKOptions options = new SDKOptions();
+        options.disableAwake = true;
+        options.asyncInitSDK = true;
+//        options.customPushContentType = "";
+        if (isDebug()) {
+            options.checkManifestConfig = true;
+        }
+        // 如果将新消息通知提醒托管给 SDK 完成，需要添加以下配置。否则无需设置。
+        StatusBarNotificationConfig config = new StatusBarNotificationConfig();
+        // 点击通知栏跳转到该Activity
+        config.notificationEntrance = NimMiddleActivity.class;
+//        config.notificationSmallIconId = R.drawable.icon_msg_normal;
+        // 呼吸灯配置
+        config.ledARGB = Color.GREEN;
+        config.ledOnMs = 1000;
+        config.ledOffMs = 1500;
+        config.notificationFoldStyle = NotificationFoldStyle.CONTACT;
+        // 通知铃声的uri字符串
+        config.notificationSound = "android.resource://com.netease.nim.demo/raw/msg";
+        options.statusBarNotificationConfig = config;
+        // 定制通知栏提醒文案（可选，如果不定制将采用SDK默认文案）
+        options.messageNotifierCustomization = messageNotifierCustomization;
+
+        options.appKey = Constants.nimAppKey;
+
+        // 配置保存图片，文件，log 等数据的目录
+        // 如果 options 中没有设置这个值，SDK 会使用下面代码示例中的位置作为 SDK 的数据目录。
+        // 该目录目前包含 log, file, image, audio, video, thumb 这6个目录。
+        // 如果第三方 APP 需要缓存清理功能， 清理这个目录下面个子目录的内容即可。
+        String sdkPath = null;
+        try {
+            sdkPath = FileHelper.getRootCacheDir().getAbsolutePath() + "/nim";
+        } catch (ArrayIndexOutOfBoundsException e) {
+
+        }
+        options.sdkStorageRootPath = sdkPath;
+
+        // 配置是否需要预下载附件缩略图，默认为 true
+        options.preloadAttach = true;
+
+        // 配置附件缩略图的尺寸大小。表示向服务器请求缩略图文件的大小
+        // 该值一般应根据屏幕尺寸来确定， 默认值为 Screen.width / 2
+        int widthPixels = BasicConfig.INSTANCE.getAppContext().getResources().getDisplayMetrics().widthPixels;
+        options.thumbnailSize = widthPixels / 2;
+//        // save cache，留做切换账号备用
+        DemoCache.setNotificationConfig(config);
+
+        MixPushConfig mixPushConfig = new MixPushConfig();
+
+
+        options.mixPushConfig = mixPushConfig;
+
+        return options;
+    }
+
+    /**
+     * 判断当前进程是否主进程
+     *
+     * @param context
+     * @return
+     */
+    private static boolean inMainProcess(Context context) {
+        String packageName = context.getPackageName();
+        String processName = NIMUtil.getProcessName(context);
+        return packageName.equals(processName);
+    }
+
+    /**
+     * 初始化RxNet
+     *
+     * @param context
+     * @param url
+     */
+    @SuppressLint("CheckResult")
+    public static void initRxNet(Context context, String url) {
+        Map<String, String> httpParams = new ConcurrentHashMap<>();
+        httpParams.put("os", "android");
+        httpParams.put("osVersion", Build.VERSION.RELEASE);
+        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());
+        httpParams.put("appVersion", VersionUtil.getLocalName(context));
+        httpParams.put("appVersionCode", String.valueOf(VersionUtil.getVersionCode(context)));
+        httpParams.put("deviceId", DeviceUuidFactory.getDeviceId(context));
+        httpParams.put("androidId", MD5Utils.getMD5String(Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID)));
+        httpParams.put("channel", AppMetaDataUtil.getChannelID());
+        httpParams.put("lang", LanguageHelper.INSTANCE.getSystemLanguage().toLanguageTag());
+        RxNet.init(context)
+                .debug(Env.isRealDebug())
+                .setBaseUrl(url)
+                .addInterceptors(new ParamsInterceptor(httpParams))
+                .addInterceptors(new NoParamsInterceptor())//注意:拦截器的添加顺序,请求的拦截顺序
+                .addInterceptors(new TimeSyncInterceptor())
+                .certificates()
+                .build();
+        //单例的model 初始化
+        initModel();
+    }
+
+    private static void init(String channel) {
+        initNimUIKit();
+        UriProvider.initUri(BuildConfig.BASE_URL_DEBUG, BuildConfig.BASE_URL_STAGING, BuildConfig.BASE_URL_RELEASE);
+        SVGAParser.Companion.shareParser().init(BasicConfig.INSTANCE.getAppContext());
+        try {
+            /** svga动画缓存路径 */
+            String cacheDirPath = FileHelper.getRootCacheDir().getAbsolutePath();
+            File cacheFie = new File(cacheDirPath, "cacheDir");
+            HttpResponseCache.install(cacheFie, 1024 * 1024 * 128);
+        } catch (IOException e) {
+            Log.e(TAG, "HttpResponseCache install error :" + e.getMessage());
+        }
+
+        initRxNet(BasicConfig.INSTANCE.getAppContext(), UriProvider.JAVA_WEB_URL);
+
+        /**
+         * 使用到realm 数据库，这里配置数据库 这里必须先于模块初始化前进行初始化配置
+         */
+        Realm.init(BasicConfig.INSTANCE.getAppContext());
+        RealmConfiguration config = new RealmConfiguration.Builder()
+                .name("accompany.realm")
+                .deleteRealmIfMigrationNeeded()
+                .build();
+        Realm.setDefaultConfiguration(config);
+
+        FileDownloader.setup(BasicConfig.INSTANCE.getAppContext());
+        LogUtil.i(TAG, channel);
+    }
+
+    /**
+     * 一些单例的 model
+     */
+    private static void initModel() {
+        DynamicFaceModel.get().init();
+        PayModel.get();
+        UserModel.get();
+        //ui层的萝卜钱包
+        RadishWalletManager.get();
+        //model层的
+        RadishModel.get();
+
+        IMMessageManager.get().init();
+        IMSystemMsgManager.get().init();
+
+        FamilyModel.Instance();
+        AuthModel.get();
+
+        ChannelModel.get();
+        MarketVerifyModel.get();
+        GiftModel.get();
+        // 模厅
+        HallDataManager.get().application();
+        //全局处理
+        GlobalHandleManager.get().init();
+
+        InitialModel.get().init(true).subscribe();
+
+        //上报平台初始化
+        ReportManager.get().init();
+    }
+
+    private static void initNimUIKit() {
+        // 初始化
+        NimUIKit.init(BasicConfig.INSTANCE.getAppContext(), new IMUserInfoProvider(), null);
+    }
+
+    /**
+     * debug 环境 受到实验室模式影响
+     */
+    public static boolean isDebug() {
+        return Env.isDebug();
+    }
+
+    /**
+     * 是否是真实的debug的环境 不受实验室模式影响
+     *
+     * @return
+     */
+    public static boolean isRealDebug() {
+        return Env.isRealDebug();
+    }
+
+
+    /**
+     * 用户没同意隐私协议之前,啥也不干!!
+     */
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        instance = this;
+        BaseApp.init(this);
+        BasicConfig.INSTANCE.setAppContext(this.getApplicationContext());
+        SharedPreferenceUtils.init(this);
+        ResUtil.init(this);
+        ResUtil.contextSupplier = () -> App.gStack.getTopContext();
+        LanguageHelper.INSTANCE.wrapContext(instance);
+        initOtherSDK();
+        initContext(this);
+        //首次启动事件
+        HashMap<String, Object> map = new HashMap<>(2);
+        map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_ACTIVATE);
+        ReportManager.get().reportEvent(IReportConstants.ACTIVATE_FIRST, map);
+    }
+
+    /**
+     * 初始化Application实例
+     */
+    public void initContext(Application application) {
+        gContext = application;
+    }
+
+    /**
+     * @return 获取Application实例
+     */
+    public static Application getApplication() {
+        return gContext;
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(base);
+    }
+
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        LanguageHelper.INSTANCE.wrapContext(this);
+    }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        GlobalHandleManager.get().unInit();
+        if (lifeCycleHelper != null) {
+            unregisterActivityLifecycleCallbacks(lifeCycleHelper);
+        }
+    }
+}

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

@@ -0,0 +1,115 @@
+package com.chwl.app.application;
+
+import android.app.Activity;
+
+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.vip.dialog.VipUpgradeDialog;
+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;
+import org.greenrobot.eventbus.ThreadMode;
+
+/**
+ * 全局处理，比如App弹窗
+ * create by lvzebiao @2019/8/14
+ */
+public class GlobalHandleManager {
+
+    private GlobalHandleManager() {
+
+    }
+
+    public static GlobalHandleManager get() {
+        return Helper.INSTANCE;
+    }
+
+    public void init() {
+        EventBus.getDefault().register(this);
+    }
+
+    public void unInit() {
+        EventBus.getDefault().unregister(this);
+    }
+
+    public Activity getActivity() {
+        return App.gStack.getTopActivity();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onImPushUpdateAppEvent(ImPushUpdateAppEvent event) {
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onVipUpgradeEvent(VipUpgradeEvent vipUpgradeEvent) {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        UserModel.get().onlyUpdateLoginUserInfoCache();
+        VipUpgradeDialog.newInstance(vipUpgradeEvent.getVipInfo()).show(activity);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onCpInviteEvent(CpInviteInfo entity) {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        CpGlobalDialog.newInstance(entity, activity).openDialog();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onNewUserChargeEvent(NewUserChargeEvent event) {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        new NewUserChargePrizeDialog(activity, event.getChargeProdTitle(), event.getFirstChargeRewardList()).openDialog();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onReceiveRecallStatus(CheckLostUserEvent event) {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        //如果没有获取到当前登录用户的信息，不弹出提示
+        if (UserModel.get().getCacheLoginUserInfo() == null) {
+            return;
+        }
+
+        CheckLostUserInfo checkLostUserInfo = (CheckLostUserInfo) event.getData();
+
+        boolean goBackOnce = (boolean) SharedPreferenceUtils.get(RecallDialog.GO_BACK_ONCE, false);
+
+        if (!goBackOnce && !event.isFailed() && checkLostUserInfo.isLostUser() && !checkLostUserInfo.isClaimedAward())
+            RecallDialog.start(activity);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onReceiveLevelUpActivity(LevelUpEvent event) {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        if (AvRoomDataManager.get().isSelfGamePlaying()) return;
+//        LevelUpDialog.start(activity, event.getLevelName(), true);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onReceiveCharmLevelUpActivity(CharmLevelUpEvent event) {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        if (AvRoomDataManager.get().isSelfGamePlaying()) return;
+//        LevelUpDialog.start(activity, event.getLevelName(), false);
+    }
+
+    private static final class Helper {
+        private static final GlobalHandleManager INSTANCE = new GlobalHandleManager();
+    }
+
+}

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.
@@ -32,9 +32,9 @@ public interface IReportConstants {
     int FIFTEEN = 15;
 
     String ACTIVATE_FIRST = "activate_first";
-    String PEKO_ACTIVATE = "peko_activate";
+    String MOLISTAR_ACTIVATE = "molistar_activate";
     String AGREEMENT_SHOW = "agreement_show";
-    String PEKO_LOGIN = "peko_login";
+    String MOLISTAR_LOGIN = "molistar_login";
     String AGREEMENT_CLICK = "agreement_click";
     String CLICK_TYPE = "click_type";
     String PAGE = "page";
@@ -47,7 +47,7 @@ public interface IReportConstants {
     String FAIL_DETAIL = "fail_detail";
     String MODULE_HOMEPAGE_CLICK = "module_homepage_click";
     String HOMEPAGE_TYPE = "homepage_type";
-    String PEKO_HOMEPAGE = "peko_homepage";
+    String MOLISTAR_HOMEPAGE = "molistar_homepage";
     String TAB_HOMEPAGE_CLICK = "tab_homepage_click";
     String HOMEPAGE_TAB = "homepage_tab";
     String PAYPAGE_SHOW = "paypage_show";
@@ -55,6 +55,6 @@ public interface IReportConstants {
     String ACCOUNT_BALANCE = "account_balance";
     String PAY_CLICK = "pay_click";
     String MONEY = "money";
-    String PEKO_PAY = "peko_pay";
+    String MOLISTAR_PAY = "molistar_pay";
 
 }

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

@@ -0,0 +1,63 @@
+package com.chwl.app.application;
+
+import android.os.Bundle;
+import java.util.Map;
+
+/**
+ * 统一埋点事件
+ * create by lvzebiao @2019/8/14
+ */
+public class ReportManager implements IReportService {
+
+    private static final String TAG = "ReportManager";
+
+    private ReportManager() {
+    }
+
+    private static final class Helper {
+        private static final ReportManager INSTANCE = new ReportManager();
+    }
+
+    public static ReportManager get() {
+        return Helper.INSTANCE;
+    }
+
+    public void init() {
+    }
+
+
+    /**
+     * 设置FirebaseAnalytics公共属性
+     *
+     * @param bundle 公共属性
+     */
+    @Override
+    public void setFirebaseAnalyticsDefaultEventParameters(Bundle bundle) {
+    }
+
+    /**
+     * 埋点，不需要上报网络质量和事件耗时
+     *
+     * @param eventId 事件名称
+     */
+    @Override
+    public void reportEvent(String eventId) {
+        reportEvent(eventId, null);
+    }
+
+    /**
+     * 埋点
+     *
+     * @param eventId 事件名称
+     * @param map     事件参数和值
+     */
+    @Override
+    public void reportEvent(String eventId, Map<String, Object> map) {
+    }
+
+    @Override
+    public void reportAdjustEvent(String eventId) {
+    }
+
+
+}

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

@@ -0,0 +1,10 @@
+package com.chwl.app.audio.helper;
+
+/**
+ * create by lvzebiao @2019/6/11
+ */
+public interface OnRefreshListener {
+
+    void refresh();
+
+}

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

@@ -0,0 +1,35 @@
+package com.chwl.app.audio.presenter;
+
+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;
+
+/**
+ * 我的声音页面
+ */
+public class MyVoicePresenter extends BaseMvpPresenter<IMyVoiceView> {
+
+    public void getUserVoiceInfo() {
+        getMvpView().showLoadingView();
+        AudioModel.get().getMyVoiceInfoList(AuthModel.get().getCurrentUid())
+                .compose(bindUntilEvent(PresenterEvent.DESTROY))
+                .subscribe(new DontWarnObserver<List<UserVoiceInfo>>() {
+                    @Override
+                    public void accept(List<UserVoiceInfo> userVoiceInfos, String error) {
+                        super.accept(userVoiceInfos, error);
+                        if (getMvpView() == null) {
+                            return;
+                        }
+                        getMvpView().hideLoadingView();
+                        getMvpView().showVoiceInfo(userVoiceInfos);
+                    }
+                });
+
+    }
+}

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,27 +14,29 @@ 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;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Single;
@@ -428,7 +430,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);
         });
 
     }
@@ -519,6 +521,7 @@ public class BottleLayout extends FrameLayout {
             double num = likeCountDouble / 10000;
 
             DecimalFormat decimalFormat = new DecimalFormat("0.00");// 构造方法的字符格式这里如果小数不足2位,会以0补足.
+            decimalFormat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ENGLISH));
             BigDecimal bigDecimal = new BigDecimal(num);
             double likeCountFormat = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
             if (likeCountFormat > 9999) {

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

@@ -0,0 +1,14 @@
+package com.chwl.app.audio.view;
+
+import com.chwl.core.audio.bean.VoiceMatchInfo;
+
+/**
+ * create by lvzebiao @2019/6/19
+ */
+public interface IBottleOpListener {
+
+    void onLimit(boolean isRight);
+
+    void onLikeOrUnLike(VoiceMatchInfo info, boolean isRight, boolean needLoading);
+
+}

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

@@ -0,0 +1,23 @@
+package com.chwl.app.audio.view;
+
+import com.chwl.core.audio.bean.UserVoiceInfo;
+import com.chwl.library.base.IMvpBaseView;
+
+import java.util.List;
+
+/**
+ * 我的声音页面
+ */
+public interface IMyVoiceView extends IMvpBaseView {
+    /**
+     * 显示声音数据消息
+     */
+    void showVoiceInfo(List<UserVoiceInfo> voiceList);
+
+    /**
+     * 请稍后
+     */
+    void showLoadingView();
+
+    void hideLoadingView();
+}

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