移除低版本权限检测

# Conflicts:
#	app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt

feat ;  合并 去除liulishuo分支 到 vip分支

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/google-services.json

@@ -1,39 +0,0 @@
-{
-  "project_info": {
-    "project_number": "656602722869",
-    "project_id": "pekolive-30f9e",
-    "storage_bucket": "pekolive-30f9e.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
-        "android_client_info": {
-          "package_name": "com.vele.pekolive"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/proguard-rules.pro

@@ -116,20 +116,15 @@
 -dontwarn com.netease.**
 -keep class com.netease.** {*;}
 
-# Presenter 相关
--keep class com.yizhuan.erban.base.** { *; }
--keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter
--keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
-
 # 云信自定义 ViewHolder 配置
--dontwarn com.yizhuan.erban.ui.im.recent.holder.**
--keep class com.yizhuan.erban.ui.im.recent.holder.** {*;}
--keep class com.yizhuan.erban.ui.im.chat.** {*;}
--keep class com.yizhuan.erban.luckymoney.viewholder.** {*;}
--keep class com.yizhuan.erban.share.viewholder.** {*;}
--keep class com.yizhuan.erban.public_chat_hall.msg.viewholder.** {*;}
--keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;}
--keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;}
+-dontwarn com.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.erban.bindadapter.**
--keep class com.yizhuan.erban.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.erban.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.erban.avroom.widget.MicroView{*;}
--keep class com.yizhuan.erban.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.erban.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.erban;
-
-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.erban_android_client", appContext.getPackageName());
-    }
-
-}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yizhuan.erban">
+    package="com.chwl.app">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
 
@@ -13,19 +13,18 @@
         android:protectionLevel="signature" /> <!-- 谷歌内购权限 -->
     <permission
         android:name="${applicationId}.push.permission.MESSAGE"
-        android:protectionLevel="signature" /> <!-- Required -->
+        android:protectionLevel="signature" /> <!-- Required   -->
     <permission
         android:name="${applicationId}.permission.C2D_MESSAGE"
         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>
 
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" />
@@ -51,16 +50,16 @@
         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" />
+        android:maxSdkVersion="28" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.CAMERA" />
+        android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.CAMERA" tools:node="remove"/>
     <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- 如果需要实时音视频通话模块，下面的权限也是必须的。否则，可以不加 -->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- SDK 权限申明, 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
     <!-- 和下面的 uses-permission 一起加入到你的 AndroidManifest 文件中。 -->
@@ -82,18 +81,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
@@ -112,26 +113,44 @@
             则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
             参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
             -->
-            <intent-filter>
+<!--            <intent-filter>-->
 
-                <!-- 此处scheme值需要替换为后台设置中的scheme值 -->
+<!--                &lt;!&ndash; 此处scheme值需要替换为后台设置中的scheme值 &ndash;&gt;-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
+
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+
+<!--                <data-->
+<!--                    android:host="main"-->
+<!--                    android:scheme="pikoapp" />-->
+<!--            </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="main"
-                    android:scheme="pikoapp" />
+                    android:host="app"
+                    android:scheme="molistar" />
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="firebase_crashlytics_collection_enabled"
-            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> <!-- 刘海屏适配 begin -->
+<!--        <meta-data-->
+<!--            android:name="firebase_crashlytics_collection_enabled"-->
+<!--            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
         <!-- 小米 -->
         <activity
-            android:name="com.soundcloud.android.crop.CropImageActivity"
+            android:name="com.soundcloud.crop.CropImageActivity"
             android:screenOrientation="portrait" /> <!-- 华为 -->
         <activity
             android:name="com.darsh.multipleimageselect.activities.AlbumSelectActivity"
@@ -151,31 +170,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.pekolive.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
@@ -222,7 +241,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Piko"
+            android:label="MoliStar"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -246,6 +265,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"
@@ -259,12 +284,12 @@
             android:label="房间流水"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.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.tutu.music.activity.MusicListActivity"
+            android:name="com.chwl.app.music.activity.MusicListActivity"
             android:label="@string/main_androidmanifest_011"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -290,6 +315,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"
@@ -298,16 +326,18 @@
             android:name=".ui.pay.ChargeActivity"
             android:label="@string/main_androidmanifest_018"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.wallet.WalletActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".home.activity.CollectionRoomActivity"
             android:label="@string/main_androidmanifest_019"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.wallet.ExchangeGoldActivity"
-            android:label="@string/main_androidmanifest_020"
+            android:name=".ui.setting.SettingActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.setting.SettingActivity"
+            android:name=".ui.setting.VipSetActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.relation.AttentionListActivity"
@@ -315,18 +345,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" />
@@ -336,9 +354,6 @@
         <activity
             android:name=".bills.activities.TotalBillsActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".bills.activities.WithdrawBillsActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".bills.activities.ChargeBillsActivity"
             android:screenOrientation="portrait" />
@@ -403,10 +418,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"
@@ -415,42 +426,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"
@@ -495,10 +470,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"
@@ -507,21 +478,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" />
@@ -534,22 +493,15 @@
             android:name=".ui.widget.LevelUpDialog"
             android:launchMode="singleTop"
             android:theme="@style/dialogactivity" />
+        <activity
+            android:name=".base.PhotoPickActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/dialogactivity" />
         <activity android:name=".home.activity.NewUserListActivity" />
         <activity
             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"
@@ -560,14 +512,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" />
@@ -633,9 +577,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" />
@@ -648,36 +589,25 @@
         <activity
             android:name=".module_hall.team.activity.HTeamMemberListActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
-            android:label="@string/main_androidmanifest_030"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".avroom.recommendcard.MyRecommendCardActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomMsgActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
+            android:name="com.chwl.app.room_chat.activity.RoomInviteFansActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
-            android:theme="@style/room_message_activity" />
-        <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
-            android:theme="@style/room_message_activity" />
-        <activity
-            android:name="com.yizhuan.tutu.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.tutu.room_chat.activity.NimHallTeamRoomMessageActivity"
+            android:name="com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
@@ -686,9 +616,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" />
@@ -712,42 +639,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"
@@ -762,78 +653,58 @@
             android:name=".bank_card.activity.AddBankCardAgreementActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.tongdaxing.erban.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"
@@ -861,9 +732,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" />
@@ -871,8 +739,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" /> <!-- 通知提醒设置 -->
@@ -903,21 +771,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" />
@@ -937,16 +790,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"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".earn.activity.GoldDetailActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
@@ -957,11 +800,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"
@@ -977,15 +815,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"
@@ -1015,9 +844,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"
@@ -1049,45 +878,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" />
 
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id" />
-        <meta-data
-            android:name="com.facebook.sdk.ClientToken"
-            android:value="@string/facebook_client_token" />
-
-        <activity
-            android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name" />
-        <activity
-            android:name="com.facebook.CustomTabActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="@string/fb_login_protocol_scheme" />
-            </intent-filter>
-        </activity>
-
         <activity android:name=".avroom.room_album.RoomAlbumActivity" />
 
+        <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":{
-
-    }
-  }
-
-}