替換包名：com.pandora.cs

然后把首页的推送先注释掉 把包名随便换一个
然后把登录line 还有谷歌登录去了 留fb的

Share/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     >
 
     <queries>
-        <package android:name="com.newpandora.yo"/>
+        <package android:name="com.pandora.cs"/>
         <package android:name="com.facebook.orca"/>
 
         <package

app/build.gradle

@@ -297,7 +297,8 @@ android {
 
 
     defaultConfig {
-        applicationId "com.newpandora.yo"
+//        applicationId "myname.pdlive.shayu"
+        applicationId "com.pandora.cs"
         minSdkVersion rootProject.ext.android.minSdkVersion
         //版本在这里修改
         targetSdkVersion rootProject.ext.android.targetSdkVersion

app/google-services.json

@@ -1,73 +1,57 @@
 {
   "project_info": {
-    "project_number": "671943160079",
-    "project_id": "pdlnews",
-    "storage_bucket": "pdlnews.appspot.com"
+    "project_number": "867032862719",
+    "project_id": "pdlnew",
+    "storage_bucket": "pdlnew.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:671943160079:android:e3116655ea962750fb8e7a",
+        "mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
         "android_client_info": {
-          "package_name": "com.newpandora.yo"
+          "package_name": "com.pandora.cs"
         }
       },
       "oauth_client": [
         {
-          "client_id": "671943160079-9olh3lsv7mo2mrjr16u0cqtlmde8r4ps.apps.googleusercontent.com",
+          "client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.newpandora.yo",
-            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
-          }
-        },
-        {
-          "client_id": "671943160079-evu2q1gur12tb34cimc9g14t9vffb9sm.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.newpandora.yo",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
           }
         },
         {
-          "client_id": "671943160079-gd4v6mr8t330ik8a00po6psdsn6p7b9k.apps.googleusercontent.com",
+          "client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.newpandora.yo",
-            "certificate_hash": "89f318e9603ae92835b6dab299a45afc59485b9e"
-          }
-        },
-        {
-          "client_id": "671943160079-gs1mv4vpdjgofj541cuqkfhija98rna0.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.newpandora.yo",
-            "certificate_hash": "b55235e71e9e1d2f8f7120ddc4224db85125e085"
-          }
-        },
-        {
-          "client_id": "671943160079-pdtdv5k1s4mamo7obssuo99rtghkd503.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.newpandora.yo",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
         {
-          "client_id": "671943160079-9259s527l99jlrfikv6hd4ljcieup34u.apps.googleusercontent.com",
+          "client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pandora.cs",
+            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
+          }
+        },
+        {
+          "client_id": "867032862719-ep4r92lpjmn7gs9tg0r7q0l75a4gm9mt.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyCf7-JJ44TD09I34Yt4DVzcAO7VCDCa424"
+          "current_key": "AIzaSyAnlY2aBEGyg7QpghHo7EaMRkM89dVNgq8"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "671943160079-9259s527l99jlrfikv6hd4ljcieup34u.apps.googleusercontent.com",
+              "client_id": "867032862719-ep4r92lpjmn7gs9tg0r7q0l75a4gm9mt.apps.googleusercontent.com",
               "client_type": 3
             }
           ]

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -292,6 +292,7 @@ public class AppContext extends CommonAppContext {
         MessageChatNotifyManager.getInstance().addShieldClass(LoginActivity.class);
         MessageChatNotifyManager.getInstance().addShieldClass(RegisterActivity.class);
         MessageChatNotifyManager.getInstance().addShieldClass(UCropActivity.class);
+        MessageChatNotifyManager.getInstance().addShieldClass(MainActivity.class);
 
 
         RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() {

app/tmp/full-r8-config.txt

@@ -1,4 +1,4 @@
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
+# The proguard configuration file for the following section is D:\android project\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
 # This is a configuration file for ProGuard.
 # http://proguard.sourceforge.net/index.html#manual/usage.html
 #
@@ -95,8 +95,8 @@
 # These classes are duplicated between android.jar and core-lambda-stubs.jar.
 -dontnote java.lang.invoke.**
 
-# End of content from D:\AndroidProject\pandorapanL\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\proguard-rules.pro
+# End of content from D:\android project\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1
+# The proguard configuration file for the following section is D:\android project\pandorapan\app\proguard-rules.pro
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt
@@ -419,8 +419,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.qiniu.**{public <init>();}
 -ignorewarnings
 
-# End of content from D:\AndroidProject\pandorapanL\app\proguard-rules.pro
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt
+# End of content from D:\android project\pandorapan\app\proguard-rules.pro
+# The proguard configuration file for the following section is D:\android project\pandorapan\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt
 -keep class androidx.core.app.CoreComponentFactory { <init>(); }
 -keep class androidx.core.content.FileProvider { <init>(); }
 -keep class androidx.core.content.FileProvider4Utils { <init>(); }
@@ -674,8 +674,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class androidx.constraintlayout.widget.ConstraintLayout { <init>(android.content.Context, android.util.AttributeSet); }
 
--keep class androidx.constraintlayout.widget.Group { <init>(android.content.Context, android.util.AttributeSet); }
-
 -keep class androidx.constraintlayout.widget.Guideline { <init>(android.content.Context, android.util.AttributeSet); }
 
 -keep class androidx.coordinatorlayout.widget.CoordinatorLayout { <init>(android.content.Context, android.util.AttributeSet); }
@@ -1093,11 +1091,11 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keepclassmembers class * { *** videoEditClick(android.view.View); }
 
 
-# End of content from D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
+# End of content from D:\android project\pandorapan\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt
+# The proguard configuration file for the following section is D:\android project\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
 
-# End of content from D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
+# End of content from D:\android project\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
 # Generated keep rule for Lifecycle observer adapter.
 -if class com.lxj.xpopup.core.BasePopupView {
     <init>(...);
@@ -1106,8 +1104,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     <init>(...);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
 # Copyright (C) 2015 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1155,16 +1153,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 }
 
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt
+# The proguard configuration file for the following section is D:\android project\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
 
-# End of content from D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
+# End of content from D:\android project\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
 -keepattributes *Annotation*
 
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\6baa4e4ee96e21acbcf3a49ef89d9f1f\transformed\jetified-facebook-android-sdk-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\6baa4e4ee96e21acbcf3a49ef89d9f1f\transformed\jetified-facebook-android-sdk-15.2.0\proguard.txt
 # To enable ProGuard in your project, edit project.properties
 # to define the proguard.config property as described in that file.
 #
@@ -1204,8 +1202,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     public android.os.Bundle getSkuDetails(int, java.lang.String, java.lang.String, android.os.Bundle);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\6baa4e4ee96e21acbcf3a49ef89d9f1f\transformed\jetified-facebook-android-sdk-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\44135493e77410a01759fde38f8d0bd2\transformed\jetified-facebook-gamingservices-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\6baa4e4ee96e21acbcf3a49ef89d9f1f\transformed\jetified-facebook-android-sdk-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\44135493e77410a01759fde38f8d0bd2\transformed\jetified-facebook-gamingservices-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -1246,8 +1244,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.facebook.gamingservices.GamingServices
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\44135493e77410a01759fde38f8d0bd2\transformed\jetified-facebook-gamingservices-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\c831739b6efc746f59d2a47471573f41\transformed\jetified-facebook-share-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\44135493e77410a01759fde38f8d0bd2\transformed\jetified-facebook-gamingservices-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\c831739b6efc746f59d2a47471573f41\transformed\jetified-facebook-share-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -1288,8 +1286,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.facebook.share.Share
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\c831739b6efc746f59d2a47471573f41\transformed\jetified-facebook-share-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\3815d0ddf4b17772bdba730e93b11daf\transformed\jetified-facebook-login-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\c831739b6efc746f59d2a47471573f41\transformed\jetified-facebook-share-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\3815d0ddf4b17772bdba730e93b11daf\transformed\jetified-facebook-login-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -1330,8 +1328,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.facebook.login.Login
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\3815d0ddf4b17772bdba730e93b11daf\transformed\jetified-facebook-login-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\43855db83adace9940918a3f6edcdc05\transformed\jetified-facebook-common-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\3815d0ddf4b17772bdba730e93b11daf\transformed\jetified-facebook-login-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\43855db83adace9940918a3f6edcdc05\transformed\jetified-facebook-common-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -1372,12 +1370,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.facebook.common.Common
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\43855db83adace9940918a3f6edcdc05\transformed\jetified-facebook-common-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\7bbb003dbf2685697cd42cfb46e77b3f\transformed\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\43855db83adace9940918a3f6edcdc05\transformed\jetified-facebook-common-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\7bbb003dbf2685697cd42cfb46e77b3f\transformed\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt
 -keep class com.davemorrissey.labs.subscaleview.** { *; }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\7bbb003dbf2685697cd42cfb46e77b3f\transformed\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\7bbb003dbf2685697cd42cfb46e77b3f\transformed\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt
 # Copyright (C) 2018 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1401,13 +1399,13 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <methods>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\b8e86bdadf487d72a43cd430b3f9db16\transformed\jetified-tweet-ui-3.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\b8e86bdadf487d72a43cd430b3f9db16\transformed\jetified-tweet-ui-3.1.1\proguard.txt
 #Picasso Proguard Config https://github.com/square/picasso
 -dontwarn com.squareup.okhttp.**
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\b8e86bdadf487d72a43cd430b3f9db16\transformed\jetified-tweet-ui-3.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2dd2f4200d3a68f4165485a3d207312d\transformed\coordinatorlayout-1.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\b8e86bdadf487d72a43cd430b3f9db16\transformed\jetified-tweet-ui-3.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\2dd2f4200d3a68f4165485a3d207312d\transformed\coordinatorlayout-1.2.0\proguard.txt
 # Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1434,13 +1432,13 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
                 RuntimeVisibleParameterAnnotations,
                 RuntimeVisibleTypeAnnotations
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\2dd2f4200d3a68f4165485a3d207312d\transformed\coordinatorlayout-1.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\940a969ab3fccb91703d8a9245e2974b\transformed\jetified-x-1.3.2\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\2dd2f4200d3a68f4165485a3d207312d\transformed\coordinatorlayout-1.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\940a969ab3fccb91703d8a9245e2974b\transformed\jetified-x-1.3.2\proguard.txt
 -keepclasseswithmembers class androidx.recyclerview.widget.RecyclerView$ViewHolder {
    public final android.view.View *;
 }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\940a969ab3fccb91703d8a9245e2974b\transformed\jetified-x-1.3.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\e452872bf1c6c06c71776c88e0bd7b6a\transformed\jetified-exoplayer-ui-2.18.2\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\940a969ab3fccb91703d8a9245e2974b\transformed\jetified-x-1.3.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\e452872bf1c6c06c71776c88e0bd7b6a\transformed\jetified-exoplayer-ui-2.18.2\proguard.txt
 # Proguard rules specific to the UI module.
 
 # Constructor method accessed via reflection in StyledPlayerView
@@ -1481,8 +1479,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -dontwarn kotlin.annotations.jvm.**
 -dontwarn javax.annotation.**
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e452872bf1c6c06c71776c88e0bd7b6a\transformed\jetified-exoplayer-ui-2.18.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\e452872bf1c6c06c71776c88e0bd7b6a\transformed\jetified-exoplayer-ui-2.18.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt
 # Copyright (C) 2015 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1508,11 +1506,11 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     public void suppressLayout(boolean);
     public boolean isLayoutSuppressed();
 }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt
-# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt
+# The proguard configuration file for the following section is D:\android project\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
 
-# End of content from D:\AndroidProject\pandorapanL\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt
+# End of content from D:\android project\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -1553,8 +1551,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.facebook.applinks.AppLinks
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\88221c7028fd958b12579787bcf1d5e0\transformed\jetified-facebook-messenger-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\88221c7028fd958b12579787bcf1d5e0\transformed\jetified-facebook-messenger-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -1599,8 +1597,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.facebook.messenger.Messenger
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\88221c7028fd958b12579787bcf1d5e0\transformed\jetified-facebook-messenger-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\d709769056a5279a71bbb18b41ee69d2\transformed\jetified-ui-1.0.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\88221c7028fd958b12579787bcf1d5e0\transformed\jetified-facebook-messenger-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\d709769056a5279a71bbb18b41ee69d2\transformed\jetified-ui-1.0.0\proguard.txt
 # Copyright (C) 2020 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1629,16 +1627,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     android.view.View findViewByAccessibilityIdTraversal(int);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\d709769056a5279a71bbb18b41ee69d2\transformed\jetified-ui-1.0.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\3591196def6c89c6af74e7d30dfb6618\transformed\jetified-runtime-1.0.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\d709769056a5279a71bbb18b41ee69d2\transformed\jetified-ui-1.0.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\3591196def6c89c6af74e7d30dfb6618\transformed\jetified-runtime-1.0.0\proguard.txt
 -assumenosideeffects public class androidx.compose.runtime.ComposerKt {
     void sourceInformation(androidx.compose.runtime.Composer,java.lang.String);
     void sourceInformationMarkerStart(androidx.compose.runtime.Composer,int,java.lang.String);
     void sourceInformationMarkerEnd(androidx.compose.runtime.Composer);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\3591196def6c89c6af74e7d30dfb6618\transformed\jetified-runtime-1.0.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\7931210372c8927a076053831aae79b7\transformed\jetified-glide-transformations-3.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\3591196def6c89c6af74e7d30dfb6618\transformed\jetified-runtime-1.0.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\7931210372c8927a076053831aae79b7\transformed\jetified-glide-transformations-3.1.1\proguard.txt
 -dontwarn jp.co.cyberagent.android.gpuimage.**
 
 -keep public class * implements com.bumptech.glide.module.GlideModule
@@ -1648,8 +1646,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   public *;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\7931210372c8927a076053831aae79b7\transformed\jetified-glide-transformations-3.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\a9e5e066cbda5595303140a83b7c357f\transformed\jetified-glide-4.12.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\7931210372c8927a076053831aae79b7\transformed\jetified-glide-transformations-3.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\a9e5e066cbda5595303140a83b7c357f\transformed\jetified-glide-4.12.0\proguard.txt
 -keep public class * implements com.bumptech.glide.module.GlideModule
 -keep class * extends com.bumptech.glide.module.AppGlideModule {
  <init>(...);
@@ -1665,8 +1663,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 # Uncomment for DexGuard only
 #-keepresourcexmlelements manifest/application/meta-data@value=GlideModule
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a9e5e066cbda5595303140a83b7c357f\transformed\jetified-glide-4.12.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\245cd6e28cb45ea53af06bd1902d8887\transformed\jetified-billing-7.0.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\a9e5e066cbda5595303140a83b7c357f\transformed\jetified-glide-4.12.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\245cd6e28cb45ea53af06bd1902d8887\transformed\jetified-billing-7.0.0\proguard.txt
 # Keep the AIDL interface
 -keep class com.android.vending.billing.** { *; }
 
@@ -1701,8 +1699,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <fields>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\245cd6e28cb45ea53af06bd1902d8887\transformed\jetified-billing-7.0.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\389aac78ceffe6f037f7624d2175f98b\transformed\jetified-play-services-base-18.3.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\245cd6e28cb45ea53af06bd1902d8887\transformed\jetified-billing-7.0.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\389aac78ceffe6f037f7624d2175f98b\transformed\jetified-play-services-base-18.3.0\proguard.txt
 # b/35135904 Ensure that proguard will not strip the mResultGuardian.
 -keepclassmembers class com.google.android.gms.common.api.internal.BasePendingResult {
   com.google.android.gms.common.api.internal.BasePendingResult$ReleasableResultGuardian mResultGuardian;
@@ -1710,8 +1708,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\389aac78ceffe6f037f7624d2175f98b\transformed\jetified-play-services-base-18.3.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\fdcd25b13ca01df0d64e21ab18452962\transformed\jetified-play-services-measurement-api-21.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\389aac78ceffe6f037f7624d2175f98b\transformed\jetified-play-services-base-18.3.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\fdcd25b13ca01df0d64e21ab18452962\transformed\jetified-play-services-measurement-api-21.1.1\proguard.txt
 # Can be removed once we pull in a dependency on firebase-common that includes
 # https://github.com/firebase/firebase-android-sdk/pull/1472/commits/856f1ca1151cdd88679bbc778892f23dfa34fc06#diff-a2ed34b5a38b4c6c686b09e54865eb48
 -dontwarn com.google.auto.value.AutoValue
@@ -1724,18 +1722,18 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <fields>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\fdcd25b13ca01df0d64e21ab18452962\transformed\jetified-play-services-measurement-api-21.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\1b549d0d5a78f93d1b3cd259941d27d6\transformed\jetified-firebase-common-20.1.2\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\fdcd25b13ca01df0d64e21ab18452962\transformed\jetified-play-services-measurement-api-21.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\1b549d0d5a78f93d1b3cd259941d27d6\transformed\jetified-firebase-common-20.1.2\proguard.txt
 -dontwarn com.google.firebase.platforminfo.KotlinDetector
 -dontwarn com.google.auto.value.AutoValue
 -dontwarn com.google.auto.value.AutoValue$Builder
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\1b549d0d5a78f93d1b3cd259941d27d6\transformed\jetified-firebase-common-20.1.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\1d73edc853ec5797eb8fbdbaf92a3a43\transformed\jetified-play-services-tasks-18.1.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\1b549d0d5a78f93d1b3cd259941d27d6\transformed\jetified-firebase-common-20.1.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\1d73edc853ec5797eb8fbdbaf92a3a43\transformed\jetified-play-services-tasks-18.1.0\proguard.txt
 
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\1d73edc853ec5797eb8fbdbaf92a3a43\transformed\jetified-play-services-tasks-18.1.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\53d8ae00710cb6dfde668ad5c2529a5c\transformed\jetified-play-services-measurement-21.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\1d73edc853ec5797eb8fbdbaf92a3a43\transformed\jetified-play-services-tasks-18.1.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\53d8ae00710cb6dfde668ad5c2529a5c\transformed\jetified-play-services-measurement-21.1.1\proguard.txt
 # We keep all fields for every generated proto file as the runtime uses
 # reflection over them that ProGuard cannot detect. Without this keep
 # rule, fields may be removed that would cause runtime failures.
@@ -1743,8 +1741,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <fields>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\53d8ae00710cb6dfde668ad5c2529a5c\transformed\jetified-play-services-measurement-21.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\d9a1fa15000998f069a9eb095ddd5d6c\transformed\jetified-play-services-measurement-sdk-21.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\53d8ae00710cb6dfde668ad5c2529a5c\transformed\jetified-play-services-measurement-21.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\d9a1fa15000998f069a9eb095ddd5d6c\transformed\jetified-play-services-measurement-sdk-21.1.1\proguard.txt
 # We keep all fields for every generated proto file as the runtime uses
 # reflection over them that ProGuard cannot detect. Without this keep
 # rule, fields may be removed that would cause runtime failures.
@@ -1752,8 +1750,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <fields>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\d9a1fa15000998f069a9eb095ddd5d6c\transformed\jetified-play-services-measurement-sdk-21.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\e3d5db4c204c05b688c67157d08d719e\transformed\jetified-play-services-measurement-impl-21.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\d9a1fa15000998f069a9eb095ddd5d6c\transformed\jetified-play-services-measurement-sdk-21.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\e3d5db4c204c05b688c67157d08d719e\transformed\jetified-play-services-measurement-impl-21.1.1\proguard.txt
 # We keep all fields for every generated proto file as the runtime uses
 # reflection over them that ProGuard cannot detect. Without this keep
 # rule, fields may be removed that would cause runtime failures.
@@ -1761,8 +1759,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <fields>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e3d5db4c204c05b688c67157d08d719e\transformed\jetified-play-services-measurement-impl-21.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\a14887389ea05f2c3a61b51470f02e11\transformed\jetified-play-services-measurement-sdk-api-21.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\e3d5db4c204c05b688c67157d08d719e\transformed\jetified-play-services-measurement-impl-21.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\a14887389ea05f2c3a61b51470f02e11\transformed\jetified-play-services-measurement-sdk-api-21.1.1\proguard.txt
 # We keep all fields for every generated proto file as the runtime uses
 # reflection over them that ProGuard cannot detect. Without this keep
 # rule, fields may be removed that would cause runtime failures.
@@ -1770,8 +1768,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <fields>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a14887389ea05f2c3a61b51470f02e11\transformed\jetified-play-services-measurement-sdk-api-21.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\a00f92aeac02d4041e8903bda4c31467\transformed\jetified-play-services-measurement-base-21.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\a14887389ea05f2c3a61b51470f02e11\transformed\jetified-play-services-measurement-sdk-api-21.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\a00f92aeac02d4041e8903bda4c31467\transformed\jetified-play-services-measurement-base-21.1.1\proguard.txt
 # We keep all fields for every generated proto file as the runtime uses
 # reflection over them that ProGuard cannot detect. Without this keep
 # rule, fields may be removed that would cause runtime failures.
@@ -1779,8 +1777,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <fields>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a00f92aeac02d4041e8903bda4c31467\transformed\jetified-play-services-measurement-base-21.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\6eda7df53f5a535e22df39c8e1d72650\transformed\jetified-play-services-basement-18.3.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\a00f92aeac02d4041e8903bda4c31467\transformed\jetified-play-services-measurement-base-21.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\6eda7df53f5a535e22df39c8e1d72650\transformed\jetified-play-services-basement-18.3.0\proguard.txt
 # Needed when building against pre-Marshmallow SDK.
 -dontwarn android.security.NetworkSecurityPolicy
 
@@ -1858,8 +1856,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\6eda7df53f5a535e22df39c8e1d72650\transformed\jetified-play-services-basement-18.3.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8daf89c63ab14ea80f11dcfb9154f87e\transformed\fragment-1.5.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\6eda7df53f5a535e22df39c8e1d72650\transformed\jetified-play-services-basement-18.3.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\8daf89c63ab14ea80f11dcfb9154f87e\transformed\fragment-1.5.0\proguard.txt
 # Copyright (C) 2020 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1880,12 +1878,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     public <init>();
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\8daf89c63ab14ea80f11dcfb9154f87e\transformed\fragment-1.5.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\8daf89c63ab14ea80f11dcfb9154f87e\transformed\fragment-1.5.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
 # 本库模块专用的混淆规则
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -1943,8 +1941,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     public <methods>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt
 -keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel {
     <init>();
 }
@@ -1953,8 +1951,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     <init>(android.app.Application);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt
 -keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel {
     <init>(androidx.lifecycle.SavedStateHandle);
 }
@@ -1963,8 +1961,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     <init>(android.app.Application,androidx.lifecycle.SavedStateHandle);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
 # When editing this file, update the following files as well:
 # - META-INF/proguard/coroutines.pro
 # - META-INF/com.android.tools/proguard/coroutines.pro
@@ -1992,8 +1990,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 # An annotation used for build tooling, won't be directly accessed.
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
 # Allow R8 to optimize away the FastServiceLoader.
 # Together with ServiceLoader optimization in R8
 # this results in direct instantiation when loading Dispatchers.Main
@@ -2018,8 +2016,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     boolean getDEBUG() return false;
     boolean getRECOVER_STACK_TRACES() return false;
 }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\33f970d366250728877e2f4671336331\transformed\jetified-twitter-core-3.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\33f970d366250728877e2f4671336331\transformed\jetified-twitter-core-3.1.1\proguard.txt
 #GSON
 # Retain Annotations for model objects
 -keepattributes *Annotation*
@@ -2043,8 +2041,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keepclasseswithmembers class * {
   @retrofit2.http.* <methods>;
 }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\33f970d366250728877e2f4671336331\transformed\jetified-twitter-core-3.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\c77ecf57bcccb48a1c436095271858a9\transformed\rules\lib\META-INF\proguard\okhttp3.pro
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\33f970d366250728877e2f4671336331\transformed\jetified-twitter-core-3.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\c77ecf57bcccb48a1c436095271858a9\transformed\rules\lib\META-INF\proguard\okhttp3.pro
 # JSR 305 annotations are for embedding nullability information.
 -dontwarn javax.annotation.**
 
@@ -2057,16 +2055,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 # OkHttp platform used only on JVM and when Conscrypt dependency is available.
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\c77ecf57bcccb48a1c436095271858a9\transformed\rules\lib\META-INF\proguard\okhttp3.pro
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\ba2f6b8d754037d8f03e9dcac5bb54b5\transformed\rules\lib\META-INF\proguard\okio.pro
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\c77ecf57bcccb48a1c436095271858a9\transformed\rules\lib\META-INF\proguard\okhttp3.pro
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\ba2f6b8d754037d8f03e9dcac5bb54b5\transformed\rules\lib\META-INF\proguard\okio.pro
 # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
 -dontwarn org.codehaus.mojo.animal_sniffer.*
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\ba2f6b8d754037d8f03e9dcac5bb54b5\transformed\rules\lib\META-INF\proguard\okio.pro
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\acd3bab55cb4f819050ef57ea2e25987\transformed\jetified-beautysdk-202202241203\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\ba2f6b8d754037d8f03e9dcac5bb54b5\transformed\rules\lib\META-INF\proguard\okio.pro
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\acd3bab55cb4f819050ef57ea2e25987\transformed\jetified-beautysdk-202202241203\proguard.txt
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\acd3bab55cb4f819050ef57ea2e25987\transformed\jetified-beautysdk-202202241203\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\6905c56d188193f144e40adf093778f1\transformed\jetified-utilcode-1.30.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\acd3bab55cb4f819050ef57ea2e25987\transformed\jetified-beautysdk-202202241203\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\6905c56d188193f144e40adf093778f1\transformed\jetified-utilcode-1.30.0\proguard.txt
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in G:\Android_IDE\ADT\sdk/tools/proguard/proguard-android.txt
@@ -2095,8 +2093,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep @com.blankj.utilcode.util.ApiUtils$Api class *
 
 -keepattributes *Annotation*
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\6905c56d188193f144e40adf093778f1\transformed\jetified-utilcode-1.30.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\b75b75d929caf1295aec25af1cc611a0\transformed\jetified-crash-1.0.8\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\6905c56d188193f144e40adf093778f1\transformed\jetified-utilcode-1.30.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\b75b75d929caf1295aec25af1cc611a0\transformed\jetified-crash-1.0.8\proguard.txt
 -keep class cn.rongcloud.xcrash.NativeHandler {
     native <methods>;
     void crashCallback(...);
@@ -2104,22 +2102,22 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     void traceCallbackBeforeDump(...);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\b75b75d929caf1295aec25af1cc611a0\transformed\jetified-crash-1.0.8\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\a7d2b366ebb4fa695d83564a8f8d9b9e\transformed\jetified-roundedimageview-2.3.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\b75b75d929caf1295aec25af1cc611a0\transformed\jetified-crash-1.0.8\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\a7d2b366ebb4fa695d83564a8f8d9b9e\transformed\jetified-roundedimageview-2.3.0\proguard.txt
 # Proguard configuration.
 -dontwarn com.squareup.okhttp.**
 
 # References to Picasso are okay if the consuming app doesn't use it
 -dontwarn com.squareup.picasso.Transformation
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a7d2b366ebb4fa695d83564a8f8d9b9e\transformed\jetified-roundedimageview-2.3.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\54e4d6b7585273307d9c6823366d92b9\transformed\jetified-android-gif-drawable-1.2.23\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\a7d2b366ebb4fa695d83564a8f8d9b9e\transformed\jetified-roundedimageview-2.3.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\54e4d6b7585273307d9c6823366d92b9\transformed\jetified-android-gif-drawable-1.2.23\proguard.txt
 -keep public class pl.droidsonroids.gif.GifIOException{<init>(int, java.lang.String);}
 #Prevents warnings for consumers not using AndroidX
 -dontwarn androidx.annotation.**
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\54e4d6b7585273307d9c6823366d92b9\transformed\jetified-android-gif-drawable-1.2.23\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\11ff2b99188b7e7bf4e2771916717f0f\transformed\jetified-ShortcutBadger-1.1.22\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\54e4d6b7585273307d9c6823366d92b9\transformed\jetified-android-gif-drawable-1.2.23\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\11ff2b99188b7e7bf4e2771916717f0f\transformed\jetified-ShortcutBadger-1.1.22\proguard.txt
 #https://github.com/leolin310148/ShortcutBadger/issues/46
 -keep class me.leolin.shortcutbadger.impl.AdwHomeBadger { <init>(...); }
 -keep class me.leolin.shortcutbadger.impl.ApexHomeBadger { <init>(...); }
@@ -2130,8 +2128,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class me.leolin.shortcutbadger.impl.SolidHomeBadger { <init>(...); }
 -keep class me.leolin.shortcutbadger.impl.SonyHomeBadger { <init>(...); }
 -keep class me.leolin.shortcutbadger.impl.XiaomiHomeBadger { <init>(...); }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\11ff2b99188b7e7bf4e2771916717f0f\transformed\jetified-ShortcutBadger-1.1.22\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\bf0366dad8fd25b42dec7a0b29d3ed94\transformed\jetified-EasyFloat-2.0.4\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\11ff2b99188b7e7bf4e2771916717f0f\transformed\jetified-ShortcutBadger-1.1.22\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\bf0366dad8fd25b42dec7a0b29d3ed94\transformed\jetified-EasyFloat-2.0.4\proguard.txt
 # Add project specific ProGuard rules here.
 # You can control the filterSet of applied configuration files using the
 # proguardFiles setting in build.gradle.
@@ -2169,8 +2167,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 # 保持反射不被混淆
 -keepattributes EnclosingMethod
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\bf0366dad8fd25b42dec7a0b29d3ed94\transformed\jetified-EasyFloat-2.0.4\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\6dd79c19a3de7f7b4d3014c08d02f4ca\transformed\jetified-PagerGridLayoutManager-1.1.7\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\bf0366dad8fd25b42dec7a0b29d3ed94\transformed\jetified-EasyFloat-2.0.4\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\6dd79c19a3de7f7b4d3014c08d02f4ca\transformed\jetified-PagerGridLayoutManager-1.1.7\proguard.txt
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
 # proguardFiles setting in build.gradle.
@@ -2192,12 +2190,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\6dd79c19a3de7f7b4d3014c08d02f4ca\transformed\jetified-PagerGridLayoutManager-1.1.7\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\adfc563cfaac18f99ab49176e8311139\transformed\jetified-WheelView-4.1.11\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\6dd79c19a3de7f7b4d3014c08d02f4ca\transformed\jetified-PagerGridLayoutManager-1.1.7\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\adfc563cfaac18f99ab49176e8311139\transformed\jetified-WheelView-4.1.11\proguard.txt
 # 本库模块专用的混淆规则
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\adfc563cfaac18f99ab49176e8311139\transformed\jetified-WheelView-4.1.11\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\483c0844792efef20618064763675691\transformed\jetified-SudMGP-1.4.3.1201\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\adfc563cfaac18f99ab49176e8311139\transformed\jetified-WheelView-4.1.11\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\483c0844792efef20618064763675691\transformed\jetified-SudMGP-1.4.3.1201\proguard.txt
 -keep class com.cocos.game.**{ *; }
 -keep class tech.sud.runtime.**{ *; }
 -keep class tech.sud.mgp.core.**{ *; }
@@ -2851,8 +2849,8 @@ native <methods>;
 }
 
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\483c0844792efef20618064763675691\transformed\jetified-SudMGP-1.4.3.1201\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\9fef6e1dea59ce01cbe6739f12545786\transformed\jetified-SudASR-1.4.3.1201\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\483c0844792efef20618064763675691\transformed\jetified-SudMGP-1.4.3.1201\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\9fef6e1dea59ce01cbe6739f12545786\transformed\jetified-SudASR-1.4.3.1201\proguard.txt
 -keep class com.microsoft.cognitiveservices.** { *; }
 -keep class tech.sud.mgp.asr.azure.** { *; }
 
@@ -2867,8 +2865,8 @@ native <methods>;
    *** *Callback(long);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\9fef6e1dea59ce01cbe6739f12545786\transformed\jetified-SudASR-1.4.3.1201\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\9fef6e1dea59ce01cbe6739f12545786\transformed\jetified-SudASR-1.4.3.1201\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
 # proguardFiles setting in build.gradle.
@@ -2895,8 +2893,8 @@ native <methods>;
 -keep class com.faceunity.wrapper.faceunity {*;}
 -keep class com.faceunity.wrapper.faceunity$RotatedImage {*;}
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
 # Proguard rules specific to the core module.
 
 # Constructors accessed via reflection in DefaultRenderersFactory
@@ -2953,8 +2951,8 @@ native <methods>;
   <init>();
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -2973,8 +2971,8 @@ native <methods>;
     <init>();
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt
 # Copyright (C) 2017 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -2994,8 +2992,8 @@ native <methods>;
   androidx.transition.ChangeBounds$ViewBounds mViewBounds;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
 # Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -3016,8 +3014,8 @@ native <methods>;
    *** get*();
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
 #
@@ -3053,8 +3051,8 @@ native <methods>;
     java.lang.Object readResolve();
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
 # Copyright (C) 2017 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -3078,8 +3076,8 @@ native <methods>;
 -keep class androidx.media.** implements android.os.Parcelable {
     public static final android.os.Parcelable$Creator *;
 }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\c6ec9c31a3362678dbcc66f2e9ea7260\transformed\core-1.10.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\c6ec9c31a3362678dbcc66f2e9ea7260\transformed\core-1.10.1\proguard.txt
 # Never inline methods, but allow shrinking and obfuscation.
 -keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.view.ViewCompat$Api* {
   <methods>;
@@ -3097,8 +3095,8 @@ native <methods>;
   <methods>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\c6ec9c31a3362678dbcc66f2e9ea7260\transformed\core-1.10.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\c6ec9c31a3362678dbcc66f2e9ea7260\transformed\core-1.10.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt
 -keepattributes AnnotationDefault,
                 RuntimeVisibleAnnotations,
                 RuntimeVisibleParameterAnnotations,
@@ -3122,8 +3120,8 @@ native <methods>;
 # this rule is need to work properly when app is compiled with api 28, see b/142778206
 # Also this rule prevents registerIn from being inlined.
 -keepclassmembers class androidx.lifecycle.ReportFragment$LifecycleCallbacks { *; }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\4a3cce138aa30f2fd0df44bf999a62d2\transformed\jetified-exoplayer-datasource-2.18.2\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\4a3cce138aa30f2fd0df44bf999a62d2\transformed\jetified-exoplayer-datasource-2.18.2\proguard.txt
 # Proguard rules specific to the DataSource module.
 
 # Constant folding for resource integers may mean that a resource passed to this method appears to be unused. Keep the method to prevent this from happening.
@@ -3137,8 +3135,8 @@ native <methods>;
   <init>();
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\4a3cce138aa30f2fd0df44bf999a62d2\transformed\jetified-exoplayer-datasource-2.18.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\cccc4dd1e5210aae5c702cc866696db2\transformed\jetified-exoplayer-extractor-2.18.2\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\4a3cce138aa30f2fd0df44bf999a62d2\transformed\jetified-exoplayer-datasource-2.18.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\cccc4dd1e5210aae5c702cc866696db2\transformed\jetified-exoplayer-extractor-2.18.2\proguard.txt
 # Proguard rules specific to the extractor module.
 
 # Methods accessed via reflection in DefaultExtractorsFactory
@@ -3156,8 +3154,8 @@ native <methods>;
 -dontwarn kotlin.annotations.jvm.**
 -dontwarn javax.annotation.**
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\cccc4dd1e5210aae5c702cc866696db2\transformed\jetified-exoplayer-extractor-2.18.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\5bd9c5cbdf66400a7932d1da1691bac0\transformed\jetified-exoplayer-common-2.18.2\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\cccc4dd1e5210aae5c702cc866696db2\transformed\jetified-exoplayer-extractor-2.18.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\5bd9c5cbdf66400a7932d1da1691bac0\transformed\jetified-exoplayer-common-2.18.2\proguard.txt
 # Proguard rules specific to the common module.
 
 # Don't warn about checkerframework and Kotlin annotations
@@ -3181,30 +3179,30 @@ native <methods>;
 # This is needed for ProGuard but not R8.
 -keepclassmembernames class com.google.common.base.Function { *; }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\5bd9c5cbdf66400a7932d1da1691bac0\transformed\jetified-exoplayer-common-2.18.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\25898cd92bff76be652caaeef3397500\transformed\versionedparcelable-1.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\5bd9c5cbdf66400a7932d1da1691bac0\transformed\jetified-exoplayer-common-2.18.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\25898cd92bff76be652caaeef3397500\transformed\versionedparcelable-1.1.1\proguard.txt
 -keep class * implements androidx.versionedparcelable.VersionedParcelable
 -keep public class android.support.**Parcelizer { *; }
 -keep public class androidx.**Parcelizer { *; }
 -keep public class androidx.versionedparcelable.ParcelImpl
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\25898cd92bff76be652caaeef3397500\transformed\versionedparcelable-1.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8c49f53105b230fe43669879f576cab6\transformed\room-runtime-2.4.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\25898cd92bff76be652caaeef3397500\transformed\versionedparcelable-1.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\8c49f53105b230fe43669879f576cab6\transformed\room-runtime-2.4.0\proguard.txt
 -keep class * extends androidx.room.RoomDatabase
 -dontwarn androidx.room.paging.**
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\8c49f53105b230fe43669879f576cab6\transformed\room-runtime-2.4.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\c4bf50f4bef00295f739a61609b757c2\transformed\jetified-transport-backend-cct-3.1.8\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\8c49f53105b230fe43669879f576cab6\transformed\room-runtime-2.4.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\c4bf50f4bef00295f739a61609b757c2\transformed\jetified-transport-backend-cct-3.1.8\proguard.txt
 -dontwarn com.google.auto.value.AutoValue
 -dontwarn com.google.auto.value.AutoValue$Builder
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\c4bf50f4bef00295f739a61609b757c2\transformed\jetified-transport-backend-cct-3.1.8\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\ad1f4a6564b34286db155b9a62614b62\transformed\jetified-transport-api-3.0.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\c4bf50f4bef00295f739a61609b757c2\transformed\jetified-transport-backend-cct-3.1.8\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\ad1f4a6564b34286db155b9a62614b62\transformed\jetified-transport-api-3.0.0\proguard.txt
 -dontwarn com.google.auto.value.AutoValue
 -dontwarn com.google.auto.value.AutoValue$Builder
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\ad1f4a6564b34286db155b9a62614b62\transformed\jetified-transport-api-3.0.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\ad1f4a6564b34286db155b9a62614b62\transformed\jetified-transport-api-3.0.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt
 # This Proguard rule ensures that ComponentInitializers are are neither shrunk nor obfuscated.
 # This is because they are discovered and instantiated during application initialization.
 -keep class * extends androidx.startup.Initializer {
@@ -3214,22 +3212,22 @@ native <methods>;
 
 -assumenosideeffects class androidx.startup.StartupLogger
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\e1bbd140b52a8e61bea52bf380947059\transformed\jetified-firebase-components-17.0.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\e1bbd140b52a8e61bea52bf380947059\transformed\jetified-firebase-components-17.0.1\proguard.txt
 -dontwarn com.google.firebase.components.Component$Instantiation
 -dontwarn com.google.firebase.components.Component$ComponentType
 
 -keep class * implements com.google.firebase.components.ComponentRegistrar
 -keep,allowshrinking interface com.google.firebase.components.ComponentRegistrar
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e1bbd140b52a8e61bea52bf380947059\transformed\jetified-firebase-components-17.0.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\ff39e13547528b628eacff5bee8aa481\transformed\jetified-firebase-encoders-json-18.0.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\e1bbd140b52a8e61bea52bf380947059\transformed\jetified-firebase-components-17.0.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\ff39e13547528b628eacff5bee8aa481\transformed\jetified-firebase-encoders-json-18.0.0\proguard.txt
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\ff39e13547528b628eacff5bee8aa481\transformed\jetified-firebase-encoders-json-18.0.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\eb4fdf1a1abe4d45e8a1ea6c65e9f330\transformed\jetified-model-8.7.0\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\ff39e13547528b628eacff5bee8aa481\transformed\jetified-firebase-encoders-json-18.0.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\eb4fdf1a1abe4d45e8a1ea6c65e9f330\transformed\jetified-model-8.7.0\proguard.txt
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\eb4fdf1a1abe4d45e8a1ea6c65e9f330\transformed\jetified-model-8.7.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\e4ea56c12de34fd26c2a84541f3aeb08\transformed\jetified-calligraphy3-3.1.1\proguard.txt
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\eb4fdf1a1abe4d45e8a1ea6c65e9f330\transformed\jetified-model-8.7.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\e4ea56c12de34fd26c2a84541f3aeb08\transformed\jetified-calligraphy3-3.1.1\proguard.txt
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in /Developer/android-sdk-osx/tools/proguard/proguard-android.txt
@@ -3251,8 +3249,8 @@ native <methods>;
 -keep class io.github.inflationx.calligraphy3.* { *; }
 -keep class io.github.inflationx.calligraphy3.*$* { *; }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e4ea56c12de34fd26c2a84541f3aeb08\transformed\jetified-calligraphy3-3.1.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\6ee4aefc5377638487f62f6779665411\transformed\rules\lib\META-INF\proguard\androidx-annotations.pro
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\e4ea56c12de34fd26c2a84541f3aeb08\transformed\jetified-calligraphy3-3.1.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\Administrator\.gradle\caches\transforms-3\6ee4aefc5377638487f62f6779665411\transformed\rules\lib\META-INF\proguard\androidx-annotations.pro
 -keep,allowobfuscation @interface androidx.annotation.Keep
 -keep @androidx.annotation.Keep class * {*;}
 
@@ -3272,7 +3270,7 @@ native <methods>;
   @androidx.annotation.DoNotInline <methods>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\6ee4aefc5377638487f62f6779665411\transformed\rules\lib\META-INF\proguard\androidx-annotations.pro
+# End of content from C:\Users\Administrator\.gradle\caches\transforms-3\6ee4aefc5377638487f62f6779665411\transformed\rules\lib\META-INF\proguard\androidx-annotations.pro
 # The proguard configuration file for the following section is <unknown>
 
 # End of content from <unknown>

common/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.newpandora.yo.fileprovider"
+            android:authorities="com.pandora.cs.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

common/src/main/java/com/yunbao/common/CommonAppConfig.java

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.bean.FansMedalBean;
+import com.yunbao.common.bean.LiveGiftBean;
 import com.yunbao.common.bean.NewCommunityType;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.bean.UserItemBean;
@@ -537,38 +538,32 @@ public class CommonAppConfig {
      * 个人中心功能列表
      */
     public List<UserItemBean> getUserItemList() {
-        if (mUserItemList == null || mUserItemList.size() == 0) {
             String userBeanJson = SpUtil.getInstance().getStringValue(SpUtil.USER_INFO);
             if (!TextUtils.isEmpty(userBeanJson)) {
                 JSONObject obj = JSON.parseObject(userBeanJson);
                 if (obj != null) {
-                    setUserItemList(obj.getString("list"));
+                    setUserItemList(obj.getString("pdl_list"));
                 }
             }
+        return mUserItemList;
+    }
+
+    /**
+     * 个人中心功能列表   新
+     */
+    public List<UserItemBean> getUserItemNewList() {
+        String userBeanJson = SpUtil.getInstance().getStringValue(SpUtil.USER_INFO);
+        if (!TextUtils.isEmpty(userBeanJson)) {
+            JSONObject obj = JSON.parseObject(userBeanJson);
+            if (obj != null) {
+                setUserItemList(obj.getString("pdl_settings"));
+            }
         }
         return mUserItemList;
     }
 
-
     public void setUserItemList(String listString) {
-        UserItemBean[][] arr = JSON.parseObject(listString, UserItemBean[][].class);
-        if (arr != null && arr.length > 0) {
-            List<UserItemBean> newList = new ArrayList<>();
-            for (int i = 0, length1 = arr.length; i < length1; i++) {
-                for (int j = 0, length2 = arr[i].length; j < length2; j++) {
-                    UserItemBean bean = arr[i][j];
-                    if (j == length2 - 1) {
-                        if (i < length1 - 1) {
-                            bean.setGroupLast(true);
-                        } else {
-                            bean.setAllLast(true);
-                        }
-                    }
-                    newList.add(bean);
-                }
-            }
-            mUserItemList = newList;
-        }
+        mUserItemList = JSON.parseArray(listString, UserItemBean.class);
     }
 
 

common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java

@@ -12,10 +12,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 
 import com.blankj.utilcode.util.LogUtils;
-import com.google.android.exoplayer2.C;
 import com.yunbao.common.R;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
@@ -25,21 +23,16 @@ import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.DateFormatUtil;
 import com.yunbao.common.utils.StringUtil;
-import com.yunbao.common.utils.UiConversationCodeUtil;
 import com.yunbao.common.utils.ViewUtils;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
-import org.spongycastle.jcajce.provider.asymmetric.rsa.ISOSignatureSpi;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import io.rong.imkit.IMCenter;
-import io.rong.imkit.RongIM;
 import io.rong.imkit.conversationlist.ConversationListAdapter;
 import io.rong.imkit.conversationlist.model.BaseUiConversation;
 import io.rong.imkit.conversationlist.model.SingleConversation;
@@ -59,43 +52,18 @@ public class MainConversationListAdapter extends ConversationListAdapter {
     public static final int TYPE_SEARCH_USER = 510;
     public static final int TYPE_SEARCH_CHAT = 520;
     private List<BaseUiConversation> srcList;
-    private List<BaseUiConversation> allDataList;
     private Context mContext;
     private boolean isChat = true;
     private OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener;
     private Map<String, Integer> timerMap = new HashMap<>();
 
-
-    public static final int FILTER_OFFLINE = 0;
-    public static final int FILTER_ONLINE = 1;
-    public static final int FILTER_UNREAD = 2;
-    public static final int FILTER_READ = 4;
-    public static final int FILTER_ALL = 7;
-    private int mFilter = FILTER_ALL;
-
-    public int getFilter() {
-        return mFilter;
-    }
-
-    public void setFilter(int mFilter) {
-        if (this.mFilter == mFilter)
-            return;
-        this.mFilter = mFilter;
-
-    }
-
-
     public MainConversationListAdapter(Context mContext) {
         this.mContext = mContext;
     }
 
     public void setSrcList(List<BaseUiConversation> srcList) {
         this.srcList = srcList;
-        if (mFilter== FILTER_OFFLINE || mFilter == FILTER_ONLINE) {
-            super.setDataCollection(UiConversationCodeUtil.FilterData(mFilter, allDataList));
-        }else {
-            notifyDataSetChanged();
-        }
+        notifyDataSetChanged();
     }
 
     public void setOnRefreshListener(OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener) {
@@ -119,7 +87,7 @@ public class MainConversationListAdapter extends ConversationListAdapter {
             View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_msg_search_chat, parent, false);
             holder = ViewHolder.createViewHolder(parent.getContext(), view);
         } else if (viewType != -200) {
-            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.rc_conversationlist_item2, parent, false);
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.rc_conversationlist_item, parent, false);
             holder = ViewHolder.createViewHolder(parent.getContext(), view);
         } else {
             holder = super.onCreateViewHolder(parent, viewType);
@@ -158,72 +126,13 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         } else if (getItemViewType(position) == TYPE_SEARCH_TITLE) {
             bindTitle(holder, position);
         } else if (getItemViewType(position) != -200) {
-            bindChatNew(holder, position);
             super.onBindViewHolder(holder, position);
-            return;
         }
         if (getItemViewType(position) != -200) {
             bindDefault(holder, position);
         }
     }
 
-
-    private void bindChatNew(ViewHolder holder, int position) {
-        BaseUiConversation conversation = mDataList.get(position);
-        ImgLoader.display(holder.getContext(), conversation.mCore.getPortraitUrl(), holder.getView(R.id.rc_conversation_portrait));
-        holder.setText(R.id.rc_conversation_title, conversation.mCore.getConversationTitle());
-        ((TextView) holder.getView(R.id.rc_conversation_content)).setText(ChatMsgTypeUtils.getMsg(conversation.mConversationContent.toString()));
-        if (conversation.mCore.getSentTime() != -1 && holder.getView(R.id.rc_conversation_date) != null) {
-            holder.setText(R.id.rc_conversation_date, DateFormatUtil.getDateTimeString(conversation.mCore.getSentTime(), true, holder.getContext()));
-            holder.getView(R.id.rc_conversation_date).setVisibility(View.VISIBLE);
-        } else if (holder.getView(R.id.rc_conversation_date) != null) {
-            holder.getView(R.id.rc_conversation_date).setVisibility(View.GONE);
-        }
-        holder.setVisible(R.id.rc_conversation_live_online, "0".equals(conversation.mCore.getDraft()));
-        int unReadCount = conversation.mCore.getUnreadMessageCount();
-
-        if (unReadCount > 0) {
-            holder.setVisible(R.id.rc_conversation_unread_count, true);
-            holder.setText(R.id.rc_conversation_unread_count, String.valueOf(unReadCount));
-        } else {
-            holder.setVisible(R.id.rc_conversation_unread_count, false);
-        }
-
-
-        Message message = conversation.mCore.getMessage();
-        if (message != null && message.getMessageDirection() == Message.MessageDirection.SEND) {
-            holder.setVisible(R.id.rc_conversation_unread_tv, true);
-            if (conversation.mCore.getSentStatus() == Message.SentStatus.READ) {
-                holder.setTextColor(R.id.rc_conversation_unread_tv, ContextCompat.getColor(holder.itemView.getContext(), R.color.rc_secondary_color));
-                holder.setText(R.id.rc_conversation_unread_tv, WordUtil.getNewString(R.string.message_chat_msg_read_tip));
-            } else {
-                holder.setTextColor(R.id.rc_conversation_unread_tv, ContextCompat.getColor(holder.itemView.getContext(), R.color.red));
-                holder.setText(R.id.rc_conversation_unread_tv, WordUtil.getNewString(R.string.message_chat_msg_unread_tip));
-            }
-        } else {
-            holder.setVisible(R.id.rc_conversation_unread_tv, false);
-        }
-
-
-        if (holder.getView(R.id.rc_conversation_live_status) == null || IMLoginManager.get(holder.getContext()).getAnchorB() != 1) {
-            return;
-        }
-        Integer timer = timerMap.get(mDataList.get(position).mCore.getTargetId());
-        if (timer == null) {
-            holder.getView(R.id.rc_conversation_live_status).setVisibility(View.GONE);
-            return;
-        }
-        if (timer >= 10) {
-            holder.setText(R.id.rc_conversation_live_status,
-                    String.format(WordUtil.getNewString(R.string.message_chat_msg_look_live), timer)
-            );
-            holder.getView(R.id.rc_conversation_live_status).setVisibility(View.VISIBLE);
-        } else {
-            holder.getView(R.id.rc_conversation_live_status).setVisibility(View.GONE);
-        }
-    }
-
-
     private void bindDefault(ViewHolder holder, int position) {
         BaseUiConversation conversation = mDataList.get(position);
         Log.i("列表", "bindDefault: 用户头像:" + conversation.mCore.getPortraitUrl());
@@ -262,9 +171,7 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         }
     }
 
-
     private void bindEmpty(ViewHolder holder, int position) {
-        Log.i("聊天数据源", "bindEmpty: ");
         if (isChat) {
             ViewUtils.findViewById(holder.itemView, R.id.imageView, ImageView.class).setImageResource(R.mipmap.ic_message_not_chat_list);
             ViewUtils.findViewById(holder.itemView, R.id.textView, TextView.class).setText(R.string.not_data_message_chat_list);
@@ -276,19 +183,18 @@ public class MainConversationListAdapter extends ConversationListAdapter {
 
     public void onFinish() {
         if (onRefreshListener != null) {
-            Log.i("聊天数据源", "设置数据源: " + allDataList.size());
-            onRefreshListener.onFinish(allDataList);
+            Log.i("聊天数据源", "设置数据源: " + mDataList.size());
+            onRefreshListener.onFinish(mDataList);
         }
     }
 
     private int listHashCode = 0;
-
-    public synchronized void setDataCollectionV2(List<BaseUiConversation> data, boolean isSearch) {
+    @Override
+    public synchronized void setDataCollection(List<BaseUiConversation> data) {
         if (data.hashCode() == listHashCode) return;
         listHashCode = data.hashCode();
         List<BaseUiConversation> tmp = new ArrayList<>();
-        Log.i("聊天数据源", "size()" + data.size() + "   setDataCollection: " + data.hashCode());
-
+        Log.i("聊天数据源", "setDataCollection: " + data.hashCode());
         List<String> urls = new ArrayList<>();
         if (srcList == null) {
             srcList = new ArrayList<>();
@@ -330,37 +236,13 @@ public class MainConversationListAdapter extends ConversationListAdapter {
             }
             tmp.add(item);
         }
-        List<BaseUiConversation> showData = null;
-        if (isSearch) {
-            Log.i("聊天数据源", "FilterData isSearch");
-            showData = UiConversationCodeUtil.FilterData(mFilter, tmp, allDataList);
-        } else {
-            allDataList = tmp;
-            if (mFilter != FILTER_OFFLINE && mFilter != FILTER_ONLINE )
-            {
-                Log.i("聊天数据源", "FilterData notSearch");
-                showData = UiConversationCodeUtil.FilterData(mFilter, allDataList);
-            }
-        }
-        if (showData != null && !UiConversationCodeUtil.checkIsSame(showData, mDataList)) {
-            Log.i("聊天数据源", "数据源有变化" + showData.size());
-            super.setDataCollection(showData);
-        } else {
-            Log.i("聊天数据源", "数据源无变化");
-        }
+        // ToastUtil.showDebug("消息数:"+data.size());
+        super.setDataCollection(tmp);
     }
 
-
-    @Override
-    public void setDataCollection(List<BaseUiConversation> data) {
-        setDataCollectionV2(data, false);
-    }
-
-
     private List<String> tmpUids = new ArrayList<>();
 
     public void clear() {
-        Log.i("聊天数据源", "clear: " + mDataList.size());
         mDataList.clear();
         if (srcList != null) {
             srcList.clear();
@@ -467,15 +349,15 @@ public class MainConversationListAdapter extends ConversationListAdapter {
                 BaseUiConversation conversation = mDataList.get(id);
                 conversation.mCore.setSentTime(bean.getSentTime());
                 conversation.mCore.setUnreadMessageCount(integer);
-                if (bean.getContent() instanceof SightMessage) {
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[小視頻]" : "[Video]");
-                } else if (bean.getContent() instanceof HQVoiceMessage) {
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[語音]" : "[Voice]");
-                } else if (bean.getContent() instanceof ImageMessage) {
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[圖片]" : "[picture]");
-                } else if (bean.getContent() instanceof MessageChatCardContent) {
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[站內分享]" : "[In-app sharing]");
-                } else {
+                if(bean.getContent() instanceof SightMessage){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[小視頻]":"[Video]");
+                }else if(bean.getContent() instanceof HQVoiceMessage){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[語音]":"[Voice]");
+                } else if(bean.getContent() instanceof ImageMessage){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[圖片]":"[picture]");
+                }else if(bean.getContent() instanceof MessageChatCardContent){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[站內分享]":"[In-app sharing]");
+                } else{
                     conversation.mConversationContent = new SpannableString(((TextMessage) bean.getContent()).getContent());
                 }
                 mDataList.set(id, conversation);
@@ -493,6 +375,4 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         });
 
     }
-
-
 }

common/src/main/java/com/yunbao/common/dialog/SudGameSearchDialogPopup.java

@@ -56,7 +56,7 @@ public class SudGameSearchDialogPopup extends AbsDialogPopupWindow {
 
     @Override
     public void dismiss() {
-     //   Bus.getOff(this);
+        Bus.getOff(this);
         super.dismiss();
     }
 
@@ -78,7 +78,7 @@ public class SudGameSearchDialogPopup extends AbsDialogPopupWindow {
     @Override
     protected void onCreate() {
         super.onCreate();
-//        Bus.getOn(this);
+        Bus.getOn(this);
         editSearch = findViewById(R.id.edit_search);
 //        listHistory = findViewById(R.id.list_history);
         listRoom = findViewById(R.id.list_room);

common/src/main/java/com/yunbao/common/fragment/ChatViewModel.java

@@ -1,57 +0,0 @@
-package com.yunbao.common.fragment;
-
-import android.app.Application;
-
-import androidx.annotation.NonNull;
-
-import androidx.lifecycle.ViewModel;
-
-import com.facebook.all.All;
-import com.yunbao.common.R;
-import com.yunbao.common.utils.UiConversationCodeUtil;
-
-public class ChatViewModel extends ViewModel {
-
-    private int mChatFilter = UiConversationCodeUtil.FILTER_ALL;
-
-    public int getChatFilter() {
-        return mChatFilter;
-    }
-
-    public void setChatFilter(int mChatFilter) {
-        this.mChatFilter = mChatFilter;
-    }
-
-//    public static final int FILTER_OFFLINE = 0;
-//    public static final int FILTER_ONLINE = 1;
-//    public static final int FILTER_UNREAD = 2;
-//    public static final int FILTER_READ = 4;
-//    public static final int FILTER_ALL = 7;
-//     <string name="all_chats">All Chats</string>
-//    <string name="online_only">Show Online </string>
-//    <string name="offline_only">Show Offline </string>
-//    <string name="read_only">Show Read </string>
-//    <string name="unread_only">Show Unread </string>
-
-    public int getTitleTextId() {
-        int id = R.string.all_chats;
-        switch (mChatFilter) {
-            case UiConversationCodeUtil.FILTER_ALL:
-                id = R.string.all_chats;
-                break;
-            case UiConversationCodeUtil.FILTER_ONLINE:
-                id = R.string.online_only;
-                break;
-            case UiConversationCodeUtil.FILTER_OFFLINE:
-                id = R.string.offline_only;
-                break;
-            case UiConversationCodeUtil.FILTER_READ:
-                id = R.string.read_only;
-                break;
-            case UiConversationCodeUtil.FILTER_UNREAD:
-                id = R.string.unread_only;
-                break;
-        }
-        return id;
-    }
-}

common/src/main/java/com/yunbao/common/fragment/MainMessageChatFragment.java

@@ -9,13 +9,11 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
 
 import com.yunbao.common.R;
 import com.yunbao.common.adapter.MainConversationListAdapter;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.UiConversationCodeUtil;
 import com.yunbao.common.utils.WordUtil;
 
 import java.util.ArrayList;
@@ -34,12 +32,10 @@ public class MainMessageChatFragment extends ConversationListFragment {
 
     private static final String TAG = "融云列表";
     int listHashCode = 0;
-//    ChatViewModel chatViewModel;
 
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         Log.i(TAG, "onCreateView: 创建融云");
-//        chatViewModel =  (ChatViewModel)(new ViewModelProvider(requireActivity())).get(ChatViewModel.class);
         return inflater.inflate(R.layout.rc_conversationlist_fragment, container, false);
     }
 
@@ -50,13 +46,10 @@ public class MainMessageChatFragment extends ConversationListFragment {
         mConversationListViewModel.getConversationListLiveData().observe(this.getViewLifecycleOwner(), new Observer<List<BaseUiConversation>>() {
             @Override
             public void onChanged(List<BaseUiConversation> uiConversations) {
-                int hashCode = UiConversationCodeUtil.getListHasCode(uiConversations);
-                if (listHashCode != hashCode) {
-                    Log.i("nwq", "刷新数据");
-                    listHashCode = hashCode;
+                if (listHashCode != uiConversations.hashCode()) {
+                    listHashCode = uiConversations.hashCode();
                     ((MainConversationListAdapter) mAdapter).onFinish();
                 }
-
             }
         });
         mConversationListViewModel.getRefreshEventLiveData().observe(this.getViewLifecycleOwner(), new Observer<Event.RefreshEvent>() {
@@ -65,6 +58,7 @@ public class MainMessageChatFragment extends ConversationListFragment {
                 listHashCode = 0;
             }
         });
+
     }
 
     public void setEmptyView(int viewLayoutMsgId) {
@@ -76,11 +70,6 @@ public class MainMessageChatFragment extends ConversationListFragment {
     }
 
 
-    public void refreshData() {
-        mRefreshLayout.autoRefresh();
-        //onConversationListRefresh(mRefreshLayout)
-    }
-
     public void search(String search) {
         ((MainConversationListAdapter) mAdapter).setSearch();
         getContactsList(search);
@@ -155,7 +144,7 @@ public class MainMessageChatFragment extends ConversationListFragment {
                     list.remove(list.size() - 1);
                 }
                 list.addAll(data);
-                ((MainConversationListAdapter) mAdapter).setDataCollectionV2(list,true);
+                mAdapter.setDataCollection(list);
             }
 
             @Override
@@ -167,19 +156,17 @@ public class MainMessageChatFragment extends ConversationListFragment {
     }
 
     public void onChatList() {
-        if (mConversationListViewModel == null) return;
+        if(mConversationListViewModel==null)return;
         ((MainConversationListAdapter) mAdapter).setChat();
         ((MainConversationListAdapter) mAdapter).clear();
-        System.out.println(">!>!>!>!!>" + mConversationListViewModel);
+        System.out.println(">!>!>!>!!>"+mConversationListViewModel);
         subscribeUi();
 
     }
 
     @Override
     protected ConversationListAdapter onResolveAdapter() {
-        MainConversationListAdapter adapter = new MainConversationListAdapter(getContext());
-//        adapter.setFilter(chatViewModel.getChatFilter());
-        this.mAdapter = adapter;
+        this.mAdapter = new MainConversationListAdapter(getContext());
         return this.mAdapter;
     }
 }

common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java

@@ -13,7 +13,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.yunbao.common.R;
@@ -50,7 +49,7 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
     public MainMessageChatListFragment(Context mContext) {
         this.mContext =mContext;
     }
-    ChatViewModel chatViewModel;
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -63,10 +62,8 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
     @Override
     public void onResume() {
         super.onResume();
-        chatViewModel =  (new ViewModelProvider(requireActivity())).get(ChatViewModel.class);
         conversationListFragment = new MainMessageChatFragment();
         setAdapter(conversationListFragment.getAdapter());
-        mAdapter.setFilter(chatViewModel.getChatFilter());
         FragmentManager manager =  getChildFragmentManager();
         FragmentTransaction transaction = manager.beginTransaction();
         transaction.replace(R.id.container, conversationListFragment);
@@ -168,16 +165,6 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
 
     }
 
-    public int getFilter() {
-        return mAdapter.getFilter();
-    }
-
-    public void setFilter(int mFilter) {
-        mAdapter.setFilter(mFilter);
-        chatViewModel.setChatFilter(mFilter);
-        conversationListFragment.refreshData();
-    }
-
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {

common/src/main/java/com/yunbao/common/http/CommonHttpConsts.java

@@ -20,7 +20,7 @@ public class CommonHttpConsts {
     public static final String DOWNLOAD_GIF = "downloadGif";
     public static final String GET_BALANCE = "getBalance";
     public static final String CHECK_TOKEN_INVALID = "checkTokenInvalid";
-    public static final String NOTIFY_GOOGLE = "Charge.goole_validate_panduola";
+    public static final String NOTIFY_GOOGLE = "Charge.google_pay";
     public static final String COMMUNITY_SETREPORT = "Community.setReport";
 
     public static final String GET_USER_HOME = "getUserHome";

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -417,15 +417,18 @@ public class CommonHttpUtil {
                 .params("purchaseToken", purchaseToken)
                 .params("productId", productId)
                 .params("orderno", orderno)
-                .params("package_name", "com.newpandora.yo")
+                .params("package_name", "com.pandora.cs")
                 .execute(callback);
     }
 
-    public static void notifyGoogle(String purchaseToken, String productId,  HttpCallback callback) {
+    public static void notifyGoogle(String purchaseToken, String orderNo, String tradeNo, String allData, String gps_adid, HttpCallback callback) {
         HttpClient.getInstance().get(CommonHttpConsts.NOTIFY_GOOGLE, CommonHttpConsts.NOTIFY_GOOGLE)
                 .params("purchaseToken", purchaseToken)
-                .params("productId", productId)
-                .params("package_name", "com.newpandora.yo")
+                .params("orderno", orderNo)
+                .params("trade_no", tradeNo)
+                .params("allData", allData)
+                .params("gps_adid", gps_adid)
+                .params("package_name", "com.pandora.cs")
                 .execute(callback);
     }
 
@@ -434,7 +437,7 @@ public class CommonHttpUtil {
                 .params("purchaseToken", purchaseToken)
                 .params("orderno", orderNo)
                 .params("trade_no", tradeNo)
-                .params("package_name", "com.newpandora.yo")
+                .params("package_name", "com.pandora.cs")
                 .execute(callback);
     }
 

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -1295,7 +1295,7 @@ public interface PDLiveApi {
             @Query("open_off") int status
     );
 
-    @GET("/api/public/?service=Pdlmsg.sendBefore&new_pop=1")
+    @GET("/api/public/?service=Pdlmsg.sendBefore")
     Observable<ResponseModel<MessageSayHiBean>> getMessageSayHiTimer(
     );
 

common/src/main/java/com/yunbao/common/pay/google/GooglePlay.java

@@ -1,297 +0,0 @@
-package com.yunbao.common.pay.google;
-
-import android.app.Activity;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.billingclient.api.BillingClient;
-import com.android.billingclient.api.BillingClientStateListener;
-import com.android.billingclient.api.BillingFlowParams;
-import com.android.billingclient.api.BillingResult;
-import com.android.billingclient.api.ConsumeParams;
-import com.android.billingclient.api.ProductDetails;
-import com.android.billingclient.api.Purchase;
-import com.android.billingclient.api.PurchasesUpdatedListener;
-import com.android.billingclient.api.QueryProductDetailsParams;
-import com.android.billingclient.api.QueryPurchasesParams;
-import com.google.android.gms.ads.identifier.AdvertisingIdClient;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.common.collect.ImmutableList;
-import com.yunbao.common.CommonAppContext;
-import com.yunbao.common.R;
-import com.yunbao.common.http.CommonHttpUtil;
-import com.yunbao.common.http.HttpCallback;
-
-import java.util.ArrayList;
-import java.util.List;
-
-//谷歌支付
-public class GooglePlay implements PurchasesUpdatedListener {
-
-    private String TAG = "mLog";
-    private BillingClient billingClient;
-    private GoogleBillingListener billingListener;
-
-    private GooglePlay() {
-        init();
-    }
-
-    private boolean init() {
-        if (getGoogleService() && billingClient == null) {
-            billingClient = BillingClient.newBuilder(CommonAppContext.sInstance)
-                    .setListener(this)
-                    .enablePendingPurchases()
-                    .build();
-            startConnection();
-            return true;
-        }
-        if (billingClient != null && !billingClient.isReady()) {//没有连接的话去连接
-            startConnection();
-        }
-        if (billingClient == null)
-            return false;
-        return true;
-    }
-
-    private void startConnection() {
-        if (!billingClient.isReady()) {
-            //请求连接到GooglePay
-            billingClient.startConnection(new BillingClientStateListener() {
-                @Override
-                public void onBillingSetupFinished(@NonNull BillingResult billingResult) {
-                    int code = billingResult.getResponseCode();
-                    if (code != BillingClient.BillingResponseCode.OK) {
-                        String msg = billingResult.getDebugMessage();
-                        Log.e(TAG, "连接到GooglePay失败    code = " + code + "    msg = " + msg);
-                        return;
-                    }
-                    Log.e(TAG, "连接到GooglePay成功");
-                }
-
-                //连接失败
-                @Override
-                public void onBillingServiceDisconnected() {
-                    Log.e(TAG, "连接到GooglePay失败，请重试");
-                }
-            });
-        }
-    }
-
-
-    //点击商品，先查询商品  然后出来支付界面，调用下单
-    public void purchase(Activity activity, String orderNumber, String id) {
-        if (!init()) {
-            return;
-        }
-        ImmutableList<QueryProductDetailsParams.Product> productList = ImmutableList.of(QueryProductDetailsParams.Product.newBuilder()
-                .setProductId(id)
-                .setProductType(BillingClient.ProductType.INAPP)
-                .build());
-        QueryProductDetailsParams queryProductDetailsParams =
-                QueryProductDetailsParams.newBuilder()
-                        .setProductList(productList)
-                        .build();
-        billingClient.queryProductDetailsAsync(
-                queryProductDetailsParams,
-                (billingResult, list) -> {
-                    //查询商品成功
-                    int code = billingResult.getResponseCode();
-                    if (code != BillingClient.BillingResponseCode.OK || list == null || list.isEmpty()) {
-                        String msg = billingResult.getDebugMessage();
-                        Log.e(TAG, "查询商品失败    code = " + code + "    msg = " + msg);
-                        return;
-                    }
-                    Log.e(TAG, "查询商品成功");
-                    buyIt(activity, orderNumber, list.get(0));
-                }
-        );
-    }
-
-    //开始下单，准备生成订单了
-    private void buyIt(Activity activity, String orderNumber, ProductDetails productDetails) {
-        List<BillingFlowParams.ProductDetailsParams> productDetailsParamsList = new ArrayList<>();
-        productDetailsParamsList.add(BillingFlowParams.ProductDetailsParams.newBuilder()
-                // retrieve a value for "productDetails" by calling queryProductDetailsAsync()
-                .setProductDetails(productDetails)
-                // For one-time products, "setOfferToken" method shouldn't be called.
-                // For subscriptions, to get an offer token, call
-                // ProductDetails.subscriptionOfferDetails() for a list of offers
-                // that are available to the user.
-                //一次性商品不需要传token
-//                                .setOfferToken(selectedOfferToken)
-                .build());
-
-        BillingFlowParams billingFlowParams = BillingFlowParams.newBuilder()
-                .setProductDetailsParamsList(productDetailsParamsList)
-                .setObfuscatedAccountId(orderNumber)//好像是账号id
-                .build();
-
-        BillingResult billingResult = billingClient.launchBillingFlow(activity, billingFlowParams);
-        int code = billingResult.getResponseCode();
-        if (code != BillingClient.BillingResponseCode.OK) {
-            String msg = billingResult.getDebugMessage();
-            Log.e(TAG, "购买商品失败    code = " + code + "    msg = " + msg);
-//            ToastUtil.show(getString(R.string.pay_suc));
-            return;
-        }
-        Log.e(TAG, "购买商品   " + productDetails.toString());
-    }
-
-    //消耗商品 支付成功之后，调用我们后台下发商品成功之后，调用消耗
-    public void consume(List<Purchase> list) {
-        if (!init()) {
-            return;
-        }
-        for (Purchase purchase : list) {
-            getConsumeGoods(purchase);
-        }
-    }
-
-    /**
-     * 消耗所有商品
-     */
-    public void consumeAll() {
-        if (!init()) {
-            return;
-        }
-        //以下示例展示了如何提取用户的订阅购买交易。请注意，queryPurchasesAsync() 仅返回有效订阅和非消耗型一次性购买交易。
-        QueryPurchasesParams inAppPurchasesQuery = QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.INAPP).build();
-        billingClient.queryPurchasesAsync(inAppPurchasesQuery, (billingResult, list) -> {
-            if (BillingClient.BillingResponseCode.OK == billingResult.getResponseCode()) {
-                for (Purchase purchase : list) {
-                    //0:PurchaseState.UNSPECIFIED_STATE：未知状态
-                    //1:PurchaseState.PURCHASED：付款完成
-                    //2:PurchaseState.PENDING：购买正在等待付款完成。
-                    if (Purchase.PurchaseState.PURCHASED == purchase.getPurchaseState()) {
-                        //调用google去消费
-                        //如果之后还出现谷歌掉单的行为在来处理
-                        CommonHttpUtil.notifyGoogle(purchase.getPurchaseToken(),
-                                purchase.getProducts().get(0), new HttpCallback() {
-                                    @Override
-                                    public void onSuccess(int code, String msg, String[] info) {
-                                        if (code == 0) {
-                                            getConsumeGoods(purchase);
-                                        }
-                                    }
-                                });
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * 公共消费商品接口
-     */
-    private void getConsumeGoods(Purchase purchase) {
-        if (purchase != null) {
-            Log.i(TAG, "-----开始消耗商品：" + purchase.toString());
-            ConsumeParams.Builder consumeParams = ConsumeParams.newBuilder();
-            consumeParams.setPurchaseToken(purchase.getPurchaseToken());
-            //调用消耗商品方法
-            consumeAsync(consumeParams.build(), purchase);
-        }
-    }
-
-    /**
-     * 消耗商品
-     * int SERVICE_TIMEOUT = -3; //服务超时
-     * int FEATURE_NOT_SUPPORTED = -2; //不支持功能
-     * int SERVICE_DISCONNECTED = -1; //服务单元已断开
-     * int OK = 0; //成功
-     * int USER_CANCELED = 1; //用户按上一步或取消对话框
-     * int SERVICE_UNAVAILABLE = 2; //网络连接断开
-     * int BILLING_UNAVAILABLE = 3; //所请求的类型不支持 Google Play 结算服务 AIDL 版本
-     * int ITEM_UNAVAILABLE = 4; //请求的商品已不再出售。
-     * int DEVELOPER_ERROR = 5; //提供给 API 的参数无效。此错误也可能说明应用未针对结算服务正确签名或设置，或者在其清单中缺少必要的权限。
-     * int ERROR = 6; //API 操作期间出现严重错误
-     * int ITEM_ALREADY_OWNED = 7; //未能购买，因为已经拥有此商品
-     * int ITEM_NOT_OWNED = 8; //未能消费，因为尚未拥有此商品
-     */
-    private void consumeAsync(ConsumeParams consumeParams, Purchase purchase) {
-        if (!init()) {
-            return;
-        }
-        billingClient.consumeAsync(consumeParams, (billingResult, purchaseToken) -> {
-            if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
-                Log.i(TAG, "-----消耗商品成功");
-            } else {
-                Log.i(TAG, "-----消耗商品失败" + billingResult.toString() + "---" + purchaseToken + "--code:" + billingResult.getResponseCode());
-            }
-        });
-    }
-
-    @Override
-    public void onPurchasesUpdated(@NonNull BillingResult billingResult, @Nullable List<Purchase> purchases) {
-        if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK
-                && purchases != null) {
-            //支付成功
-            if (billingListener != null)//消耗掉商品放到外面调用我们服务器成功的时候去消耗 todo  暂时注释掉  这样可以模拟掉单的问题
-                billingListener.onPaySuccess(purchases);
-            /*
-             * 一旦您验证了购买交易，您的应用就可以向用户授予使用权了。若要确认与购买交易相关联的用户账号，
-             * 您可以使用 Purchases.products:get 返回的 ProductPurchase.obfuscatedExternalAccountId（适用于应用内商品的购买交易）
-             * 和 Purchases.subscriptions:get 返回的 SubscriptionPurchase.obfuscatedExternalAccountId（适用于服务器端的订阅），
-             * 或者 Purchase.getAccountIdentifiers() 在客户端返回的 obfuscatedAccountId（如果在交易时已使用 setObfuscatedAccountId 设置该 ID）。
-             * */
-//                purchases.get(0).getAccountIdentifiers()
-            for (Purchase purchase : purchases) {
-                Log.d("mLog", "谷歌支付的回调  " + purchase);
-            }
-        } else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.USER_CANCELED) {
-            //取消支付了
-            if (billingListener != null)
-                billingListener.onPayFailed(CommonAppContext.sInstance.getString(R.string.pay_cancel));
-        } else {
-            //支付失败
-            if (billingListener != null)
-                billingListener.onPayFailed(CommonAppContext.sInstance.getString(R.string.pay_fail));
-        }
-    }
-
-    /**
-     * 检测GooglePlay服务是否可用(需要导入包api "com.google.android.gms:play-services-location:11.8.0"，也可以不检查，跳过这个代码)
-     */
-    public boolean getGoogleService() {
-        GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
-        if (googleApiAvailability != null) {
-            int resultCode = googleApiAvailability.isGooglePlayServicesAvailable(CommonAppContext.sInstance);
-            return resultCode == ConnectionResult.SUCCESS;
-        }
-        return false;
-    }
-
-    public String getAdId() {
-        try {
-            return AdvertisingIdClient.getAdvertisingIdInfo(CommonAppContext.sInstance).getId();
-        } catch (Exception e) {
-            e.printStackTrace();
-            Log.e("GooglePlay", "获取谷歌的id错误了");
-        }
-        return "google_default_id";
-    }
-
-    public void setBillingListener(GoogleBillingListener listener) {
-        billingListener = listener;
-    }
-
-    /**
-     * 定义接口返回支付结果
-     */
-    public interface GoogleBillingListener {
-        void onPaySuccess(List<Purchase> purchases);
-
-        void onPayFailed(String msg);
-    }
-
-    public static class GooglePlayHelper {
-        static GooglePlay googlePlay = new GooglePlay();
-    }
-
-    public static GooglePlay getInstance() {
-        return GooglePlayHelper.googlePlay;
-    }
-}

common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java

@@ -83,7 +83,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
                 if (mNeedCrop) {
                     Uri uri = null;
                     if (Build.VERSION.SDK_INT >= 24) {
-                        uri = FileProvider.getUriForFile(mContext, "com.newpandora.yo.fileprovider", mCameraResult);
+                        uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
                     } else {
                         uri = Uri.fromFile(mCameraResult);
                     }
@@ -195,7 +195,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
             mCameraResult = getNewFile();
             Uri uri = null;
             if (Build.VERSION.SDK_INT >= 24) {
-                uri = FileProvider.getUriForFile(mContext, "com.newpandora.yo.fileprovider", mCameraResult);
+                uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             } else {
                 uri = Uri.fromFile(mCameraResult);
@@ -255,7 +255,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
             startActivityForResult(intent, mCropResultCallback);
         } catch (Exception e) {
             try {
-                Uri resultUri = FileProvider.getUriForFile(mContext, "com.newpandora.yo.fileprovider", mCorpResult);
+                Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCorpResult);
                 if (resultUri == null || mFragment == null || mContext == null) {
                     return;
                 }

common/src/main/java/com/yunbao/common/utils/UiConversationCodeUtil.java

@@ -1,195 +0,0 @@
-package com.yunbao.common.utils;
-
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.rong.imkit.conversationlist.model.BaseUiConversation;
-import io.rong.imlib.model.Conversation;
-import io.rong.imlib.model.Message;
-
-public class UiConversationCodeUtil {
-
-
-    public static final int FILTER_OFFLINE = 0;
-    public static final int FILTER_ONLINE = 1;
-    public static final int FILTER_UNREAD = 2;
-    public static final int FILTER_READ = 4;
-    public static final int FILTER_ALL = 7;
-
-
-    public static boolean checkIsSame(List<BaseUiConversation> list1, List<BaseUiConversation> list2) {
-        if (list1.size() != list2.size()) return false;
-        int hashCode1 = getListHasCode(list1);
-        int hashCode2 = getListHasCode(list2);
-        return hashCode1 == hashCode2;
-    }
-
-    public static boolean checkIsSame(int hashCode1, List<BaseUiConversation> list2) {
-        int hashCode2 = getListHasCode(list2);
-        return hashCode1 == hashCode2;
-    }
-
-    public static int getListHasCode(List<BaseUiConversation> list) {
-        int hashCodeValue = 1;
-        if (list == null || list.isEmpty())
-            return 1;
-        for (BaseUiConversation conversation : list) {
-            if (conversation != null) {
-                hashCodeValue = 31 * hashCodeValue + getBaseUiConversationHashCode(conversation);
-            }
-        }
-        return hashCodeValue;
-    }
-
-
-    //根据BaseUiConversation对象的属性计算hashCode
-    private static int getBaseUiConversationHashCode(BaseUiConversation item) {
-        final int prime = 31;
-        int result = 1;
-        Conversation mCore = item.mCore;
-        result = prime * result + ((mCore.getPortraitUrl() == null) ? 0 : mCore.getPortraitUrl().hashCode());
-        result = prime * result + ((mCore.getConversationTitle() == null) ? 0 : mCore.getConversationTitle().hashCode());
-       //  result = prime * result + ((item.mConversationContent == null) ? 0 : item.mConversationContent.hashCode());
-        result = prime * result + (int) (mCore.getSentTime() ^ (mCore.getSentTime() >>> 32));
-        result = prime * result + ((mCore.getDraft() == null) ? 0 : mCore.getDraft().hashCode());
-        result = prime * result + mCore.getUnreadMessageCount();
-
-        Message message = mCore.getMessage();
-        if (message != null) {
-            Message.MessageDirection direction = message.getMessageDirection();
-            if (direction != null) {
-                result = prime * result + direction.hashCode();
-            }
-        }
-
-        result = prime * result + ((mCore.getSentStatus() == null) ? 0 : mCore.getSentStatus().hashCode());
-        result = prime * result + ((mCore.getReceivedStatus() == null) ? 0 : mCore.getReceivedStatus().hashCode());
-        result = prime * result + ((mCore.getTargetId() == null) ? 0 : mCore.getTargetId().hashCode());
-        return result;
-    }
-
-
-private static boolean isContains(List<BaseUiConversation> list, BaseUiConversation item) {
-    // 根据 item.mCore.getChannelId() 判断 list 是否包含
-    if (list == null || list.isEmpty() || item == null || item.mCore == null) {
-        return false;
-    }
-    for (BaseUiConversation conversation : list) {
-        // 增加空值检查
-        if (conversation != null && conversation.mCore != null
-                && conversation.mCore.getTargetId() != null
-                && conversation.mCore.getTargetId().equals(item.mCore.getTargetId())) {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-
-    public static List<BaseUiConversation> FilterData(int filterType, List<BaseUiConversation> keyList,List<BaseUiConversation> srcList) {
-        List<BaseUiConversation> showData = new ArrayList<>();
-        if (keyList == null || keyList.isEmpty())
-            return showData;
-        Log.i("MainConversationListAdapter", "FilterData: 源" + keyList.size());
-        switch (filterType) {
-            case FILTER_ALL:
-                showData = keyList;
-                break;
-            case FILTER_ONLINE:
-                for (BaseUiConversation conversation : srcList) {
-                    if ("0".equals(conversation.mCore.getDraft()) &&  isContains(keyList, conversation)) {
-                        showData.add(conversation);
-                    }
-                }
-                break;
-            case FILTER_OFFLINE:
-                for (BaseUiConversation conversation : keyList) {
-                    if (!"0".equals(conversation.mCore.getDraft())) {
-                        showData.add(conversation);
-                    }
-                }
-                break;
-            case FILTER_READ:
-                for (BaseUiConversation conversation : keyList)
-                    if (conversation.mCore.getMessage() != null && conversation.mCore.getMessage().getMessageDirection() != null) {
-                        if (conversation.mCore.getMessage().getMessageDirection() == Message.MessageDirection.SEND) {
-                            if (conversation.mCore.getSentStatus() == Message.SentStatus.READ) {
-                                showData.add(conversation);
-                            }
-                        }
-                    }
-                break;
-            case FILTER_UNREAD:
-                for (BaseUiConversation conversation : keyList) {
-                    boolean isRead;
-                    if (conversation.mCore.getMessage() != null && conversation.mCore.getMessage().getMessageDirection() != null) {
-                        if (conversation.mCore.getMessage().getMessageDirection() == Message.MessageDirection.SEND) {
-                            if (conversation.mCore.getSentStatus() != Message.SentStatus.READ) {
-                                showData.add(conversation);
-                            }
-                        }
-                    }
-                }
-                break;
-        }
-        Log.i("MainConversationListAdapter", "FilterData: 结果" + showData.size());
-        return showData;
-    }
-
-
-
-
-    public static List<BaseUiConversation> FilterData(int filterType, List<BaseUiConversation> data) {
-        List<BaseUiConversation> showData = new ArrayList<>();
-        if (data == null || data.isEmpty())
-            return showData;
-        Log.i("MainConversationListAdapter", "设置数据源 FilterData: 源" + data.size());
-        switch (filterType) {
-            case FILTER_ALL:
-                showData = data;
-                break;
-            case FILTER_ONLINE:
-                for (BaseUiConversation conversation : data) {
-                    if ("0".equals(conversation.mCore.getDraft())) {
-                        showData.add(conversation);
-                    }
-                }
-                break;
-            case FILTER_OFFLINE:
-                for (BaseUiConversation conversation : data) {
-                    if (!"0".equals(conversation.mCore.getDraft())) {
-                        showData.add(conversation);
-                    }
-                }
-                break;
-            case FILTER_READ:
-                for (BaseUiConversation conversation : data)
-                    if (conversation.mCore.getMessage() != null && conversation.mCore.getMessage().getMessageDirection() != null) {
-                        if (conversation.mCore.getMessage().getMessageDirection() == Message.MessageDirection.SEND) {
-                            if (conversation.mCore.getSentStatus() == Message.SentStatus.READ) {
-                                showData.add(conversation);
-                            }
-                        }
-                }
-                break;
-            case FILTER_UNREAD:
-                for (BaseUiConversation conversation : data) {
-                    if (conversation.mCore.getMessage() != null && conversation.mCore.getMessage().getMessageDirection() != null) {
-                        if (conversation.mCore.getMessage().getMessageDirection() == Message.MessageDirection.SEND) {
-                            if (conversation.mCore.getSentStatus() != Message.SentStatus.READ) {
-                                showData.add(conversation);
-                            }
-                        }
-                    }
-                }
-                break;
-        }
-        Log.i("MainConversationListAdapter", " 设置数据源 FilterData: 结果" + showData.size());
-        return showData;
-    }
-
-
-}

common/src/main/java/com/yunbao/common/utils/VersionUtil.java

@@ -63,7 +63,7 @@ public class VersionUtil {
                             @Override
                             public void onConfirmClick(Dialog dialog, String content) {
                                 Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpandora.yo"));
+                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
                                 context.startActivity(i);
                                 context.finish();
                             }
@@ -85,7 +85,7 @@ public class VersionUtil {
                             @Override
                             public void onConfirmClick(Dialog dialog, String content) {
                                 Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpandora.yo"));
+                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
                                 context.startActivity(i);
                                 context.finish();
                             }

common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java

@@ -128,7 +128,7 @@ public class APKUpdateCustomPopup extends CenterPopupView {
             public void onViewClicks() {
                 if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
                     Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                    i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpandora.yo"));
+                    i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
                     mContext.startActivity(i);
                     mContext.finish();
                 } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {

common/src/main/java/com/yunbao/common/views/DividerItemDecoration.java

@@ -0,0 +1,55 @@
+package com.yunbao.common.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Created by cxf on 2018/1/27.
+ * RecyclerView顶部渐变的itemDecoration
+ */
+
+public class DividerItemDecoration extends RecyclerView.ItemDecoration {
+
+    private Drawable mDivider;
+
+    public DividerItemDecoration(Context context, int dividerHeight, int dividerColor) {
+        // 创建一个带有颜色和高度的Drawable作为分割线  
+        mDivider = new ColorDrawable(dividerColor);
+        // 如果你想让分割线有一定的内边距（比如左右边距），可以使用LayerDrawable或自定义Drawable  
+        // 这里简单起见，我们只设置高度  
+        mDivider.setBounds(0, 0, 0, dividerHeight);
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        drawVertical(c, parent);
+    }
+
+    private void drawVertical(Canvas c, RecyclerView parent) {
+        final int left = parent.getPaddingLeft();
+        final int right = parent.getWidth() - parent.getPaddingRight();
+
+        final int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount - 1; i++) {
+            final View child = parent.getChildAt(i);
+            final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
+            final int top = child.getBottom() + params.bottomMargin;
+            final int bottom = top + mDivider.getIntrinsicHeight();
+
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        if (mDivider == null) return;
+        outRect.set(0, 0, 0, mDivider.getIntrinsicHeight());
+    }
+}

common/src/main/java/com/yunbao/common/views/MsgChatTypeSelectPoPupView.java

@@ -1,122 +0,0 @@
-package com.yunbao.common.views;
-
-import static io.rong.imlib.publicservice.model.PublicServiceMenu.PublicServiceMenuItemType.View;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-
-import com.lxj.xpopup.core.AttachPopupView;
-import com.yunbao.common.R;
-import com.yunbao.common.adapter.MainConversationListAdapter;
-import com.yunbao.common.utils.DpUtil;
-import com.yunbao.common.views.weight.ViewClicksAntiShake;
-
-import org.repackage.com.zui.opendeviceidlibrary.OpenDeviceId;
-
-public class MsgChatTypeSelectPoPupView extends AttachPopupView implements android.view.View.OnClickListener {
-
-    private TextView chatTypeTv1, chatTypeTv2, chatTypeTv3, chatTypeTv4, chatTypeTv5;
-    private ImageView chatTypeImg1, chatTypeImg2, chatTypeImg3, chatTypeImg4, chatTypeImg5;
-
-    private ResultCallBack mResultCallBack;
-    private int lastType;
-
-    public MsgChatTypeSelectPoPupView(@NonNull Context context, int type, ResultCallBack itemDelListener) {
-        super(context);
-        mResultCallBack = itemDelListener;
-        lastType = type;
-    }
-
-
-    @Override
-    protected int getImplLayoutId() {
-        return R.layout.view_msg_select_chat_type;
-    }
-
-    @Override
-    protected void onCreate() {
-
-        // 获取屏幕宽度
-        DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
-        int screenWidth = displayMetrics.widthPixels;
-
-        // 设置弹窗宽度为屏幕宽度的 3/4
-        View view = findViewById(R.id.root);
-        ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
-        layoutParams.width = screenWidth*3/4;
-        view.setLayoutParams(layoutParams);
-
-        chatTypeTv1 = findViewById(R.id.chatTypeTv1);
-        chatTypeImg1 = findViewById(R.id.chatTypeImg1);
-        chatTypeTv2 = findViewById(R.id.chatTypeTv2);
-        chatTypeImg2 = findViewById(R.id.chatTypeImg2);
-        chatTypeTv3 = findViewById(R.id.chatTypeTv3);
-        chatTypeImg3 = findViewById(R.id.chatTypeImg3);
-        chatTypeTv4 = findViewById(R.id.chatTypeTv4);
-        chatTypeImg4 = findViewById(R.id.chatTypeImg4);
-        chatTypeTv5 = findViewById(R.id.chatTypeTv5);
-        chatTypeImg5 = findViewById(R.id.chatTypeImg5);
-
-        chatTypeImg1.setOnClickListener(this);
-        chatTypeImg2.setOnClickListener(this);
-        chatTypeImg3.setOnClickListener(this);
-        chatTypeImg4.setOnClickListener(this);
-        chatTypeImg5.setOnClickListener(this);
-
-        handleChatTypeClick(lastType);
-    }
-
-
-    private void handleChatTypeClick(int type) {
-        switch (type) {
-            case MainConversationListAdapter.FILTER_ALL:
-                chatTypeImg1.setImageResource(R.mipmap.ic_chat_type_select);
-                chatTypeTv1.setTextColor(ContextCompat.getColor(chatTypeTv1.getContext(), R.color.colorMainTab));
-                break;
-            case MainConversationListAdapter.FILTER_ONLINE:
-                chatTypeImg2.setImageResource(R.mipmap.ic_chat_type_select);
-                chatTypeTv2.setTextColor(ContextCompat.getColor(chatTypeTv2.getContext(), R.color.colorMainTab));
-                break;
-            case MainConversationListAdapter.FILTER_OFFLINE:
-                chatTypeImg3.setImageResource(R.mipmap.ic_chat_type_select);
-                chatTypeTv3.setTextColor(ContextCompat.getColor(chatTypeTv3.getContext(), R.color.colorMainTab));
-                break;
-            case MainConversationListAdapter.FILTER_READ:
-                chatTypeImg4.setImageResource(R.mipmap.ic_chat_type_select);
-                chatTypeTv4.setTextColor(ContextCompat.getColor(chatTypeTv4.getContext(), R.color.colorMainTab));
-                break;
-            case MainConversationListAdapter.FILTER_UNREAD:
-                chatTypeImg5.setImageResource(R.mipmap.ic_chat_type_select);
-                chatTypeTv5.setTextColor(ContextCompat.getColor(chatTypeTv5.getContext(), R.color.colorMainTab));
-                break;
-        }
-    }
-
-    @Override
-    public void onClick(android.view.View v) {
-        if (v.getId() == R.id.chatTypeImg1) {
-            mResultCallBack.callBack(MainConversationListAdapter.FILTER_ALL, chatTypeTv1.getText().toString());
-        } else if (v.getId() == R.id.chatTypeImg2) {
-            mResultCallBack.callBack(MainConversationListAdapter.FILTER_ONLINE, chatTypeTv2.getText().toString());
-        } else if (v.getId() == R.id.chatTypeImg3) {
-            mResultCallBack.callBack(MainConversationListAdapter.FILTER_OFFLINE, chatTypeTv3.getText().toString());
-        } else if (v.getId() == R.id.chatTypeImg4) {
-            mResultCallBack.callBack(MainConversationListAdapter.FILTER_READ, chatTypeTv4.getText().toString());
-        } else if (v.getId() == R.id.chatTypeImg5) {
-            mResultCallBack.callBack(MainConversationListAdapter.FILTER_UNREAD, chatTypeTv5.getText().toString());
-        }
-        dismiss();
-    }
-
-
-    public interface ResultCallBack {
-        void callBack(int i, String string);
-    }
-}

common/src/main/res/drawable/bg_main_com_type.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="-45"
-        android:endColor="#EB6FFF"
-        android:startColor="#FF83C6" />
+        android:endColor="#FF0FA4FF"
+        android:startColor="#FF0FA4FF" />
     <corners
         android:bottomLeftRadius="90dp"
         android:bottomRightRadius="90dp"

common/src/main/res/drawable/green_dot.xml

@@ -1,11 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"> <!-- 设置形状为圆形 -->
-
-    <solid android:color="#6DFF7C" /> <!-- 设置填充颜色 -->
-
-    <!-- 可以添加额外的属性如边框等 -->
-    <!-- <stroke
-        android:width="2dp"
-        android:color="#000000" /> -->
-
-</shape>

common/src/main/res/drawable/red_dot.xml

@@ -1,10 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"> <!-- 设置形状为圆形 -->
-
-    <solid android:color="#ffff4874" /> <!-- 设置填充颜色 -->
-
-    <stroke
-        android:width="2dp"
-         android:color="#30ff4874" /> <!-- 设置边框颜色为黑色并带有 70% 的不透明度 (BB 是 alpha 值) -->
-
-</shape>

common/src/main/res/layout/rc_conversation_type_item.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rc_conversation_item"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/chatTypeTv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:layout_weight="1"
-        android:textColor="@color/colorMainTab"
-        tools:text="全部聊天" />
-
-    <ImageView
-        android:id="@+id/chatTypeImg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="20dp"
-        android:src="@mipmap/ic_chat_type_select" />
-
-</LinearLayout>

common/src/main/res/layout/rc_conversationlist_item.xml

@@ -14,6 +14,7 @@
             android:id="@+id/rc_conversation_portrait_rl"
             android:layout_width="48dp"
             android:layout_height="48dp"
+
             android:layout_marginTop="@dimen/rc_margin_size_12"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -26,30 +27,6 @@
                 android:scaleType="centerCrop"
                 android:src="@mipmap/beauty_jingbai" />
 
-            <RelativeLayout
-                android:id="@+id/rc_conversation_unread"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true">
-
-                <ImageView
-                    android:id="@+id/rc_conversation_unread_bg"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="@drawable/rc_unread_count_bg_normal" />
-
-                <TextView
-                    android:id="@+id/rc_conversation_unread_count"
-                    style="@style/TextStyle.Alignment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="15"
-                    android:textColor="@color/rc_white_color"
-                    android:textSize="@dimen/rc_font_auxiliary_size" />
-            </RelativeLayout>
         </RelativeLayout>
 
         <LinearLayout
@@ -179,7 +156,6 @@
             android:layout_marginBottom="@dimen/rc_margin_size_12"
             android:src="@drawable/rc_read_receipt"
             android:visibility="gone"
-            tools:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/rc_conversation_no_disturb"
             app:layout_goneMarginRight="@dimen/rc_margin_size_12" />
@@ -191,6 +167,39 @@
             android:background="@color/rc_divider_color"
             app:layout_constraintStart_toStartOf="@id/rc_conversation_title_layout"
             app:layout_constraintTop_toTopOf="parent" />
+
+
+        <RelativeLayout
+            android:id="@+id/rc_conversation_unread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="20dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="5dp"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="MissingConstraints">
+
+            <ImageView
+                android:id="@+id/rc_conversation_unread_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/rc_unread_count_bg_normal" />
+
+            <TextView
+                android:id="@+id/rc_conversation_unread_count"
+                style="@style/TextStyle.Alignment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="15"
+                android:textColor="@color/rc_white_color"
+                android:textSize="@dimen/rc_font_auxiliary_size" />
+        </RelativeLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

common/src/main/res/layout/rc_conversationlist_item2.xml

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rc_conversation_item"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/rc_conversation_item_height">
-
-    <com.yunbao.common.views.weight.ClipPathCircleImage
-        android:id="@+id/rc_conversation_portrait"
-        android:layout_width="54dp"
-        android:layout_height="54dp"
-        android:layout_marginTop="12dp"
-        android:scaleType="centerCrop"
-        android:src="@mipmap/beauty_jingbai"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/rc_conversation_live_online"
-        android:layout_width="12dp"
-        android:layout_height="12dp"
-        android:layout_marginTop="1dp"
-        android:layout_marginEnd="1dp"
-        android:layout_centerInParent="true"
-        android:src="@drawable/green_dot"
-        app:layout_constraintEnd_toEndOf="@+id/rc_conversation_portrait"
-        app:layout_constraintTop_toTopOf="@+id/rc_conversation_portrait" />
-
-
-    <TextView
-        android:id="@+id/rc_conversation_title"
-        style="@style/TextStyle.Alignment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="4dp"
-        android:ellipsize="end"
-        android:maxWidth="120dp"
-        android:maxLines="1"
-        android:textColor="@color/rc_text_main_color"
-        android:textSize="13dp"
-        app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait"
-        app:layout_constraintTop_toTopOf="@+id/rc_conversation_portrait"
-        tools:text="张三11111111111111111111111" />
-
-    <TextView
-        android:id="@+id/rc_conversation_live_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/bg_main_message_chat_list_live_timer"
-        android:paddingStart="5dp"
-        android:paddingTop="2dp"
-        android:paddingEnd="3dp"
-        android:paddingBottom="3dp"
-        android:singleLine="true"
-        android:textColor="#EC70FD"
-        android:layout_marginStart="12dp"
-        android:textSize="10sp"
-        app:layout_constraintTop_toTopOf="@+id/rc_conversation_title"
-        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_title"
-        app:layout_constraintStart_toEndOf="@+id/rc_conversation_title"
-        android:visibility="gone"
-        tools:text="看直播10min"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/rc_conversation_date"
-        style="@style/TextStyle.Alignment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="3 月 22 日"
-        android:layout_marginEnd="12dp"
-        app:layout_constraintTop_toTopOf="@+id/rc_conversation_title"
-        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_title"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:textColor="@color/rc_auxiliary_color"
-        android:textSize="@dimen/rc_font_nav_or_date_size"
-
-        />
-
-
-    <TextView
-        android:id="@+id/rc_conversation_unread_tv"
-        android:layout_width="wrap_content"
-        android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_portrait"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="@+id/rc_conversation_title"
-        android:ellipsize="end"
-        android:maxLines="1"
-        tools:text="[已读]"
-        app:layout_constraintEnd_toStartOf="@id/rc_conversation_content"
-        android:layout_marginEnd="6dp"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:textColor="@color/rc_secondary_color"
-        android:textSize="13dp" />
-
-
-    <TextView
-        android:id="@+id/rc_conversation_content"
-        style="@style/TextStyle.Alignment"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingEnd="6dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/rc_secondary_color"
-        android:textSize="13dp"
-        app:layout_constraintEnd_toStartOf="@+id/rc_conversation_read_receipt"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@+id/rc_conversation_unread_tv"
-        android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_portrait"
-        tools:text="你好，朋友！111111111111111111111" />
-
-    <TextView
-        android:id="@+id/rc_conversation_unread_count"
-        app:layout_constraintTop_toTopOf="@+id/rc_conversation_content"
-        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_content"
-        app:layout_constraintEnd_toEndOf="@+id/rc_conversation_date"
-        style="@style/TextStyle.Alignment"
-        app:layout_constraintDimensionRatio="1"
-        android:layout_width="18dp"
-        android:gravity="center"
-        android:layout_height="18dp"
-        android:background="@drawable/red_dot"
-        android:text="15"
-        android:textColor="@color/rc_white_color"
-        android:textSize="10sp" />
-
-    <ImageView
-        android:id="@+id/rc_conversation_no_disturb"
-        android:layout_width="wrap_content"
-        android:layout_marginEnd="@dimen/rc_margin_size_2"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@+id/rc_conversation_unread_count"
-        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_unread_count"
-        app:layout_constraintEnd_toStartOf="@+id/rc_conversation_unread_count"
-        android:src="@drawable/rc_no_disturb"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/rc_conversation_read_receipt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/rc_margin_size_2"
-        android:src="@drawable/rc_read_receipt"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_no_disturb"
-        app:layout_constraintEnd_toStartOf="@+id/rc_conversation_no_disturb"
-        app:layout_constraintTop_toTopOf="@+id/rc_conversation_no_disturb"
-        app:layout_constraintVertical_bias="1.0"
-        tools:visibility="visible" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

common/src/main/res/layout/view_msg_select_chat_type.xml

@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:layout_width="200dp"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_white">
-
-    <TextView
-        android:id="@+id/chatTypeTv1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="22dp"
-        android:layout_weight="1"
-        android:text="@string/all_chats"
-        android:textColor="#777777"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:textColor="@color/colorMainTab" />
-
-    <ImageView
-        android:id="@+id/chatTypeImg1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="20dp"
-        android:padding="5dp"
-        android:src="@mipmap/ic_chat_type_unselect"
-        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/chatTypeTv1"
-        tools:src="@mipmap/ic_chat_type_select" />
-
-
-    <TextView
-        android:id="@+id/chatTypeTv2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="22dp"
-        android:layout_weight="1"
-        android:text="@string/online_only"
-        android:textColor="#777777"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv1" />
-
-    <ImageView
-        android:id="@+id/chatTypeImg2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:padding="5dp"
-        android:src="@mipmap/ic_chat_type_unselect"
-        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv2"
-        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
-        app:layout_constraintTop_toTopOf="@+id/chatTypeTv2" />
-
-
-    <TextView
-        android:id="@+id/chatTypeTv3"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="22dp"
-        android:layout_weight="1"
-        android:text="@string/offline_only"
-        android:textColor="#777777"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv2" />
-
-    <ImageView
-        android:id="@+id/chatTypeImg3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:padding="5dp"
-        android:src="@mipmap/ic_chat_type_unselect"
-        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv3"
-        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
-        app:layout_constraintTop_toTopOf="@+id/chatTypeTv3" />
-
-
-    <TextView
-        android:id="@+id/chatTypeTv4"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="22dp"
-        android:layout_weight="1"
-        android:text="@string/read_only"
-        android:textColor="#777777"
-        android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv3" />
-
-    <ImageView
-        android:id="@+id/chatTypeImg4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:padding="5dp"
-        android:src="@mipmap/ic_chat_type_unselect"
-        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv4"
-        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
-        app:layout_constraintTop_toTopOf="@+id/chatTypeTv4" />
-
-
-    <TextView
-        android:id="@+id/chatTypeTv5"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="22dp"
-        android:layout_marginBottom="20dp"
-        android:layout_weight="1"
-        android:text="@string/unread_only"
-        android:textColor="#777777"
-        android:textSize="15sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv4" />
-
-    <ImageView
-        android:id="@+id/chatTypeImg5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:padding="5dp"
-        android:src="@mipmap/ic_chat_type_unselect"
-        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv5"
-        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
-        app:layout_constraintTop_toTopOf="@+id/chatTypeTv5" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

common/src/main/res/values-en-rUS/strings.xml

@@ -256,6 +256,7 @@
     <string name="login_auth_failure">privilege grant failed</string>
     <string name="login_auth_cancle">Authorization cancelled</string>
     <string name="live">Live</string>
+    <string name="community">Community</string>
     <string name="login_tip_4">Log in</string>
     <string name="shopmall">shopmall</string>
     <string name="recomment">Hot</string>
@@ -1474,11 +1475,4 @@ Limited ride And limited avatar frame</string>
     <string name="activity_msg_list_include">Include:</string>
     <string name="message_chat_msg_look_live">看直播%dmin</string>
     <string name="activity_msg_list_title_chat_records">Chat Records</string>
-    <string name="message_chat_msg_read_tip">[Read]</string>
-    <string name="message_chat_msg_unread_tip">[Unread]</string>
-    <string name="all_chats">All Chats</string>
-    <string name="online_only">Show Online </string>
-    <string name="offline_only">Show Offline </string>
-    <string name="read_only">Show Read </string>
-    <string name="unread_only">Show Unread </string>
 </resources>

common/src/main/res/values-zh/strings.xml

@@ -208,6 +208,7 @@
     <string name="login_auth_failure">授權失敗</string>
     <string name="login_auth_cancle">授權取消</string>
     <string name="live">直播</string>
+    <string name="community">社區</string>
     <string name="shopmall">商城</string>
     <string name="cust_server">客服</string>
     <string name="live_anchor">主播</string>
@@ -651,7 +652,7 @@
     <string name="welcome_pdlive">歡迎來到PDLIVE</string>
     <string name="newcomer">恭喜你獲得了新人獎勵</string>
 
-    <string name="FILE_PROVIDER">com.newpandora.yo.fileprovider</string>
+    <string name="FILE_PROVIDER">com.pandora.cs.fileprovider</string>
     <string name="ren">人</string>
     <string name="ge">個</string>
     <string name="count">數量</string>
@@ -1604,11 +1605,5 @@
     <string name="live_end_view_ban_reason">違規原因:</string>
     <string name="live_end_view_ban_content">處罰內容:</string>
     <string name="live_end_view_ban_timer">處罰時間:</string>
-    <string name="message_chat_msg_read_tip">[已讀]</string>
-    <string name="message_chat_msg_unread_tip">[未讀]</string>
-    <string name="all_chats">全部聊天</string>
-    <string name="online_only">僅展示在線</string>
-    <string name="offline_only">僅展示離線</string>
-    <string name="read_only">展示對方已讀</string>
-    <string name="unread_only">展示對方未讀</string>
+
 </resources>

common/src/main/res/values/colors.xml

@@ -78,4 +78,6 @@
     <color name="gray_f6f7fb">#F6F7FB</color>
 
     <color name="gray_F4F4F4">#F4F4F4</color>
+
+    <color name="gray_8A8A8A">#FFEFEFEF</color>
 </resources>

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

@@ -204,6 +204,7 @@
     <string name="login_ing">Logon</string>
     <string name="login_auth_ing">Authorizing login</string>
     <string name="live">Live</string>
+    <string name="community">Community</string>
     <string name="login_tip_4">Log in</string>
     <string name="recomment">Hot</string>
     <string name="main_type_find">Find</string>
@@ -1412,11 +1413,5 @@ Limited ride And limited avatar frame</string>
     <string name="dialog_gift_wall_text_personal_hal">Personal hal</string>
     <string name="dialog_gift_wall_text_site_hal">Whole site hal</string>
     <string name="dialog_gift_wall_text_honors">Honors</string>
-    <string name="message_chat_msg_read_tip">[Read]</string>
-    <string name="message_chat_msg_unread_tip">[Unread]</string>
-    <string name="all_chats">All Chats</string>
-    <string name="online_only">Show Online </string>
-    <string name="offline_only">Show Offline </string>
-    <string name="read_only">Show Read </string>
-    <string name="unread_only">Show Unread </string>
+
 </resources>

config.gradle

@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 600,
+            versionCode      : 550,
             versionName      : "6.8.0",
             namespace        : "com.pandoralive.shayu"
     ]

gradle.properties

@@ -24,6 +24,6 @@ android.nonTransitiveRClass=false
 
 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=10809
-systemProp.http.proxyPort=10809
-android.enableR8.fullMode=true
+systemProp.https.proxyPort=7890
+systemProp.http.proxyPort=7890
+#android.enableR8.fullMode=true

lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java

@@ -422,8 +422,9 @@ public class SWAuManager extends BaseCacheManager {
 
     public void preloadChannel(List<LiveBean> uids){
         for (int i = 0; i <uids.size(); i++) {
+            L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName());
             int code =  mRtcEngine.preloadChannel(CommonAppConfig.SWToken,getChannelName(uids.get(i).getUid()),Integer.parseInt(CommonAppConfig.getInstance().getUid()));
-            L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code);
+            //L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code);
         }
     }
 }

main/google-services.json

@@ -0,0 +1,63 @@
+{
+  "project_info": {
+    "project_number": "867032862719",
+    "project_id": "pdlnew",
+    "storage_bucket": "pdlnew.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
+        "android_client_info": {
+          "package_name": "com.pandora.cs"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pandora.cs",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+          }
+        },
+        {
+          "client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pandora.cs",
+            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
+          }
+        },
+        {
+          "client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pandora.cs",
+            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
+          }
+        },
+        {
+          "client_id": "867032862719-ep4r92lpjmn7gs9tg0r7q0l75a4gm9mt.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAnlY2aBEGyg7QpghHo7EaMRkM89dVNgq8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "867032862719-ep4r92lpjmn7gs9tg0r7q0l75a4gm9mt.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

main/src/main/java/com/yunbao/main/activity/EntryActivity.java

@@ -441,7 +441,7 @@ public class EntryActivity extends AppCompatActivity {
         } else if (loginType == 4) {
             try {
                 // App-to-app login
-                Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), "2006124380", new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
+                Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), "1656399535", new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
                         // .nonce("<a randomly-generated string>") // nonce can be used to improve security
                         .build());
                 startActivityForResult(loginIntent, 1001);

main/src/main/java/com/yunbao/main/activity/GoogleFragment.java

@@ -1,6 +1,8 @@
 package com.yunbao.main.activity;
 
 
+import static com.yunbao.main.activity.MyWalletActivity.dis;
+
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Handler;
@@ -14,17 +16,15 @@ import android.webkit.WebView;
 
 import androidx.fragment.app.Fragment;
 
-import com.android.billingclient.api.Purchase;
+import com.facebook.appevents.AppEventsConstants;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.pay.google.GooglePlay;
+import com.yunbao.common.utils.GoogleUtils;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.main.R;
 import com.yunbao.main.views.TestWebViewClient;
 
-import java.util.List;
-
 @SuppressLint("ValidFragment")
 public class GoogleFragment extends Fragment {
 
@@ -38,7 +38,7 @@ public class GoogleFragment extends Fragment {
     private String url;
     String adid = null;
 
-    private GooglePlay googlePlay;
+    GoogleUtils googleUtils;
 
     boolean isGoogleService = true;
 
@@ -62,16 +62,17 @@ public class GoogleFragment extends Fragment {
         Log.e("ttt", url);
         rlWebview.loadUrl(url);
 
-        googlePlay = GooglePlay.getInstance();
+        googleUtils = new GoogleUtils(getActivity());
 
         // 验证是否已在此设备上安装并启用Google Play服务，以及此设备上安装的旧版本是否为此客户端所需的版本
-        if (googlePlay.getGoogleService()) {
+        if (googleUtils.getGoogleService()) {
             isGoogleService = true;
             // 支持Google服务
+            initGooglePay();
             new Thread() {
                 @Override
                 public void run() {
-                    adid = googlePlay.getAdId();
+                    adid = googleUtils.getAdid();
                 }
             }.start();
         }
@@ -99,6 +100,11 @@ public class GoogleFragment extends Fragment {
 
     String TAG = "GooglePay";
 
+    private void initGooglePay() {
+        googleUtils = new GoogleUtils(getActivity());
+        googleUtils.initGooglePay();
+    }
+
     private Handler payHandler = new Handler();
 
     //js调用原生
@@ -111,31 +117,51 @@ public class GoogleFragment extends Fragment {
                 mProductId = ProductId;
                 mOrderid = OrderNumber;
                 MoneyUsds = MoneyUsd;
-                googlePlay.setBillingListener(new GooglePlay.GoogleBillingListener() {
+
+                googleUtils.setBillingListener(new GoogleUtils.GoogleBillingListener() {
                     @Override
-                    public void onPaySuccess(List<Purchase> purchases) {
-                        Log.i("mLog", "调用谷歌支付成功了  " + purchases.toString());
-                        CommonHttpUtil.notifyGoogle(purchases.get(0).getPurchaseToken(),
-                                purchases.get(0).getProducts().get(0), new HttpCallback() {
+                    public void onPaySuccess(String token, String orderId) {
+                        payHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                CommonHttpUtil.notifyGoogle(token, orderId, mProductId, mOrderid, adid, new HttpCallback() {
                                     @Override
                                     public void onSuccess(int code, String msg, String[] info) {
                                         if (code == 0) {
-                                            googlePlay.consume(purchases);
-                                            getActivity().finish();
+                                            Bundle params = new Bundle();
+                                            params.putString("currency", "HKD");
+                                            params.putString("money", MoneyUsds);
+                                            Bundle fb_params = new Bundle();
+                                            fb_params.putString(AppEventsConstants.EVENT_PARAM_CURRENCY, "HKD");
+                                            fb_params.putString(AppEventsConstants.EVENT_PARAM_CONTENT_ID, mProductId);
+                                            //Google官方充值通知
+                                            Bundle google_params = new Bundle();
+                                            google_params.putString("currency", "HKD");
+                                            google_params.putString("product_id", mProductId);
+                                            google_params.putString("transaction_id", mOrderid);
+                                            google_params.putString("value", MoneyUsds);
+                                            google_params.putString("price", MoneyUsds);
+                                            google_params.putString("quantity", "1");
+                                            dis();
                                             ToastUtil.show(getString(R.string.pay_suc));
-                                        } else {
-                                            ToastUtil.show(msg);
                                         }
                                     }
                                 });
+                            }
+                        });
                     }
 
                     @Override
                     public void onPayFailed(String msg) {
-                        ToastUtil.show(msg);
+                        payHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                ToastUtil.show(msg);
+                            }
+                        });
                     }
                 });
-                googlePlay.purchase(getActivity(), mOrderid, mProductId);
+                googleUtils.purchase(mProductId);
             }
             lastClickTime = currentTime;
 

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -551,7 +551,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 
         //选中监听
         mTabButtonGroup.addTabButtonGroupChangeListener((view, index) -> {
-            if (index == 1) {
+            if (index == 0) {
                 isfloatBannernet = true;
                 initAnchorRecommendBanner();
             } else if (index == 2) {
@@ -875,8 +875,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             //RandomPkDialogFragment fragment = new RandomPkDialogFragment();
             //fragment.show(this.getSupportFragmentManager(), "RandomPkDialogFragment");
         }
-
-
     }
 
     private void showStartDialog() {
@@ -904,7 +902,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                 }
             });
         }
-
     }
 
 
@@ -1281,13 +1278,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                     return;
                 }
                 if (position == 0) {
-                    mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
-                    vh = mainHomeComViewHolder;
-                } else if (position == 1) {
-                    mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
+                     mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
                     vh = mainHomeViewHolder;
-                   /* mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
+                    /*mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
+                    vh = mainHomeComViewHolder;*/
+                } else if (position == 1) {
+                    /*mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
+                    vh = mainHomeViewHolder;*/
+                  /*  mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
                     vh = mMainHomeCommunityViewHolder;*/
+                       mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
+                    vh = mainHomeComViewHolder;
                 } else if (position == 2) {
                     mainMessageViewHolder = new MainMessageViewHolder(this, parent);
                     vh = mainMessageViewHolder;

main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java

@@ -18,18 +18,17 @@ import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.fragment.LoadingDialog;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.manager.IMLoginManager;
-import com.yunbao.common.pay.google.GooglePlay;
 import com.yunbao.common.pay.hw.HwBuilder;
 import com.yunbao.common.pay.samsung.SamsungUtil;
 import com.yunbao.common.utils.GoogleUtils;
 import com.yunbao.common.utils.L;
-import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.main.R;
@@ -63,7 +62,7 @@ public class MyWalletActivity extends AbsActivity {
     public static String orderId;
 
     HwBuilder hwBuilder;
-    private GooglePlay googlePlay;
+    GoogleUtils googleUtils;
 
     LoadingDialog loadingDialog;
     SamsungUtil samsungUtil;
@@ -79,15 +78,17 @@ public class MyWalletActivity extends AbsActivity {
         mw = MyWalletActivity.this;
         setTitle(mContext.getString(R.string.wallet));
 
-        if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
+            googleUtils = new GoogleUtils(mContext);
+            googleUtils.initGooglePay();
+        } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
             hwBuilder = new HwBuilder(MyWalletActivity.this);
         } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
             samsungUtil = SamsungUtil.newInstance(mContext);
             samsungUtil.init();
-        } else {
-            googlePlay = GooglePlay.getInstance();
-            //消耗所有商品
-            googlePlay.consumeAll();
+        }else{
+            googleUtils = new GoogleUtils(mContext);
+            googleUtils.initGooglePay();
         }
 
 
@@ -103,8 +104,50 @@ public class MyWalletActivity extends AbsActivity {
             loadingDialog.setShowText(getString(R.string.order_query));
 
             if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
-                //消耗所有商品
-                googlePlay.consumeAll();
+                googleUtils.setQueryPurchaseListener(mContext, new GoogleUtils.QueryPurchasesListener() {
+                    @Override
+                    public void onResult(JSONObject obj) {
+                        try {
+                            int code = obj.getInt("querySize");
+                            if (code == 0) {
+                                payHandler.post(runnable1);
+                                payHandler.postDelayed(runnable2, 1000);
+                            } else {
+                                JSONArray tokenList = obj.getJSONArray("tokenList");
+                                JSONArray orderList = obj.getJSONArray("orderList");
+                                String tradeNo = obj.getString("tradeNo");
+
+                                for (int i = 0; i < tokenList.length(); i++) {
+                                    int finalI = i;
+                                    payHandler.post(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            //谷歌掉单处理
+                                            try {
+                                                CommonHttpUtil.Google_sec_pay(tokenList.getString(finalI), orderList.getString(finalI), tradeNo, new HttpCallback() {
+                                                    @Override
+                                                    public void onSuccess(int code, String msg, String[] info) {
+                                                        if (finalI == tokenList.length() - 1) {
+                                                            loadingDialog.setShowText(getString(R.string.order_query_success));
+                                                            loadingDialog.dismiss();
+                                                        }
+                                                        ToastUtil.show("充值已到账");
+                                                        finish();
+                                                    }
+                                                });
+                                            } catch (JSONException e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+                                    });
+                                }
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+                googleUtils.queryPurchasesAsync();
             } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
                 hwBuilder.consume();
                 payHandler.post(runnable1);
@@ -143,12 +186,12 @@ public class MyWalletActivity extends AbsActivity {
 
                 googleFragment1 = new GoogleFragment();
                 Bundle bundle1 = new Bundle();
-                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 googleFragment1.setArguments(bundle1);
 
                 googleFragment2 = new GoogleFragment();
                 Bundle bundle2 = new Bundle();
-                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 googleFragment2.setArguments(bundle2);
             } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
                 //华为
@@ -160,12 +203,12 @@ public class MyWalletActivity extends AbsActivity {
 
                 huaWeiFragment1 = new HuaWeiFragment();
                 Bundle bundle1 = new Bundle();
-                bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo");
+                bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
                 huaWeiFragment1.setArguments(bundle1);
 
                 huaWeiFragment2 = new HuaWeiFragment();
                 Bundle bundle2 = new Bundle();
-                bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo");
+                bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
                 huaWeiFragment2.setArguments(bundle2);
             } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
 
@@ -228,12 +271,12 @@ public class MyWalletActivity extends AbsActivity {
 
                 huaWeiFragment1 = new HuaWeiFragment();
                 Bundle bundle1 = new Bundle();
-                bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo");
+                bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
                 huaWeiFragment1.setArguments(bundle1);
 
                 huaWeiFragment2 = new HuaWeiFragment();
                 Bundle bundle2 = new Bundle();
-                bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo");
+                bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
                 huaWeiFragment2.setArguments(bundle2);
             } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
                 rView.setVisibility(View.VISIBLE);
@@ -244,12 +287,12 @@ public class MyWalletActivity extends AbsActivity {
 
                 samsungFragment1 = new SamsungFragment();
                 Bundle bundle1 = new Bundle();
-                bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 samsungFragment1.setArguments(bundle1);
 
                 samsungFragment2 = new SamsungFragment();
                 Bundle bundle2 = new Bundle();
-                bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 samsungFragment2.setArguments(bundle2);
             } else {
                 Log.i("tss", "不是首充");
@@ -257,17 +300,17 @@ public class MyWalletActivity extends AbsActivity {
 
                 walletFragment = new WalletFragment();
                 Bundle bundle = new Bundle();
-                bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 walletFragment.setArguments(bundle);
 
                 googleFragment1 = new GoogleFragment();
                 Bundle bundle1 = new Bundle();
-                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 googleFragment1.setArguments(bundle1);
 
                 googleFragment2 = new GoogleFragment();
                 Bundle bundle2 = new Bundle();
-                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 googleFragment2.setArguments(bundle2);
             }
         }
@@ -448,7 +491,7 @@ public class MyWalletActivity extends AbsActivity {
 
 
             } catch (JSONException e) {
-                throw new RuntimeException(e);
+                e.printStackTrace();
             }
 
         }

main/src/main/java/com/yunbao/main/adapter/MainHomeComClassAdapter.java

@@ -94,13 +94,10 @@ public class MainHomeComClassAdapter extends RecyclerView.Adapter<MainHomeComCla
             } else {
                 mName.setText(bean.getTalk_name());
             }
-
             if (position == choice) {
-                mName.setBackgroundResource(R.drawable.bg_main_community_type_01);
-                mName.setTextColor(Color.parseColor("#FFFFFF"));
+                mName.setTextColor(Color.parseColor("#FF0FA4FF"));
             } else {
-                mName.setBackgroundResource(R.drawable.bg_main_community_type_02);
-                mName.setTextColor(Color.parseColor("#777777"));
+                mName.setTextColor(Color.parseColor("#FF777777"));
             }
         }
     }

main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java

@@ -67,10 +67,13 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
 
     @Override
     public int getItemViewType(int position) {
-        if (position == 0) {
+        if (position == 4) {
             return HEAD;
-        } else if (position > 0) {
-            LiveBean mode = mList.get(position - 1);
+        } else{
+            if(position>4){
+
+            }
+            LiveBean mode = mList.get(position>4?position-1:position);
             if (TextUtils.equals(mode.getIs_week(), "1")) {
                 return WEEKLAYOUT;
             } else {
@@ -114,8 +117,9 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) {
+        int nowPosition = position>4?position-1:position;
         if (vh instanceof MainHomeLiveWeekItemViewHolder) {
-            ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
+            ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
                 @Override
                 public void onItemClick(LiveBean bean, int position) {
                     if (mOnItemClickListener != null) {
@@ -124,7 +128,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
                 }
             });
         } else if (vh instanceof MainHomeLiveItemViewHolder) {
-            ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
+            ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
                 @Override
                 public void onItemClick(LiveBean bean, int position) {
                     if (mOnItemClickListener != null) {
@@ -137,7 +141,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
 
     @Override
     public int getItemCount() {
-        return super.getItemCount() + 1;
+        return super.getItemCount();
     }
 
     class HeadVh extends RecyclerView.ViewHolder {

main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java

@@ -96,11 +96,9 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLive
             }
 
             if (position == choice) {
-                mName.setBackgroundResource(R.drawable.button_ffc621);
-                mName.setTextColor(Color.parseColor("#7d77fc"));
+                mName.setTextColor(Color.parseColor("#FF0FA4FF"));
             } else {
-                mName.setBackgroundResource(R.drawable.button_cbd5e0);
-                mName.setTextColor(Color.parseColor("#484D68"));
+                mName.setTextColor(Color.parseColor("#FF777777"));
             }
         }
     }

main/src/main/java/com/yunbao/main/adapter/MainMeBottomAdapter.java

@@ -0,0 +1,130 @@
+package com.yunbao.main.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.UserItemBean;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+import com.yunbao.main.R;
+
+import java.util.List;
+
+/**
+ * Created by cxf on 2018/9/28.
+ */
+
+public class MainMeBottomAdapter extends RecyclerView.Adapter<MainMeBottomAdapter.Vh> {
+
+    private static final int NORMAL = 0;
+    private static final int GROUP_LAST = 1;
+    private static final int ALL_LAST = 2;
+
+    private Context mContext;
+    private List<UserItemBean> mList;
+    private LayoutInflater mInflater;
+    private OnItemClickListener<UserItemBean> mOnItemClickListener;
+
+    public MainMeBottomAdapter(Context context, List<UserItemBean> list) {
+        mContext = context;
+        mList = list;
+        mInflater = LayoutInflater.from(context);
+    }
+
+    public void setOnItemClickListener(OnItemClickListener<UserItemBean> onItemClickListener) {
+        mOnItemClickListener = onItemClickListener;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        UserItemBean bean = mList.get(position);
+        if (bean.isGroupLast()) {
+            return GROUP_LAST;
+        } else if (bean.isAllLast()) {
+            return ALL_LAST;
+        } else {
+            return NORMAL;
+        }
+    }
+
+
+    public void setList(List<UserItemBean> list) {
+        if (list == null) {
+            return;
+        }
+        boolean changed = false;
+        if (mList.size() != list.size()) {
+            changed = true;
+        } else {
+            for (int i = 0, size = mList.size(); i < size; i++) {
+                if (!mList.get(i).equals(list.get(i))) {
+                    changed = true;
+                    break;
+                }
+            }
+        }
+        if (changed) {
+            mList = list;
+            notifyDataSetChanged();
+        }
+    }
+
+    @NonNull
+    @Override
+    public Vh onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        int res = 0;
+//        if (viewType == GROUP_LAST) {
+//            res = R.layout.item_main_me_1;//竖向单列表
+//        } else if (viewType == ALL_LAST) {
+        res = R.layout.item_main_me_3;//横向4列
+//        } else {
+//            res = R.layout.item_main_me_0;
+//        }
+        return new Vh(mInflater.inflate(res, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull Vh vh, int position) {
+        vh.setData(mList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList.size();
+    }
+
+    class Vh extends RecyclerView.ViewHolder {
+
+        ImageView mThumb;
+        TextView mName;
+
+        public Vh(View itemView) {
+            super(itemView);
+            mThumb = (ImageView) itemView.findViewById(R.id.thumb);
+            mName = (TextView) itemView.findViewById(R.id.name);
+            ViewClicksAntiShake.clicksAntiShake(itemView, () -> {
+                Object tag = itemView.getTag();
+                if (tag != null) {
+                    UserItemBean bean = (UserItemBean) tag;
+                    if (mOnItemClickListener != null) {
+                        mOnItemClickListener.onItemClick(bean, 0);
+                    }
+                }
+            });
+        }
+
+        void setData(UserItemBean bean) {
+            itemView.setTag(bean);
+            ImgLoader.display(mContext, bean.getThumb(), mThumb);
+            mName.setText(bean.getName());
+        }
+    }
+}

main/src/main/java/com/yunbao/main/http/MainHttpUtil.java

@@ -51,7 +51,7 @@ public class MainHttpUtil {
                 .params("pushid", "")
                 .params("lastlogindevice", "Android")
                 .params("uuid_Device", uuid)
-                .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("langue", WordUtil.isNewZh() ? "chinese" : "english")
                 .execute(callback);
 
     }
@@ -85,7 +85,7 @@ public class MainHttpUtil {
      * 第三方登录---增加参数：推广码,手机唯一标识
      */
 
-    public static void loginByThird(String UserID,String openid, String promoCode, String uuidDevice, String nicename, String avatar, String type, HttpCallback callback) {
+    public static void loginByThird(String UserID, String openid, String promoCode, String uuidDevice, String nicename, String avatar, String type, HttpCallback callback) {
         String sign = MD5Util.getMD5("openid=" + openid + "&" + SALT);
         String appSource = "2";
         if (CommonAppConfig.IS_GOOGLE_PLAY == 0) {
@@ -106,7 +106,7 @@ public class MainHttpUtil {
                 .params("sign", sign)
                 .params("lastlogindevice", "Android")
                 .params("pushid", "")
-                .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("langue", WordUtil.isNewZh() ? "chinese" : "english")
                 .execute(callback);
     }
 
@@ -255,6 +255,7 @@ public class MainHttpUtil {
      */
     public static void getBaseInfo(String uid, String token, final CommonCallback<UserBean> commonCallback) {
         HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
+                .params("is_pdl", "1")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {
@@ -265,7 +266,7 @@ public class MainHttpUtil {
                             bean.setMedalName(obj.getString("medal_name"));
                             bean.setMedalLevel(obj.getIntValue("medal_level"));
                             CommonAppConfig.getInstance().setUserBean(bean);
-                            CommonAppConfig.getInstance().setUserItemList(obj.getString("list"));
+                            CommonAppConfig.getInstance().setUserItemList(obj.getString("pdl_list"));
                             SpUtil.getInstance().setStringValue(SpUtil.USER_INFO, info[0]);
                             if (commonCallback != null) {
                                 commonCallback.callback(bean);
@@ -338,7 +339,7 @@ public class MainHttpUtil {
     public static void getSettingList(HttpCallback callback) {
         HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST)
                 .params("version", VersionUtil.getVersion())
-                .params("package_name","panduo")
+                .params("package_name", "panduo")
                 .execute(callback);
     }
 
@@ -352,10 +353,11 @@ public class MainHttpUtil {
                 .params("p", p)
                 .execute(callback);
     }
+
     /**
      * 搜索
      */
-    public static void searchnew(String fan_key, String jian_key,int type, int p, HttpCallback callback) {
+    public static void searchnew(String fan_key, String jian_key, int type, int p, HttpCallback callback) {
         HttpClient.getInstance().get("", MainHttpConsts.SEARCH)
                 .params("jian_key", jian_key)
                 .params("fan_key", fan_key)
@@ -514,7 +516,7 @@ public class MainHttpUtil {
                 .params("mobile", mobile)
                 .params("sign", sign)
                 .params("source", "1")
-                .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("langue", WordUtil.isNewZh() ? "chinese" : "english")
                 .execute(callback);
     }
 
@@ -537,7 +539,7 @@ public class MainHttpUtil {
                 .params("MacAddress", macUitl.getNewMac())
                 .params("Imei", uuid)
                 .params("source", "1")
-                .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("langue", WordUtil.isNewZh() ? "chinese" : "english")
                 .execute(callback);
     }
 
@@ -585,7 +587,7 @@ public class MainHttpUtil {
     /**
      * 手机注册接口---增加参数：推广码,手机唯一标识,国家代码
      */
-    public static void register(String UserID,String invitecode, String user_login, String promo_code, String uuidDevice, int countryCode, String pass, String pass2, String code, HttpCallback callback) {
+    public static void register(String UserID, String invitecode, String user_login, String promo_code, String uuidDevice, int countryCode, String pass, String pass2, String code, HttpCallback callback) {
         String appSource = "2";
         if (CommonAppConfig.IS_GOOGLE_PLAY == 0) {
             appSource = "2";
@@ -608,7 +610,7 @@ public class MainHttpUtil {
                 .params("code", code)
                 .params("source", DEVICE)
                 .params("invitation_code", invitecode)
-                .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("langue", WordUtil.isNewZh() ? "chinese" : "english")
                 .execute(callback);
     }
 
@@ -621,7 +623,7 @@ public class MainHttpUtil {
                 .params("user_pass", pass)
                 .params("user_pass2", pass2)
                 .params("code", code)
-                .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("langue", WordUtil.isNewZh() ? "chinese" : "english")
                 .execute(callback);
     }
 
@@ -647,7 +649,7 @@ public class MainHttpUtil {
                 .params("mobile", mobile)
                 .params("country_code", country_code)
                 .params("source", "1")
-                .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("langue", WordUtil.isNewZh() ? "chinese" : "english")
                 .execute(callback);
     }
 
@@ -702,7 +704,6 @@ public class MainHttpUtil {
     }
 
 
-
     /**
      * 是否是主播
      */
@@ -742,9 +743,10 @@ public class MainHttpUtil {
         HttpClient.getInstance().get("User.isInstructor", MainHttpConsts.ISINSTRUCTOR)
                 .execute(callback);
     }
-        //
-    public static void setMessageReadAll(){
-        HttpClient.getInstance().get("User.getUserInstructor","")
+
+    //
+    public static void setMessageReadAll() {
+        HttpClient.getInstance().get("User.getUserInstructor", "")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {
@@ -752,10 +754,11 @@ public class MainHttpUtil {
                     }
                 });
     }
+
     /**
      * 获取设备号有没有注册过
      */
-    public static void getDeviceLoginType( HttpCallback callback) {
+    public static void getDeviceLoginType(HttpCallback callback) {
         HttpClient.getInstance().get("Login.getDeviceLoginType", "Login.getDeviceLoginType")
                 .params("uuid_Device", DeviceUtils.getUniqueDeviceId())
                 .execute(callback);

main/src/main/java/com/yunbao/main/views/AbsMainHomeParentViewHolder.java

@@ -44,7 +44,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
 
     private AppBarLayout mAppBarLayout;
     protected ViewPager mViewPager;
-    private MagicIndicator mIndicator;
+    public MagicIndicator mIndicator;
     private TextView mRedPoint;//显示未读消息数量的红点
     protected AbsMainHomeChildViewHolder[] mViewHolders;
     private MainAppBarLayoutListener mAppBarLayoutListener;
@@ -138,8 +138,8 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
             @Override
             public IPagerTitleView getTitleView(Context context, final int index) {
                 SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
-                simplePagerTitleView.setNormalColor(Color.parseColor("#B1B1B1"));
-                simplePagerTitleView.setSelectedColor(Color.parseColor("#7d77fc"));
+                simplePagerTitleView.setNormalColor(Color.parseColor("#FF777777"));
+                simplePagerTitleView.setSelectedColor(Color.parseColor("#FF333333"));
                 simplePagerTitleView.setText(titles[index]);
                 simplePagerTitleView.setTextSize(18);
                 simplePagerTitleView.getPaint().setFakeBoldText(true);
@@ -160,7 +160,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
                 linePagerIndicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
                 linePagerIndicator.setXOffset(DpUtil.dp2px(5));
                 linePagerIndicator.setRoundRadius(DpUtil.dp2px(2));
-                linePagerIndicator.setColors(Color.parseColor("#7d77fc"));
+                linePagerIndicator.setColors(Color.parseColor("#FF0FA4FF"));
                 return linePagerIndicator;
             }
         });

main/src/main/java/com/yunbao/main/views/MainHomeComViewHolder.java

@@ -30,7 +30,7 @@ import org.greenrobot.eventbus.EventBus;
  * MainActivity 首页-社区
  */
 
-public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
+public class MainHomeComViewHolder extends AbsMainHomeParentViewHolder {
     private MainHomeFollComViewHolder mainHomeFollLiveViewHolder;
     private MainHomeNewViewHolder mainHomeLiveViewHolder;
     private MainHomeRecomComViewHolder mainHomeRecomComViewHolder;
@@ -115,11 +115,11 @@ public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
             RouteUtil.forwardCommunityActivity();
             mIndicator.onPageSelected(selected);
             setCurPosition(selected);
-            refreshIndex(selected);
+            //refreshIndex(selected);
             return;
         }
         selected = position;
-        refreshIndex(position);
+        //refreshIndex(position);
         switch (position) {
             case 0:
                 floatWarOrder = false;

main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java

@@ -163,7 +163,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
         gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                if (position == 0) {
+                if (position == 4) {
                     return 2;
                 }
                 return 1;

main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java

@@ -1,6 +1,11 @@
 package com.yunbao.main.views;
 
+import static com.yunbao.common.manager.imrongcloud.RongcloudIMManager.connectIM;
+
+import android.Manifest;
+import android.app.Dialog;
 import android.content.Context;
+import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -8,18 +13,42 @@ import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentActivity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.lxj.xpopup.XPopup;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.Constants;
 import com.yunbao.common.dialog.MessageSayHiNotifyDialog;
+import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.event.FloatWarOrderEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.MessageSayHiNotifyManager;
+import com.yunbao.common.utils.PluginManager;
+import com.yunbao.common.utils.ProcessResultUtil;
 import com.yunbao.common.utils.RouteUtil;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
+import com.yunbao.live.LiveConfig;
+import com.yunbao.live.activity.LiveAnchorActivity;
+import com.yunbao.live.activity.LiveRyAnchorActivity;
+import com.yunbao.live.activity.LiveSwAnchorActivity;
+import com.yunbao.live.bean.LiveKsyConfigBean;
 import com.yunbao.main.R;
+import com.yunbao.main.activity.MainActivity;
+import com.yunbao.main.dialog.MainStartDialogFragment;
 
 import org.greenrobot.eventbus.EventBus;
 
+import io.rong.imlib.RongIMClient;
+
 /**
  * Created by cxf on 2018/9/22.
  * MainActivity 首页  删除
@@ -52,6 +81,8 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
     public void init() {
         super.init();
 
+        mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
+
         img_trophy = (ImageView) findViewById(R.id.img_trophy);
 
         ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);
@@ -69,8 +100,102 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
                 RouteUtil.forwardCommunityActivity();
             }
         });
+        findViewById(R.id.btn_live).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType();
+                if (isAnchor) {
+                    String[] permissions;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        permissions = new String[]{
+                                //Manifest.permission.READ_MEDIA_IMAGES, 去掉选择图片的权限，到里面选择封面的时候再去申请
+                                Manifest.permission.CAMERA,
+                                Manifest.permission.RECORD_AUDIO
+                        };
+                    } else {
+                        permissions = new String[]{
+                                Manifest.permission.READ_EXTERNAL_STORAGE,
+                                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                Manifest.permission.CAMERA,
+                                Manifest.permission.RECORD_AUDIO
+                        };
+                    }
+                    mProcessResultUtil.requestPermissions(permissions, mStartLiveRunnable);
+                } else {
+                    ToastUtil.show(mContext.getString(R.string.only_open_anchor));
+                }
+            }
+        });
     }
 
+    private Runnable mStartLiveRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (CommonAppConfig.LIVE_SDK_CHANGED) {
+                if (mGetLiveSdkCallback == null) {
+                    mGetLiveSdkCallback = new HttpCallback() {
+                        @Override
+                        public void onSuccess(int code, String msg, final String[] info) {
+                            if (code == 0 && info.length > 0) {
+                                LiveHttpUtil.getisRong(new HttpCallback() {
+                                    @Override
+                                    public void onSuccess(int code, String msg, String[] info1) {
+                                        try {
+                                            LiveHttpUtil.getIsSw(new HttpCallback() {
+                                                @Override
+                                                public void onSuccess(int code, String msg, String[] infos) {
+                                                    JSONObject obj = JSON.parseObject(info[0]);
+                                                    JSONObject obj1 = JSON.parseObject(info1[0]);
+                                                    try {
+                                                        if(code==201){ //声网
+                                                            LiveSwAnchorActivity.forward(mContext, Constants.LIVE_SDK_SW, JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
+                                                        }else if(code==200){//融云
+                                                            LiveRyAnchorActivity.forward(mContext, obj.getIntValue("live_sdk"), JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
+                                                        }
+                                                    } catch (Exception e) {
+
+                                                    }
+                                                }
+                                            });
+                                        } catch (Exception e) {
+
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    };
+                }
+                if (!CommonAppConfig.IS_PLUGIN_MODEL || PluginManager.getInstance().isDownloadApk()) {
+                    PluginManager.getInstance().loadAnchorPlugin(it -> {
+                        LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
+                    });
+                } else {
+                    String tips = "需要下載開播插件，是否下載";
+                    if (!WordUtil.isNewZh()) {
+                        tips = "You need to download the plug-in, whether to download";
+                    }
+                    DialogUitl.showSimpleDialog(mContext, tips, new DialogUitl.SimpleCallback() {
+                        @Override
+                        public void onConfirmClick(Dialog dialog, String content) {
+                            Dialog downloadDialog = DialogUitl.loadingDialog(mContext, "Downloading...");
+                            downloadDialog.show();
+                            PluginManager.getInstance().loadAnchorPlugin(it -> {
+                                LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
+                                downloadDialog.dismiss();
+                            });
+                        }
+                    });
+                }
+            } else {
+                LiveAnchorActivity.forward(mContext, CommonAppConfig.LIVE_SDK_USED, LiveConfig.getDefaultKsyConfig());
+            }
+        }
+    };
+
+    private HttpCallback mGetLiveSdkCallback;
+    private ProcessResultUtil mProcessResultUtil;
+
     public void setCurPosition(int position) {
         mViewPager.setCurrentItem(position);
     }

main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.fastjson.JSON;
@@ -51,6 +52,7 @@ import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
+import com.yunbao.common.views.DividerItemDecoration;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.activity.LiveRecordActivity;
 import com.yunbao.live.activity.RoomManageActivity;
@@ -70,6 +72,7 @@ import com.yunbao.main.activity.SettingActivity;
 import com.yunbao.main.activity.ThreeDistributActivity;
 import com.yunbao.main.activity.ZhuangBanActivity;
 import com.yunbao.main.adapter.MainMeAdapter;
+import com.yunbao.main.adapter.MainMeBottomAdapter;
 import com.yunbao.main.http.MainHttpConsts;
 import com.yunbao.main.http.MainHttpUtil;
 
@@ -101,7 +104,9 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
     private TextView mFans;
     private boolean mPaused;
     private RecyclerView mRecyclerView;
+    private RecyclerView bottomRecyclerView;
     private MainMeAdapter mAdapter;
+    private MainMeBottomAdapter mainMeBottomAdapter;
     private TextView signature;
     private TextView coin, gold, star_coin;//金豆,钻石,星币
     private TextView btnCopy;
@@ -193,6 +198,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false));
+
         banner_me.setOutlineProvider(new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {
@@ -206,6 +212,11 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                 mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
             }
         });
+
+        bottomRecyclerView = findViewById(R.id.bottomRecyclerView);
+        bottomRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
+        bottomRecyclerView.addItemDecoration(new DividerItemDecoration(mContext,1,mContext.getColor(R.color.gray_8A8A8A)));
+
     }
 
     @Override
@@ -289,15 +300,16 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         @Override
         public void callback(UserBean bean) {
             List<UserItemBean> list = CommonAppConfig.getInstance().getUserItemList();
+            List<UserItemBean> newList = CommonAppConfig.getInstance().getUserItemNewList();
             if (bean != null) {
-                showData(bean, list);
+                showData(bean, list,newList);
             }
         }
     };
 
     private List<SlideBean> mBannerListNew = new ArrayList<>();
 
-    private void showData(UserBean u, List<UserItemBean> list) {
+    private void showData(UserBean u, List<UserItemBean> list,List<UserItemBean> newList) {
         mBannerList.clear();
         mBannerListNew.clear();
         if (!StringUtil.isEmpty(u.getSlide())) {
@@ -364,7 +376,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             good_nub_ico.setImageResource(R.mipmap.usercard_good_nub);
 
 
-            ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic);
+            //ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic);
             //主播等级
             tv_level.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -427,6 +439,14 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             } else {
                 mAdapter.setList(listNow);
             }
+
+            if (mainMeBottomAdapter == null) {
+                mainMeBottomAdapter = new MainMeBottomAdapter(mContext, newList);
+                mainMeBottomAdapter.setOnItemClickListener(this);
+                bottomRecyclerView.setAdapter(mainMeBottomAdapter);
+            } else {
+                mainMeBottomAdapter.setList(newList);
+            }
         }
         if (beanKefu != null) {
         }
@@ -437,11 +457,11 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         Constants.myUid = u.getGoodnum();
         Constants.myAvatar = u.getAvatar();
         if (u.getUserInfoComplete() == 1) {
-            findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE);
-            findViewById(R.id.complete_information).setVisibility(View.INVISIBLE);
+            //findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE);
+            //findViewById(R.id.complete_information).setVisibility(View.INVISIBLE);
         } else {
-            findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE);
-            findViewById(R.id.complete_information).setVisibility(View.VISIBLE);
+            //findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE);
+            //findViewById(R.id.complete_information).setVisibility(View.VISIBLE);
         }
         EventBus.getDefault().post(new CompleteInformationEvent().setCompleteInformation(findViewById(R.id.complete_information).getVisibility() == View.VISIBLE));
     }
@@ -472,6 +492,20 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                 case 17:
                     RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
                     break;
+                case 66:
+                    MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族");
+                    Constants.isTitle = true;
+                    UserBean u = CommonAppConfig.getInstance().getUserBean();
+                    String url1 = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+                    ZhuangBanActivity.forward(mContext, url1, false);
+                    break;
+                case 67:
+                    MobclickAgent.onEvent(mContext, "my_guard_btn", "我的-守护点击次数及人数");
+                    Constants.isTitle = true;
+                    String url2 = CommonAppConfig.HOST + "/h5/Guard/index.html?token=" + CommonAppConfig.getInstance().getToken()
+                            + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+                    ZhuangBanActivity.forward(mContext, url2, false);
+                    break;
             }
         } else {
             //21 在线客服
@@ -638,7 +672,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             lt_advertisement.setVisibility(View.GONE);
             return;
         }
-        lt_advertisement.setVisibility(View.VISIBLE);
+        /*lt_advertisement.setVisibility(View.VISIBLE);
         if (mBannerList.size() == 1) {
             banner_me.setAutoPlay(false)
                     .setPages(mBannerList, new CustomMyViewHolder())
@@ -685,18 +719,18 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                                         map_ekv.put("link", url);
                                         MobclickAgent.onEvent(mContext, "my_banner", map_ekv);
 
-                                        /*if(bean.getSlide_id().equals("95")){
+                                        *//*if(bean.getSlide_id().equals("95")){
                                             RouteUtil.forwardCustomerService(url);
                                         }else {
                                             ZhuangBanActivity.forward(mContext, url, false);
-                                        }*/
+                                        }*//*
                                     }
                                 }
                             }
                         }
                     })
                     .start();
-        }
+        }*/
     }
 
 }

main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java

@@ -1,502 +0,0 @@
-package com.yunbao.main.views;
-
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.opensource.svgaplayer.SVGADrawable;
-import com.opensource.svgaplayer.SVGAImageView;
-import com.opensource.svgaplayer.SVGAParser;
-import com.opensource.svgaplayer.SVGAVideoEntity;
-import com.yunbao.common.CommonAppConfig;
-import com.yunbao.common.Constants;
-import com.yunbao.common.activity.WebViewActivity;
-import com.yunbao.common.bean.GoogleBean;
-import com.yunbao.common.bean.NewLevelModel;
-import com.yunbao.common.bean.UserBean;
-import com.yunbao.common.bean.UserItemBean;
-import com.yunbao.common.glide.ImgLoader;
-import com.yunbao.common.interfaces.CommonCallback;
-import com.yunbao.common.interfaces.OnItemClickListener;
-import com.yunbao.common.manager.NewLevelManager;
-import com.yunbao.common.utils.RouteUtil;
-import com.yunbao.common.utils.SVGAViewUtils;
-import com.yunbao.common.utils.WordUtil;
-import com.yunbao.common.views.AbsMainViewHolder;
-import com.yunbao.live.activity.LiveRecordActivity;
-import com.yunbao.live.activity.RoomManageActivity;
-import com.yunbao.live.activity.WebViewActivityMedal;
-import com.yunbao.live.utils.LiveTextRender;
-import com.yunbao.main.R;
-import com.yunbao.main.activity.EditProfileActivity;
-import com.yunbao.main.activity.FansActivity;
-import com.yunbao.main.activity.FollowActivity;
-import com.yunbao.main.activity.MyProfitActivity;
-import com.yunbao.main.activity.MyVideoActivity;
-import com.yunbao.main.activity.MyWalletActivity;
-import com.yunbao.main.activity.RewardActivity;
-import com.yunbao.main.activity.SettingActivity;
-import com.yunbao.main.activity.ThreeDistributActivity;
-import com.yunbao.main.activity.ZhuangBanActivity;
-import com.yunbao.main.adapter.MainMeAdapter;
-import com.yunbao.main.http.MainHttpConsts;
-import com.yunbao.main.http.MainHttpUtil;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by cxf on 2018/9/22.
- * 我的
- */
-
-public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickListener<UserItemBean>, View.OnClickListener {
-
-    private ImageView mAvatar, mSex, mLevelAnchor, mLevel;
-
-    private TextView mName, tv_level, mID;
-    private ImageView img_kefu, img_setting;
-    private RelativeLayout rt_kefu, rt_setting;
-    private boolean mPaused;
-    private RecyclerView mRecyclerView;
-    private MainMeAdapter mAdapter;
-    private TextView signature;
-    private TextView coin, gold;//金豆,钻石
-    private TextView btnCopy;
-    private SVGAImageView gift_svga;
-    private View v_noble;
-    //    private LinearLayout btnUserNoble;
-    private ImageView user_noble_ico, good_nub_ico;
-    private TextView user_noble_text, leave;
-    private UserItemBean beanStetting = null, beanKefu = null;
-    private boolean firstInto = true;
-
-    public MainMeViewHolder1(Context context, ViewGroup parentView) {
-        super(context, parentView);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.view_main_me1;
-    }
-
-    @Override
-    public void init() {
-        mAvatar = (ImageView) findViewById(R.id.avatar);
-        mAvatar.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 0);
-            }
-        });
-
-        mName = (TextView) findViewById(R.id.name);
-        gift_svga = (SVGAImageView) findViewById(com.yunbao.live.R.id.gift_svga);
-        gift_svga.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 0);
-            }
-        });
-
-        user_noble_ico = (ImageView) findViewById(R.id.user_noble_ico);
-//        mSex = (ImageView) findViewById(R.id.sex);
-        mLevelAnchor = (ImageView) findViewById(R.id.level_anchor);
-        mLevel = (ImageView) findViewById(R.id.level);
-        tv_level = (TextView) findViewById(R.id.tv_level);
-        good_nub_ico = (ImageView) findViewById(R.id.good_nub_ico);
-        mID = (TextView) findViewById(R.id.id_val);
-//        mFollow = (TextView) findViewById(R.id.btn_follow);
-//        mFans = (TextView) findViewById(R.id.btn_fans);
-        signature = (TextView) findViewById(R.id.signature);
-        coin = (TextView) findViewById(R.id.coin);
-        gold = (TextView) findViewById(R.id.gold);
-        btnCopy = (TextView) findViewById(R.id.btn_copy);
-//        btnUserNoble = (LinearLayout) findViewById(R.id.btn_user_noble);
-        user_noble_text = (TextView) findViewById(R.id.user_noble_text);
-        leave = (TextView) findViewById(R.id.leave);
-
-        img_kefu = (ImageView) findViewById(R.id.img_kefu);
-        img_setting = (ImageView) findViewById(R.id.img_setting);
-        rt_kefu = (RelativeLayout) findViewById(R.id.rt_kefu);
-        rt_setting = (RelativeLayout) findViewById(R.id.rt_setting);
-
-        v_noble = (View) findViewById(R.id.v_noble);
-
-//        mFollow.setOnClickListener(this);
-//        mFans.setOnClickListener(this);
-        findViewById(R.id.btn_edit).setOnClickListener(this);
-//        findViewById(R.id.btn_msg).setOnClickListener(this);
-        findViewById(R.id.btn_wallet).setOnClickListener(this);
-        findViewById(R.id.btn_coin).setOnClickListener(this);
-        findViewById(R.id.btn_gold).setOnClickListener(this);
-
-        findViewById(R.id.rt_kefu).setOnClickListener(this);
-        findViewById(R.id.rt_setting).setOnClickListener(this);
-        findViewById(R.id.v_noble).setOnClickListener(this);
-
-        //主播等级
-        mLevelAnchor.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for";
-                WebViewActivity.forward(mContext, url, false);
-            }
-        });
-        //用户等级
-        mLevel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
-                WebViewActivity.forward(mContext, url, false);
-            }
-        });
-
-//        btnUserNoble.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                UserBean u = CommonAppConfig.getInstance().getUserBean();
-//                String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid();
-//                ZhuangBanActivity.forward(mContext, url, false);
-//            }
-//        });
-
-        btnCopy.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-                cm.setText(mID.getText() + "");
-                Toast.makeText(mContext, "複製成功", Toast.LENGTH_SHORT).show();
-            }
-        });
-//        findViewById(R.id.btn_detail).setOnClickListener(this);
-//        findViewById(R.id.btn_shop).setOnClickListener(this);
-        mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
-        mRecyclerView.setHasFixedSize(true);
-//        mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
-        mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false));
-//        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mPaused = true;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (isShowed() && mPaused) {
-            loadData();
-        }
-        mPaused = false;
-//        EventBus.getDefault().unregister(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        MainHttpUtil.cancel(MainHttpConsts.GET_BASE_INFO);
-    }
-
-    @Override
-    public void loadData() {
-        if (isFirstLoadData()) {
-            CommonAppConfig appConfig = CommonAppConfig.getInstance();
-            UserBean u = appConfig.getUserBean();
-            List<UserItemBean> list = appConfig.getUserItemList();
-            if (u != null && list != null) {
-                showData(u, list);
-            }
-        }
-
-        MainHttpUtil.getGoogle(mCallback1);
-        MainHttpUtil.getBaseInfo(mCallback);
-
-    }
-
-
-    //获取谷歌
-    //谷歌支付是否打开 1是打开 0 关闭
-    String Is_hide = "1";
-    private CommonCallback<GoogleBean> mCallback1 = new CommonCallback<GoogleBean>() {
-        @Override
-        public void callback(GoogleBean bean) {
-            if (bean != null) {
-                Is_hide = bean.getIs_hide();
-            }
-        }
-    };
-
-    private CommonCallback<UserBean> mCallback = new CommonCallback<UserBean>() {
-        @Override
-        public void callback(UserBean bean) {
-            List<UserItemBean> list = CommonAppConfig.getInstance().getUserItemList();
-            if (bean != null) {
-                showData(bean, list);
-            }
-        }
-    };
-
-    private void showData(UserBean u, List<UserItemBean> list) {
-        ImgLoader.displayAvatar(mContext, u.getAvatar(), mAvatar);
-//        mTtileView.setText(u.getUserNiceName());
-        mName.setText(u.getUserNiceName());
-        user_noble_text.setText(u.getNoble_name());
-//        mSex.setImageResource(CommonIconUtil.getSexIcon(u.getSex()));
-        coin.setText(u.getYuanbao());
-        gold.setText(u.getCoin());
-        signature.setText(u.getSignature());
-        CommonAppConfig appConfig = CommonAppConfig.getInstance();
-
-
-        if (u.getDress().getAvatar_frame() != null) {
-            if (u.getDress().getAvatar_frame().contains("svga")) {
-                try {
-                    new SVGAParser(mContext).parse(new URL(u.getDress().getAvatar_frame()), new SVGAParser.ParseCompletion() {
-                        @Override
-                        public void onComplete(SVGAVideoEntity videoItem) {
-                            SVGADrawable drawable = new SVGADrawable(videoItem);
-                            gift_svga.setImageDrawable(drawable);
-                            SVGAViewUtils.playEndClear(gift_svga);
-                        }
-
-                        @Override
-                        public void onError() {
-                        }
-                    });
-                } catch (MalformedURLException e) {
-                    e.printStackTrace();
-                }
-            } else {
-                ImgLoader.display(mContext, u.getDress().getAvatar_frame(), gift_svga);
-            }
-        }
-
-        if (u.getDress().getMedal() != null) {
-            Log.e("tag", u.getDress().getMedal());
-            ImgLoader.display(mContext, u.getDress().getMedal(), user_noble_ico);
-        } else {
-            user_noble_ico.setImageResource(R.mipmap.df_nobe);
-        }
-
-        List<NewLevelModel> models = new NewLevelManager(mContext).getNewAnchorLevelModels();
-        int anchorLevel = 0;
-
-
-        anchorLevel = u.getLevelAnchor();
-        String imgUrl = "";
-        for (NewLevelModel newLevelModel : models) {
-            if (newLevelModel.getLeveMin() <= anchorLevel && anchorLevel <= newLevelModel.getLeveMax()) {
-                imgUrl = newLevelModel.getThumb();
-            }
-        }
-        leave.setText(String.valueOf(u.getLevelAnchor()));
-        ImgLoader.display(mContext, imgUrl, mLevelAnchor);
-        new LiveTextRender().getLevelImage(mContext, u.getLevel(), new ImgLoader.DrawableCallback() {
-            @Override
-            public void onLoadSuccess(Drawable drawable) {
-                ImgLoader.display2(mContext, drawable, mLevel);
-            }
-
-            @Override
-            public void onLoadFailed() {
-
-            }
-        });
-        //修改靓号图标 个人中心
-        if (u.getGoodnum() != null && !u.getGoodnum().equals("")) {
-            good_nub_ico.setVisibility(View.VISIBLE);
-            mID.setText(" " + u.getGoodnum());
-        } else {
-            good_nub_ico.setVisibility(View.GONE);
-            mID.setText(u.getLiangNameTip());
-        }
-//        mFollow.setText("" + u.getFollows());
-//        mFans.setText("" + u.getFans());
-        if (list != null && list.size() > 0) {
-            List<UserItemBean> listNow = new ArrayList<>();
-            for (UserItemBean userItemBean : list) {
-                if (userItemBean.getId() != 21 && userItemBean.getId() != 13) {
-                    listNow.add(userItemBean);
-                } else if (userItemBean.getId() == 21) {
-                    beanKefu = userItemBean;
-                } else if (userItemBean.getId() == 13) {
-                    beanStetting = userItemBean;
-                }
-            }
-            if (mAdapter == null) {
-                mAdapter = new MainMeAdapter(mContext, listNow);
-                mAdapter.setOnItemClickListener(this);
-                mRecyclerView.setAdapter(mAdapter);
-            } else {
-                mAdapter.setList(listNow);
-            }
-        }
-        if (beanKefu != null) {
-            ImgLoader.display(mContext, beanKefu.getThumb(), img_kefu);
-        }
-        if (beanStetting != null) {
-            ImgLoader.display(mContext, beanStetting.getThumb(), img_setting);
-        }
-        Constants.myUid = u.getGoodnum();
-        Constants.myAvatar = u.getAvatar();
-    }
-
-    @Override
-    public void onItemClick(UserItemBean bean, int position) {
-        String url = bean.getHref();
-        if (TextUtils.isEmpty(url)) {
-            switch (bean.getId()) {
-                case 1:
-                    forwardProfit();
-                    break;
-                case 2:
-                    forwardCoin();
-                    break;
-                case 13:
-//                    forwardSetting();
-                    break;
-                case 19:
-                    forwardMyVideo();
-                    break;
-                case 20:
-                    forwardRoomManage();
-                    break;
-            }
-        } else {
-            //21 在线客服
-            Log.i("tag", bean.getId() + "");
-            if (bean.getId() == 8) {//三级分销
-                ThreeDistributActivity.forward(mContext, bean.getName(), url);
-            } else {
-                if (bean.getId() == 31) {
-                    //跳转网页版粉丝徽章
-                    WebViewActivityMedal.forward(mContext, url);
-                } else if (bean.getId() == 5) {
-                    ZhuangBanActivity.forward(mContext, CommonAppConfig.HOST + "/h5/Personality.html");
-                    //獎勵中心
-                } else if (bean.getId() == 23) {
-                    Log.i("tsa", url);
-                    RewardActivity.forward(mContext, url);
-                } else {
-                    WebViewActivity.forward(mContext, url, false);
-                }
-
-            }
-        }
-    }
-
-
-    @Override
-    public void onClick(View v) {
-        int i = v.getId();
-        if (i == R.id.btn_edit) {
-            mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
-        }
-//        else if (i == R.id.btn_follow) {
-//            forwardFollow();
-//        }
-        else if (i == R.id.btn_fans) {
-            forwardFans();
-//        } else if (i == R.id.btn_msg) {
-//            ChatActivity.forward(mContext);
-        } else if (i == R.id.btn_wallet) {
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
-        } else if (i == R.id.btn_coin) {
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
-        } else if (i == R.id.btn_gold) {
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
-        } else if (i == R.id.rt_kefu) {
-            WebViewActivity.forward(mContext, beanKefu.getHref(), false);
-        } else if (i == R.id.rt_setting) {
-            forwardSetting();
-        } else if (i == R.id.v_noble) {
-            UserBean u = CommonAppConfig.getInstance().getUserBean();
-            String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
-            ZhuangBanActivity.forward(mContext, url, false);
-        }
-
-
-    }
-
-    /**
-     * 编辑个人资料
-     */
-    private void forwardEditProfile() {
-        mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
-    }
-
-    /**
-     * 我的关注
-     */
-    private void forwardFollow() {
-        FollowActivity.forward(mContext, CommonAppConfig.getInstance().getUid(), 0);
-    }
-
-    /**
-     * 我的粉丝
-     */
-    private void forwardFans() {
-        FansActivity.forward(mContext, CommonAppConfig.getInstance().getUid());
-    }
-
-    /**
-     * 直播记录
-     */
-    private void forwardLiveRecord() {
-        LiveRecordActivity.forward(mContext, CommonAppConfig.getInstance().getUserBean());
-    }
-
-    /**
-     * 我的收益
-     */
-    private void forwardProfit() {
-        mContext.startActivity(new Intent(mContext, MyProfitActivity.class));
-    }
-
-    /**
-     * 我的钻石
-     */
-    private void forwardCoin() {
-        RouteUtil.forwardMyCoin(mContext);
-
-    }
-
-    /**
-     * 设置
-     */
-    private void forwardSetting() {
-        mContext.startActivity(new Intent(mContext, SettingActivity.class));
-    }
-
-    /**
-     * 我的视频
-     */
-    private void forwardMyVideo() {
-        mContext.startActivity(new Intent(mContext, MyVideoActivity.class));
-    }
-
-    /**
-     * 房间管理
-     */
-    private void forwardRoomManage() {
-        mContext.startActivity(new Intent(mContext, RoomManageActivity.class));
-    }
-
-}

main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java

@@ -32,11 +32,9 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Group;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 
@@ -45,15 +43,12 @@ import com.binioter.guideview.Guide;
 import com.binioter.guideview.GuideBuilder;
 import com.facebook.appevents.AppEventsLogger;
 import com.lxj.xpopup.XPopup;
-import com.lxj.xpopup.core.BasePopupView;
 import com.lxj.xpopup.enums.PopupPosition;
-import com.lxj.xpopup.interfaces.XPopupCallback;
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.yunbao.common.CommonAppConfig;
-import com.yunbao.common.fragment.ChatViewModel;
 import com.yunbao.common.fragment.MainMessageRecommendFragment;
 import com.yunbao.common.utils.DebugUtils;
 import com.yunbao.common.utils.DialogUitl;
@@ -78,7 +73,6 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.ViewPageIndicatorUtils;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
-import com.yunbao.common.views.MsgChatTypeSelectPoPupView;
 import com.yunbao.common.views.MsgRecommendPopupView;
 import com.yunbao.common.views.MsgSysDelPopupView;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -138,20 +132,17 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
     private MagicIndicator mIndicator;
     private List<AbsMainMessageChatListFragment> fragmentList;
 
-    private Group tabLayout1, tabLayout2, tabLayout3;
+    private ConstraintLayout tabLayout1, tabLayout2, tabLayout3;
     private TextView tab1, tab2, tab3;
-    private ImageView imageView1, imageView2, imageView3;
     private View tab_line1, tab_line2, tab_line3;
     private ImageView tab_icon;
 
-    private List<Group> relativeLayouts = new ArrayList<>();
+    private List<ConstraintLayout> relativeLayouts = new ArrayList<>();
     private List<TextView> tabTexts = new ArrayList<>();
     private List<View> tabLine = new ArrayList<>();
-    private List<ImageView> tabExpend = new ArrayList<>();
-    private ConstraintLayout tabLayouts;
+    private LinearLayout tabLayouts;
 
     private int userType = 0; // (0)普通用户  (1)主播A  (2)主播B
-    ChatViewModel chatViewModel;
 
     public MainMessageViewHolder setHomeZdyPop(String homeZdyPop) {
         this.homeZdyPop = homeZdyPop;
@@ -165,7 +156,6 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
     public MainMessageViewHolder(MainActivity context, ViewGroup parentView) {
         super(context, parentView);
         mContext = context;
-        chatViewModel= (new ViewModelProvider(mContext)).get(ChatViewModel.class);
     }
 
     @Override
@@ -203,28 +193,14 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         tabLayouts = findViewById(R.id.tabLayouts);
 
         tab_icon = findViewById(R.id.tab_icon);
-        tabLayout1 = findViewById(R.id.group_tab1);
-        tabLayout2 = findViewById(R.id.group_tab2);
-        tabLayout3 = findViewById(R.id.group_tab3);
+        tabLayout1 = findViewById(R.id.tabLayout1);
+        tabLayout2 = findViewById(R.id.tabLayout2);
+        tabLayout3 = findViewById(R.id.tabLayout3);
 
         tab1 = findViewById(R.id.tab1);
         tab2 = findViewById(R.id.tab2);
         tab3 = findViewById(R.id.tab3);
 
-        imageView1 = findViewById(R.id.expendImg1);
-        imageView2 = findViewById(R.id.expendImg2);
-        imageView3 = findViewById(R.id.expendImg3);
-
-        imageView1.setOnClickListener(view -> {
-            selectChatType(view, 0);
-        });
-        imageView2.setOnClickListener(view -> {
-            selectChatType(view, 1);
-        });
-        imageView3.setOnClickListener(view -> {
-            selectChatType(view, 2);
-        });
-
         tab_line1 = findViewById(R.id.tab_line1);
         tab_line2 = findViewById(R.id.tab_line2);
         tab_line3 = findViewById(R.id.tab_line3);
@@ -248,73 +224,6 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         });
     }
 
-    private void selectChatType(View view, int position) {
-        AbsMainMessageChatListFragment fragment = fragmentList.get(position);
-        if (!(fragment instanceof MainMessageChatListFragment) || !(view instanceof ImageView)) {
-            return;
-        }
-        MainMessageChatListFragment chatFragment = (MainMessageChatListFragment) fragment;
-        ImageView expendImg = (ImageView) view;
-        expendImg.setImageResource(R.mipmap.ic_expend_up);
-        XPopup.Builder builder = new XPopup.Builder(mContext).atView(tabTexts.get(position));
-        builder.offsetY(16);
-        builder.dismissOnTouchOutside(true);
-        builder.setPopupCallback(new XPopupCallback() {
-            @Override
-            public void onCreated(BasePopupView popupView) {
-            }
-
-            @Override
-            public void beforeShow(BasePopupView popupView) {
-
-            }
-
-            @Override
-            public void onShow(BasePopupView popupView) {
-
-            }
-
-            @Override
-            public void onDismiss(BasePopupView popupView) {
-                expendImg.setImageResource(R.mipmap.ic_expend_down);
-            }
-
-            @Override
-            public void beforeDismiss(BasePopupView popupView) {
-
-            }
-
-            @Override
-            public boolean onBackPressed(BasePopupView popupView) {
-                return false;
-            }
-
-            @Override
-            public void onKeyBoardStateChanged(BasePopupView popupView, int height) {
-
-            }
-
-            @Override
-            public void onDrag(BasePopupView popupView, int value, float percent, boolean upOrLeft) {
-
-            }
-
-            @Override
-            public void onClickOutside(BasePopupView popupView) {
-
-            }
-        });
-        builder.asCustom(new MsgChatTypeSelectPoPupView(mContext, chatFragment.getFilter(), new MsgChatTypeSelectPoPupView.ResultCallBack() {
-            @Override
-            public void callBack(int i,String str) {
-                tabTexts.get(position).setText(str);
-                chatFragment.setFilter(i);
-            }
-        })).show();
-
-    }
-
-
     private void initFragment() {
         final String[] titles;
         fragmentList = new ArrayList<>();
@@ -355,9 +264,9 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
                 return fragmentList.get(i);
             }
         });
-        if (userType == 1) {
+        if(userType==1){
             viewPager.setCurrentItem(1);
-        } else {
+        }else{
             viewPager.setCurrentItem(0);
         }
         viewPager.setUserInputEnabled(false);
@@ -431,7 +340,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
             @Override
             public void onPageSelected(int position) {
                 super.onPageSelected(position);
-                if (!StringUtil.isEmpty(search.getText().toString())) {
+                if(!StringUtil.isEmpty(search.getText().toString())) {
                     search.setText("");
                 }
                 selectTab(position);
@@ -460,12 +369,6 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         });
     }
 
-
-    private void showChatTypeSelect() {
-
-    }
-
-
     private void initTabView() {
         relativeLayouts = new ArrayList<>();
         tabTexts = new ArrayList<>();
@@ -479,19 +382,14 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         tabTexts.add(tab2);
         tabTexts.add(tab3);
 
-        tabExpend.add(imageView1);
-        tabExpend.add(imageView2);
-        tabExpend.add(imageView3);
-
         tabLine.add(tab_line1);
         tabLine.add(tab_line2);
         tabLine.add(tab_line3);
         if (userType == 0) { //普通用户
             relativeLayouts.get(0).setVisibility(View.VISIBLE);
-            tabTexts.get(0).setText(WordUtil.getNewString(chatViewModel.getTitleTextId()));
+            tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_all_an_a));
             ViewGroup.LayoutParams params = tabLayouts.getLayoutParams();
             params.width = LinearLayout.LayoutParams.WRAP_CONTENT;
-            //tabExpend.get(0).setVisibility(View.VISIBLE);
             tabLayouts.setLayoutParams(params);
         } else if (userType == 1) {//主播A
             tab_icon.setVisibility(View.VISIBLE);
@@ -511,12 +409,10 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
             relativeLayouts.get(0).setVisibility(View.VISIBLE);
             tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_recommend));
             relativeLayouts.get(1).setVisibility(View.VISIBLE);
-            tabTexts.get(1).setText(WordUtil.getNewString(chatViewModel.getTitleTextId()));
-           // tabExpend.get(1).setVisibility(View.VISIBLE);
+            tabTexts.get(1).setText(WordUtil.getNewString(R.string.message_chat_msg_all_an_a));
         } else { //主播B
-            tabExpend.get(0).setVisibility(View.VISIBLE);
             relativeLayouts.get(0).setVisibility(View.VISIBLE);
-            tabTexts.get(0).setText(WordUtil.getNewString(chatViewModel.getTitleTextId()));
+            tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_all));
             relativeLayouts.get(1).setVisibility(View.VISIBLE);
             tabTexts.get(1).setText(WordUtil.getNewString(R.string.message_chat_msg_system));
             relativeLayouts.get(2).setVisibility(View.VISIBLE);
@@ -524,7 +420,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         }
         for (int i = 0; i < relativeLayouts.size(); i++) {
             int finalI = i;
-            tabTexts.get(i).setOnClickListener(new View.OnClickListener() {
+            relativeLayouts.get(i).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     selectTab(finalI);
@@ -532,9 +428,9 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
                 }
             });
         }
-        if (userType == 1) {
+        if(userType==1){
             selectTab(1);
-        } else {
+        }else{
             selectTab(0);
         }
     }

main/src/main/res/drawable/bg_msg_top_title.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="20dp"/>
-    <solid android:color="@color/white"/>
-
+    <corners android:radius="4dp"/>
+    <solid android:color="#FF0FA4FF"/>
 </shape>

main/src/main/res/drawable/bg_my_info_input.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="15dp"/>
+    <solid android:color="#FFFFBA26"/>
+</shape>

main/src/main/res/layout/activity_entry.xml

@@ -64,6 +64,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:visibility="gone"
             android:layout_marginBottom="21dp">
 
             <LinearLayout
@@ -191,7 +192,8 @@
                     android:layout_height="57dp"
                     android:layout_gravity="center"
                     android:layout_weight="1"
-                    android:src="@mipmap/login_line" />
+                    android:src="@mipmap/login_line"
+                    android:visibility="gone" />
 
                 <RelativeLayout
                     android:layout_width="57dp"

main/src/main/res/layout/item_main_home_com_class.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="10dp"
-    android:gravity="center"
     android:orientation="vertical"
+    android:gravity="center"
+    android:paddingRight="5dp"
     android:paddingTop="12dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tv_class_name"
-        android:layout_width="50dp"
-        android:layout_height="30dp"
-        android:background="@drawable/bg_main_com_type"
-        android:gravity="center"
+        android:layout_width="65dp"
+        android:layout_height="26dp"
         android:text="音乐"
-        android:textColor="@color/white"
-        android:textSize="13sp" />
+        android:textSize="16sp"
+        android:gravity="center"
+        android:textColor="#FF777777"/>
+
 
 </LinearLayout>

main/src/main/res/layout/item_main_home_live_head.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="135dp"
     android:orientation="vertical">
@@ -26,9 +25,8 @@
             android:id="@+id/banner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="3dp"
-
-            android:layout_marginBottom="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginBottom="10dp"
             app:delay_time="3000"
             app:indicator_drawable_selected="@drawable/bg_home_indicator_selected"
             app:indicator_drawable_unselected="@drawable/bg_home_indicator_unselected"

main/src/main/res/layout/item_main_home_lives_class.xml

@@ -3,7 +3,6 @@
     android:orientation="vertical"
     android:gravity="center"
     android:paddingRight="5dp"
-    android:layout_marginLeft="15dp"
     android:paddingTop="12dp"
     android:paddingBottom="10dp"
     android:layout_width="wrap_content"
@@ -16,8 +15,7 @@
         android:text="音乐"
         android:textSize="16sp"
         android:gravity="center"
-        android:background="@drawable/button_ffc621"
-        android:textColor="#FFC621"/>
+        android:textColor="#FF777777"/>
 
 
 </LinearLayout>

main/src/main/res/layout/item_main_me_2.xml

@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/thumb"
-        android:layout_width="24dp"
-        android:layout_height="24dp" />
+        android:layout_width="32dp"
+        android:layout_height="32dp" />
 
     <TextView
         android:id="@+id/name"
@@ -20,7 +20,7 @@
         android:text=""
         android:singleLine="true"
         android:ellipsize="end"
-        android:textColor="@color/textColor"
+        android:textColor="#FF333333"
         android:textSize="12sp" />
 
 </LinearLayout>

main/src/main/res/layout/item_main_me_3.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:layout_marginTop="12dp"
+    android:layout_marginBottom="12dp"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/thumb"
+        android:layout_width="20dp"
+        android:layout_height="20dp" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:text="我的勋章"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:layout_marginStart="8dp"
+        android:textColor="#FF777777"
+        android:textSize="12sp" />
+
+    <ImageView
+        android:layout_width="20dp"
+        android:padding="2dp"
+        android:src="@mipmap/icon_right_new"
+        android:layout_height="20dp"/>
+
+</LinearLayout>

main/src/main/res/layout/simple_pager_title_layout.xml

@@ -21,6 +21,7 @@
     <ImageView
         android:id="@+id/index"
         android:layout_width="30dp"
+        android:visibility="gone"
         android:layout_height="15dp"
         android:src="@mipmap/icon_index" />
 

main/src/main/res/layout/view_homemain.xml

@@ -47,7 +47,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     app:tbn_checked="true"
-                    app:tbn_icon_array_id="@array/main_tab_home"
+                    app:tbn_icon_array_id="@array/main_tab_video"
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
@@ -59,12 +59,12 @@
                     android:layout_height="match_parent"
                     android:layout_marginRight="60dp"
                     android:layout_weight="1"
-                    app:tbn_icon_array_id="@array/main_tab_video"
+                    app:tbn_icon_array_id="@array/main_tab_home"
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
                     app:tbn_text_size="11sp"
-                    app:tbn_tip="@string/live" />
+                    app:tbn_tip="@string/community" />
 
                 <com.yunbao.common.custom.TabButton
                     android:layout_width="0dp"

main/src/main/res/layout/view_main_home.xml

@@ -19,8 +19,8 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="37dp"
-            android:layout_marginTop="20dp"
+            android:layout_height="45dp"
+            android:layout_marginTop="22dp"
             app:layout_scrollFlags="scroll|enterAlways">
 
             <HorizontalScrollView
@@ -50,9 +50,9 @@
                         android:gravity="center"
                         android:paddingTop="1dp"
                         android:text="@string/main_type_theater"
-                        android:textColor="#B1B1B1"
+                        android:textColor="#FF777777"
                         android:layout_marginBottom="3dp"
-                        android:textSize="16dp"
+                        android:textSize="18dp"
                         android:textStyle="bold" />
 
                 </LinearLayout>
@@ -62,14 +62,23 @@
                 android:id="@+id/ijiasdw"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:gravity="center_vertical"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true">
 
+                <ImageView
+                    android:id="@+id/btn_live"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:contentDescription="TODO"
+                    android:onClick="mainClick"
+                    android:padding="9dp"
+                    android:src="@mipmap/icon_main_live" />
+
                 <ImageView
                     android:id="@+id/btn_search"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:layout_marginBottom="2dp"
                     android:contentDescription="TODO"
                     android:onClick="mainClick"
                     android:padding="9dp"
@@ -80,7 +89,6 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_marginRight="5dp"
-                    android:layout_marginBottom="2dp"
                     android:contentDescription="TODO"
                     android:onClick="mainClick"
                     android:padding="6dp" />

main/src/main/res/layout/view_main_home_com.xml

@@ -11,7 +11,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="10dp"
         android:background="@android:color/transparent"
         android:fadingEdge="none"
         app:elevation="0dp"
@@ -19,17 +19,15 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="45dp"
+            android:layout_marginTop="22dp"
             app:layout_scrollFlags="scroll|enterAlways">
 
-
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
+                android:layout_height="45dp"
                 android:layout_alignParentBottom="true"
-                android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:layout_marginBottom="5dp"
                 android:layout_toLeftOf="@id/btn_search"
                 tools:ignore="NotSibling">
 
@@ -43,13 +41,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="6dp"
                     android:layout_toRightOf="@+id/indicator"
                     android:gravity="center"
-                    android:paddingTop="1dp"
                     android:text="@string/main_type_theater"
-                    android:textColor="@color/black1"
-                    android:textSize="16dp"
+                    android:textColor="#FF777777"
+                    android:textSize="18dp"
                     android:textStyle="bold" />
 
             </RelativeLayout>

main/src/main/res/layout/view_main_me.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/gray2"
+    android:background="#FFF7F8FA"
     android:orientation="vertical"
     android:paddingBottom="50dp">
 
@@ -27,43 +27,95 @@
                 android:orientation="vertical">
 
                 <RelativeLayout
+                    android:paddingTop="30dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <View
+                    <RelativeLayout
+                        android:layout_marginStart="15dp"
                         android:layout_width="match_parent"
-                        android:layout_height="240dp"
-                        android:background="@mipmap/new_bg" />
+                        android:layout_height="40dp">
+
+                        <TextView
+                            android:text="個人中心"
+                            android:textSize="24dp"
+                            android:textColor="#FF333333"
+                            android:textStyle="bold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                        <ImageView
+                            android:layout_alignParentBottom="true"
+                            android:layout_width="40dp"
+                            android:layout_height="4dp"
+                            android:background="@drawable/bg_msg_top_title"
+                            android:scaleType="fitXY" />
+
+                        <ImageView
+                            android:id="@+id/rt_setting"
+                            android:layout_marginTop="15dp"
+                            android:layout_marginEnd="15dp"
+                            android:layout_alignParentEnd="true"
+                            android:src="@mipmap/main_my_more"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                    </RelativeLayout>
 
                     <LinearLayout
-
                         android:id="@+id/lt_me_top"
                         android:layout_width="match_parent"
-                        android:layout_height="144dp"
-                        android:layout_marginTop="42dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="55dp"
                         android:orientation="horizontal">
 
+                        <RelativeLayout
+                            android:layout_width="108dp"
+                            android:layout_height="100dp"
+                            android:layout_marginRight="10dp"
+                            android:gravity="center|right">
+
+                            <com.makeramen.roundedimageview.RoundedImageView
+                                android:id="@+id/edit_me_avatar"
+                                android:layout_width="68dp"
+                                android:layout_height="68dp"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_marginRight="10dp"
+                                android:scaleType="centerCrop"
+                                app:riv_border_color="#FFFFFF"
+                                app:riv_border_width="2dp"
+                                app:riv_oval="true" />
+
+                            <com.opensource.svgaplayer.SVGAImageView
+                                android:id="@+id/gift_svga"
+                                android:layout_width="94dp"
+                                android:layout_height="94dp"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:scaleType="centerCrop"
+                                app:autoPlay="true" />
+
+                        </RelativeLayout>
                         <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center|left"
                             android:orientation="vertical">
 
                             <androidx.cardview.widget.CardView
-                                android:id="@+id/complete_information_radius"
                                 android:layout_width="7dp"
                                 android:layout_height="7dp"
-                                android:layout_marginStart="115.9dp"
-                                android:layout_marginEnd="4dp"
                                 app:cardBackgroundColor="#FF5730"
+                                android:visibility="gone"
                                 app:cardCornerRadius="20dp" />
 
                             <RelativeLayout
-                                android:id="@+id/complete_information"
                                 android:layout_width="107.9dp"
                                 android:layout_height="25.25dp"
                                 android:layout_marginStart="21dp"
+                                android:visibility="gone"
                                 android:layout_marginTop="-5dp"
                                 android:background="@mipmap/icon_complete_information">
 
@@ -80,7 +132,6 @@
                                 android:id="@+id/lt_name"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="21dp"
                                 android:layout_marginTop="8dp"
                                 android:gravity="center"
                                 android:orientation="horizontal">
@@ -90,9 +141,11 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="用戶名稱"
+                                    android:ellipsize="end"
+                                    android:maxLines="1"
                                     android:textColor="@color/black2"
-                                    android:textSize="19sp"
-                                    android:textStyle="bold" />
+                                    android:textSize="15sp"
+                                   />
 
                                 <ImageView
                                     android:id="@+id/btn_edit"
@@ -107,22 +160,20 @@
                                 android:id="@+id/signature"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="21dp"
-                                android:layout_marginTop="6dp"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="这个人很懒，什么也没留下。"
-                                android:textColor="@color/gray_cccccc"
-                                android:textSize="12sp" />
+                                android:textColor="#FF777777"
+                                android:textSize="11sp" />
 
                             <LinearLayout
                                 android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
+                                android:layout_height="30dp"
                                 android:orientation="horizontal">
 
                                 <LinearLayout
                                     android:layout_width="wrap_content"
-                                    android:layout_height="48dp"
-                                    android:layout_marginLeft="21dp"
+                                    android:layout_height="28dp"
                                     android:layout_weight="1"
                                     android:gravity="center|left">
 
@@ -134,8 +185,8 @@
                                         android:visibility="gone" />
 
                                     <ImageView
-                                        android:layout_width="30dp"
-                                        android:layout_height="15dp"
+                                        android:layout_width="13dp"
+                                        android:layout_height="13dp"
                                         android:src="@mipmap/icon_userid" />
 
                                     <TextView
@@ -143,12 +194,12 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:textColor="@color/gray_B1B1B1"
-                                        android:textSize="12sp" />
+                                        android:textSize="11sp" />
                                 </LinearLayout>
 
                                 <TextView
                                     android:id="@+id/btn_copy"
-                                    android:layout_width="30dp"
+                                    android:layout_width="28dp"
                                     android:layout_height="wrap_content"
                                     android:layout_marginLeft="5dp"
                                     android:layout_marginRight="5dp"
@@ -161,15 +212,15 @@
 
                                 <LinearLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="48dp"
-                                    android:layout_marginLeft="15dp"
+                                    android:layout_height="28dp"
+                                    android:layout_marginLeft="5dp"
                                     android:layout_weight="1"
                                     android:gravity="center|left">
 
                                     <ImageView
                                         android:id="@+id/img_lv_pic"
-                                        android:layout_width="30dp"
-                                        android:layout_height="15dp"
+                                        android:layout_width="13dp"
+                                        android:layout_height="13dp"
                                         android:src="@mipmap/icon_userlv" />
 
                                     <ImageView
@@ -193,45 +244,43 @@
                                         android:gravity="center|left"
                                         android:text=""
                                         android:textColor="@color/gray_B1B1B1"
-                                        android:textSize="13sp" />
+                                        android:textSize="11sp" />
 
                                     <ImageView
-                                        android:layout_width="11dp"
-                                        android:layout_height="11dp"
-                                        android:layout_marginLeft="3dp"
-                                        android:background="@mipmap/icon_arrow_right"
+                                        android:layout_width="10dp"
+                                        android:layout_height="10dp"
+                                        android:layout_marginLeft="5dp"
+                                        android:background="@mipmap/icon_right_new"
                                         android:visibility="visible" />
                                 </LinearLayout>
                             </LinearLayout>
                         </LinearLayout>
 
                         <RelativeLayout
-                            android:layout_width="114dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="18dp"
-                            android:gravity="center|right">
+                            android:id="@+id/complete_information"
+                            android:layout_marginEnd="15dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
-                                android:id="@+id/edit_me_avatar"
-                                android:layout_width="86dp"
-                                android:layout_height="86dp"
-                                android:layout_alignParentRight="true"
-                                android:layout_centerVertical="true"
-                                android:layout_marginRight="9dp"
-                                android:scaleType="centerCrop"
-                                app:riv_border_color="#FFFFFF"
-                                app:riv_border_width="2dp"
-                                app:riv_oval="true" />
-
-                            <com.opensource.svgaplayer.SVGAImageView
-                                android:id="@+id/gift_svga"
-                                android:layout_width="104dp"
-                                android:layout_height="104dp"
-                                android:layout_alignParentRight="true"
-                                android:layout_centerVertical="true"
-                                android:scaleType="centerCrop"
-                                app:autoPlay="true" />
+                            <TextView
+                                android:text="完成填寫領大禮"
+                                android:textColor="#FFFFFFFF"
+                                android:textStyle="bold"
+                                android:layout_alignParentBottom="true"
+                                android:background="@drawable/bg_my_info_input"
+                                android:textSize="11dp"
+                                android:gravity="center"
+                                android:layout_marginBottom="20dp"
+                                android:layout_width="91dp"
+                                android:layout_height="44dp"/>
 
+                            <ImageView
+                                android:id="@+id/complete_information_radius"
+                                android:layout_width="39dp"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="15dp"
+                                android:layout_height="39dp"
+                                android:src="@mipmap/main_my_info_icon" />
                         </RelativeLayout>
 
                     </LinearLayout>
@@ -267,15 +316,16 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
+                                        android:layout_width="18dp"
+                                        android:layout_height="18dp"
                                         android:src="@mipmap/home_me_diamonds" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
+                                        android:layout_marginStart="5dp"
                                         android:text="@string/diamond"
-                                        android:textColor="@color/gray1"
+                                        android:textColor="#FF333333"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
@@ -284,7 +334,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
-                                    android:textColor="@color/textColor"
+                                    android:textColor="#FF333333"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
 
@@ -317,15 +367,16 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
+                                        android:layout_width="18dp"
+                                        android:layout_height="18dp"
                                         android:src="@mipmap/icon_collectibles" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@string/coins"
-                                        android:textColor="@color/gray1"
+                                        android:layout_marginStart="5dp"
+                                        android:textColor="#FF333333"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
@@ -334,7 +385,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
-                                    android:textColor="@color/textColor"
+                                    android:textColor="#FF333333"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
 
@@ -367,15 +418,16 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
+                                        android:layout_width="18dp"
+                                        android:layout_height="18dp"
                                         android:src="@mipmap/home_me_gold" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@string/golden_bean"
-                                        android:textColor="@color/gray1"
+                                        android:layout_marginStart="5dp"
+                                        android:textColor="#FF333333"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
@@ -384,7 +436,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
-                                    android:textColor="@color/textColor"
+                                    android:textColor="#FF333333"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
 
@@ -495,6 +547,7 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
@@ -580,7 +633,6 @@
                         android:id="@+id/lt_guard"
                         android:layout_width="0dp"
                         android:layout_height="81dp"
-
                         android:layout_marginTop="12dp"
                         android:layout_marginRight="15dp"
                         android:layout_weight="1"
@@ -661,7 +713,29 @@
                         android:paddingRight="6dp"
                         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/bg_me_data">
 
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/bottomRecyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="9dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="9dp"
+                        android:focusable="false"
+                        android:nestedScrollingEnabled="false"
+                        android:overScrollMode="never"
+                        android:paddingLeft="6dp"
+                        android:paddingRight="6dp"
+                        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -734,9 +808,9 @@
                         android:orientation="vertical">
 
                         <RelativeLayout
-                            android:id="@+id/rt_setting"
                             android:layout_width="match_parent"
                             android:layout_height="54dp"
+                            android:visibility="gone"
                             android:paddingLeft="21dp">
 
                             <ImageView

main/src/main/res/layout/view_main_message.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/bg_activity_message"
+    android:background="#FFF7F8FA"
     android:orientation="vertical"
     android:paddingTop="35dp">
     <!--  android:background="@mipmap/bg_activity_message" -->
@@ -25,7 +25,6 @@
                 android:id="@+id/top_noback"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-
                 android:text="@string/activity_msg_title"
                 android:textColor="#ff161616"
                 android:textSize="24sp"
@@ -34,15 +33,14 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
-
                 android:layout_width="match_parent"
-                android:layout_height="6.3dp"
-                android:scaleType="fitXY"
-                android:src="@mipmap/icon_index" />
+                android:layout_height="4dp"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/bg_msg_top_title"
+                android:scaleType="fitXY" />
 
         </LinearLayout>
 
-
         <EditText
             android:id="@+id/search"
             android:layout_width="0dp"
@@ -64,9 +62,9 @@
             android:layout_width="0dp"
             android:layout_height="24dp"
             android:layout_gravity="end|bottom"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="8dp"
             android:layout_marginTop="18dp"
-            android:layout_marginEnd="15dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="16dp"
             android:layout_weight="0.1"
             android:src="@mipmap/ic_msg_contacts"
@@ -88,35 +86,33 @@
 
 
     <LinearLayout
+        android:background="#FFF7F8FA"
         android:id="@+id/top_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
         <!--系统消息-->
-        <RelativeLayout
-
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical">
 
             <ImageView
                 android:id="@+id/img_news_notice"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_news_notice"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_notice" />
 
             <TextView
                 android:id="@+id/tv_news_notice"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_news_notice"
                 android:textColor="#333333"
@@ -130,8 +126,6 @@
                 android:id="@+id/text_news_notice"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -140,32 +134,36 @@
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:visibility="visible" />
-        </RelativeLayout>
 
+        </LinearLayout>
 
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
+        <View
+            android:layout_marginStart="60dp"
+            android:layout_width="match_parent"
+            android:layout_marginEnd="22dp"
+            android:background="#FFEFEFEF"
+            android:layout_height="1dp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/img_news_interaction"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_news_interaction"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="19dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_interaction" />
 
             <TextView
                 android:id="@+id/tv_news_interaction"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_newts_interaction"
                 android:textColor="#333333"
@@ -179,8 +177,6 @@
                 android:id="@+id/text_news_interaction"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -188,33 +184,34 @@
                 android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone" />
-        </RelativeLayout>
-
-        <RelativeLayout
-
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
 
+        </LinearLayout>
+        <View
+            android:layout_marginStart="60dp"
+            android:layout_width="match_parent"
+            android:background="#FFEFEFEF"
+            android:layout_marginEnd="22dp"
+            android:layout_height="1dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/img_system_messages"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_system_messages"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_message" />
 
             <TextView
                 android:id="@+id/tv_system_messages"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_system_message"
                 android:textColor="#333333"
@@ -228,8 +225,6 @@
                 android:id="@+id/text_system_messages"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -237,31 +232,34 @@
                 android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone" />
-        </RelativeLayout>
 
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
+        </LinearLayout>
+        <View
+            android:layout_marginStart="60dp"
+            android:layout_width="match_parent"
+            android:background="#FFEFEFEF"
+            android:layout_marginEnd="22dp"
+            android:layout_height="1dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/img_news_online"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_news_online"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_service" />
 
             <TextView
                 android:id="@+id/tv_news_online"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_news_online"
                 android:textColor="#333333"
@@ -275,8 +273,6 @@
                 android:id="@+id/text_news_online"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -284,18 +280,15 @@
                 android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone" />
-        </RelativeLayout>
-    </LinearLayout>
 
-    <View
-        android:id="@+id/line"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="5dp"
-        android:background="#FFE9F6" />
+        </LinearLayout>
+        <View
+            android:layout_marginStart="60dp"
+            android:layout_width="match_parent"
+            android:layout_marginEnd="22dp"
+            android:background="#FFEFEFEF"
+            android:layout_height="1dp"/>
+    </LinearLayout>
 
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/indicator"
@@ -303,418 +296,193 @@
         android:layout_height="37dp"
         android:visibility="gone" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
+        android:background="@color/white"
         android:id="@+id/tabLayouts"
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp">
+        android:gravity="center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp">
 
-        <TextView
-            android:id="@+id/tab1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:maxWidth="100dp"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/view2"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="仅显示已读" />
-
-        <ImageView
-            android:id="@+id/tab_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:src="@mipmap/icon_msg_recommend"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tab1"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-
-        <View
-            android:id="@+id/tab_line1"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/tabLayout1"
             android:layout_width="0dp"
-            android:layout_height="3dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="3dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="3dp"
-            android:background="@drawable/bg_main_com_type"
-            app:layout_constraintEnd_toEndOf="@+id/tab1"
-            app:layout_constraintStart_toStartOf="@+id/tab1"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <ImageView
-            android:id="@+id/expendImg1"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:src="@mipmap/ic_expend_down"
+            android:layout_weight="1"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/tab1"
-            app:layout_constraintStart_toEndOf="@+id/tab1"
-            app:layout_constraintTop_toTopOf="@+id/tab1"
-            tools:visibility="gone" />
+            tools:visibility="visible">
 
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group_tab1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:constraint_referenced_ids="tab1,tab_line1"/>
+            <ImageView
+                android:id="@+id/tab_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="5dp"
+                android:layout_toStartOf="@+id/tab_top1"
+                android:src="@mipmap/icon_msg_recommend"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tab_top1"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible" />
 
-        <View
-            android:id="@+id/view2"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tab2"
-            app:layout_constraintStart_toEndOf="@+id/tab1"
-            app:layout_constraintTop_toTopOf="parent" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/tab_top1"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="MissingConstraints">
 
-        <TextView
-            android:id="@+id/tab2"
-            android:maxWidth="100dp"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            tools:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/view3"
-            app:layout_constraintStart_toEndOf="@+id/view2"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="系统匹配" />
+                <TextView
+                    android:id="@+id/tab1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="tab1"
+                    android:textSize="15dp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:id="@+id/tab_line2"
+                <View
+                    android:id="@+id/tab_line1"
+                    android:layout_width="0dp"
+                    android:layout_height="3dp"
+                    android:layout_below="@+id/tab_top1"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
+                    android:background="@drawable/bg_main_com_type"
+                    app:layout_constraintEnd_toEndOf="@+id/tab1"
+                    app:layout_constraintStart_toStartOf="@+id/tab1"
+                    app:layout_constraintTop_toBottomOf="@+id/tab1" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/tabLayout2"
             android:layout_width="0dp"
-            android:layout_height="3dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="3dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="3dp"
-            android:background="@drawable/bg_main_com_type"
-            app:layout_constraintEnd_toEndOf="@+id/tab2"
-            app:layout_constraintStart_toStartOf="@+id/tab2"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <ImageView
-            android:id="@+id/expendImg2"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:src="@mipmap/ic_expend_down"
+            android:layout_weight="1"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/tab2"
-            app:layout_constraintStart_toEndOf="@+id/tab2"
-            app:layout_constraintTop_toTopOf="@+id/tab2"
-            tools:visibility="gone" />
+            tools:visibility="visible">
 
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group_tab2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:constraint_referenced_ids="view2,tab2,tab_line2"/>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/tab_top2"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="MissingConstraints">
 
-        <View
-            android:id="@+id/view3"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tab3"
-            app:layout_constraintStart_toEndOf="@+id/tab2"
-            app:layout_constraintTop_toTopOf="parent" />
+                <TextView
+                    android:id="@+id/tab2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="tab1"
+                    android:textSize="15dp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:maxWidth="100dp"
-            android:id="@+id/tab3"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            tools:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/view3"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="对方主动" />
+                <View
+                    android:id="@+id/tab_line2"
+                    android:layout_width="0dp"
+                    android:layout_height="3dp"
+                    android:layout_below="@+id/tab_top2"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
+                    android:background="@drawable/bg_main_com_type"
+                    app:layout_constraintEnd_toEndOf="@+id/tab2"
+                    app:layout_constraintStart_toStartOf="@+id/tab2"
+                    app:layout_constraintTop_toBottomOf="@+id/tab2" />
 
-        <View
-            tools:visibility="visible"
-            android:id="@+id/tab_line3"
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/tabLayout3"
             android:layout_width="0dp"
-            android:layout_height="3dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="3dp"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="3dp"
-            android:background="@drawable/bg_main_com_type"
-            app:layout_constraintEnd_toEndOf="@+id/tab3"
-            app:layout_constraintStart_toStartOf="@+id/tab3"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <ImageView
-            android:id="@+id/expendImg3"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:src="@mipmap/ic_expend_down"
+            android:layout_weight="1"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/tab3"
-            app:layout_constraintStart_toEndOf="@+id/tab3"
-            app:layout_constraintTop_toTopOf="@+id/tab3"
-            tools:visibility="gone" />
+            tools:visibility="visible">
 
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group_tab3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:constraint_referenced_ids="view3,tab3,tab_line3"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/tab_top3"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="MissingConstraints">
+
+                <TextView
+                    android:id="@+id/tab3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="tab1"
+                    android:textSize="15dp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:id="@+id/tab_line3"
+                    android:layout_width="0dp"
+                    android:layout_height="3dp"
+                    android:layout_below="@+id/tab_top3"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
+                    android:background="@drawable/bg_main_com_type"
+                    app:layout_constraintEnd_toEndOf="@+id/tab3"
+                    app:layout_constraintStart_toStartOf="@+id/tab3"
+                    app:layout_constraintTop_toBottomOf="@+id/tab3" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-<!--    <LinearLayout-->
-<!--        android:id="@+id/tabLayouts"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="40dp"-->
-<!--        android:gravity="center_vertical"-->
-<!--        android:paddingStart="20dp"-->
-<!--        android:paddingEnd="20dp">-->
-
-<!--        <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--            android:id="@+id/tabLayout1"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_weight="1"-->
-<!--            android:visibility="gone"-->
-<!--            tools:visibility="visible">-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/tab_icon"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginEnd="5dp"-->
-<!--                android:layout_toStartOf="@+id/tab_top1"-->
-<!--                android:src="@mipmap/icon_msg_recommend"-->
-<!--                android:visibility="gone"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintEnd_toStartOf="@+id/tab_top1"-->
-<!--                app:layout_constraintTop_toTopOf="parent"-->
-<!--                tools:visibility="visible" />-->
-
-<!--            <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--                android:id="@+id/tab_top1"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="match_parent"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:gravity="center_horizontal"-->
-<!--                android:orientation="vertical"-->
-<!--                app:layout_constraintWidth_percent="0.8"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintEnd_toEndOf="parent"-->
-<!--                app:layout_constraintStart_toStartOf="parent"-->
-<!--                app:layout_constraintTop_toTopOf="parent"-->
-<!--                tools:ignore="MissingConstraints">-->
-
-<!--                <TextView-->
-<!--                    android:id="@+id/tab1"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:gravity="center"-->
-<!--                    android:text="tab1"-->
-<!--                    android:textSize="15dp"-->
-<!--                    android:textStyle="bold"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintEnd_toEndOf="parent"-->
-<!--                    app:layout_constraintHorizontal_bias="1.0"-->
-<!--                    app:layout_constraintStart_toStartOf="parent"-->
-<!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-<!--                <View-->
-<!--                    android:id="@+id/tab_line1"-->
-<!--                    android:layout_width="0dp"-->
-<!--                    android:layout_height="3dp"-->
-<!--                    android:layout_below="@+id/tab_top1"-->
-<!--                    android:layout_centerHorizontal="true"-->
-<!--                    android:layout_marginStart="3dp"-->
-<!--                    android:layout_marginTop="3dp"-->
-<!--                    android:layout_marginEnd="3dp"-->
-<!--                    android:background="@drawable/bg_main_com_type"-->
-<!--                    app:layout_constraintEnd_toEndOf="@+id/tab1"-->
-<!--                    app:layout_constraintStart_toStartOf="@+id/tab1"-->
-<!--                    app:layout_constraintTop_toBottomOf="@+id/tab1" />-->
-
-<!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/expendImg1"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:padding="5dp"-->
-<!--                android:src="@mipmap/ic_expend_down"-->
-<!--                android:visibility="gone"-->
-<!--                android:layout_marginEnd="1dp"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintEnd_toEndOf="parent"-->
-<!--                app:layout_constraintHorizontal_bias="0.1"-->
-<!--                app:layout_constraintStart_toEndOf="@+id/tab_top1"-->
-<!--                app:layout_constraintTop_toTopOf="parent"-->
-<!--                tools:visibility="visible" />-->
-
-<!--        </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-<!--        <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--            android:id="@+id/tabLayout2"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_weight="1"-->
-<!--            android:visibility="gone"-->
-<!--            tools:visibility="visible">-->
-
-<!--            <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--                android:id="@+id/tab_top2"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="match_parent"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:gravity="center_horizontal"-->
-<!--                android:orientation="vertical"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintEnd_toEndOf="parent"-->
-<!--                app:layout_constraintStart_toStartOf="parent"-->
-<!--                app:layout_constraintTop_toTopOf="parent"-->
-<!--                tools:ignore="MissingConstraints">-->
-
-<!--                <TextView-->
-<!--                    android:id="@+id/tab2"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:gravity="center"-->
-<!--                    android:text="tab1"-->
-<!--                    android:textSize="15dp"-->
-<!--                    android:textStyle="bold"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintEnd_toEndOf="parent"-->
-<!--                    app:layout_constraintHorizontal_bias="1.0"-->
-<!--                    app:layout_constraintStart_toStartOf="parent"-->
-<!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-<!--                <View-->
-<!--                    android:id="@+id/tab_line2"-->
-<!--                    android:layout_width="0dp"-->
-<!--                    android:layout_height="3dp"-->
-<!--                    android:layout_below="@+id/tab_top2"-->
-<!--                    android:layout_centerHorizontal="true"-->
-<!--                    android:layout_marginStart="3dp"-->
-<!--                    android:layout_marginTop="3dp"-->
-<!--                    android:layout_marginEnd="3dp"-->
-<!--                    android:background="@drawable/bg_main_com_type"-->
-<!--                    app:layout_constraintEnd_toEndOf="@+id/tab2"-->
-<!--                    app:layout_constraintStart_toStartOf="@+id/tab2"-->
-<!--                    app:layout_constraintTop_toBottomOf="@+id/tab2" />-->
-
-<!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/expendImg2"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:padding="5dp"-->
-<!--                android:src="@mipmap/ic_expend_down"-->
-<!--                android:visibility="gone"-->
-<!--                app:layout_constraintHorizontal_bias="0.1"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintEnd_toEndOf="parent"-->
-<!--                app:layout_constraintStart_toEndOf="@+id/tab_top2"-->
-<!--                app:layout_constraintTop_toTopOf="parent"-->
-<!--                tools:visibility="visible" />-->
-<!--        </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-<!--        <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--            android:id="@+id/tabLayout3"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_weight="1"-->
-<!--            android:visibility="gone"-->
-<!--            tools:visibility="visible">-->
-
-<!--            <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--                android:id="@+id/tab_top3"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="match_parent"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:gravity="center_horizontal"-->
-<!--                android:orientation="vertical"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintEnd_toEndOf="parent"-->
-<!--                app:layout_constraintStart_toStartOf="parent"-->
-<!--                app:layout_constraintTop_toTopOf="parent"-->
-<!--                tools:ignore="MissingConstraints">-->
-
-<!--                <TextView-->
-<!--                    android:id="@+id/tab3"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:gravity="center"-->
-<!--                    android:text="tab1"-->
-<!--                    android:textSize="15dp"-->
-<!--                    android:textStyle="bold"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintEnd_toEndOf="parent"-->
-<!--                    app:layout_constraintHorizontal_bias="1.0"-->
-<!--                    app:layout_constraintStart_toStartOf="parent"-->
-<!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-<!--                <View-->
-<!--                    android:id="@+id/tab_line3"-->
-<!--                    android:layout_width="0dp"-->
-<!--                    android:layout_height="3dp"-->
-<!--                    android:layout_below="@+id/tab_top3"-->
-<!--                    android:layout_centerHorizontal="true"-->
-<!--                    android:layout_marginStart="3dp"-->
-<!--                    android:layout_marginTop="3dp"-->
-<!--                    android:layout_marginEnd="3dp"-->
-<!--                    android:background="@drawable/bg_main_com_type"-->
-<!--                    app:layout_constraintEnd_toEndOf="@+id/tab3"-->
-<!--                    app:layout_constraintStart_toStartOf="@+id/tab3"-->
-<!--                    app:layout_constraintTop_toBottomOf="@+id/tab3" />-->
-
-<!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/expendImg3"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:padding="5dp"-->
-<!--                app:layout_constraintHorizontal_bias="0.1"-->
-<!--                android:src="@mipmap/ic_expend_down"-->
-<!--                android:visibility="gone"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintEnd_toEndOf="parent"-->
-<!--                app:layout_constraintStart_toEndOf="@+id/tab_top3"-->
-<!--                app:layout_constraintTop_toTopOf="parent"-->
-<!--                tools:visibility="visible" />-->
-<!--        </androidx.constraintlayout.widget.ConstraintLayout>-->
-<!--    </LinearLayout>-->
+    </LinearLayout>
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
+        android:background="@color/white"
         android:layout_height="match_parent"
-        android:layout_marginTop="10dp"
+        android:paddingTop="10dp"
         android:layout_marginBottom="50dp"
         android:overScrollMode="never"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />