From 02dc40b1bfd0ac30d6d767381344fc8992be3e9c Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Mon, 26 Aug 2024 10:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9B=BF=E6=8D=A2=E6=88=90?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=20=E7=AC=AC=E4=BA=8C=E4=B8=AA=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90=E7=A4=BE=E5=8C=BA=20=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E6=8A=8A=E9=A6=96=E9=A1=B5=E7=9A=84=E6=8E=A8=E9=80=81=E5=85=88?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=20=E6=8A=8A=E5=8C=85=E5=90=8D?=
 =?UTF-8?q?=E9=9A=8F=E4=BE=BF=E6=8D=A2=E4=B8=80=E4=B8=AA=20=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E6=8A=8A=E7=99=BB=E5=BD=95line=20=E8=BF=98=E6=9C=89?=
 =?UTF-8?q?=E8=B0=B7=E6=AD=8C=E7=99=BB=E5=BD=95=E5=8E=BB=E4=BA=86=20?=
 =?UTF-8?q?=E7=95=99fb=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Share/src/main/AndroidManifest.xml            |  2 +-
 app/build.gradle                              |  2 +-
 app/google-services.json                      |  8 +++----
 .../java/com/shayu/phonelive/AppContext.java  |  1 +
 common/src/main/AndroidManifest.xml           |  2 +-
 .../yunbao/common/http/CommonHttpUtil.java    |  2 +-
 .../yunbao/common/utils/ProcessImageUtil.java |  6 ++---
 common/src/main/res/values-en-rUS/strings.xml |  1 +
 common/src/main/res/values-zh/strings.xml     |  3 ++-
 common/src/main/res/values/strings.xml        |  1 +
 .../faceunity/agora/SWAuManager.java          |  3 ++-
 main/google-services.json                     |  8 +++----
 .../yunbao/main/activity/MainActivity.java    | 14 ++++++-----
 main/src/main/res/layout/activity_entry.xml   |  5 ++--
 main/src/main/res/layout/view_homemain.xml    | 24 +++++++++----------
 15 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/Share/src/main/AndroidManifest.xml b/Share/src/main/AndroidManifest.xml
index 7bc0a90cb..ba33d01d2 100644
--- a/Share/src/main/AndroidManifest.xml
+++ b/Share/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     >
 
     <queries>
-        <package android:name="com.pandora.sy"/>
+        <package android:name="com.pandora.cs"/>
         <package android:name="com.facebook.orca"/>
 
         <package
diff --git a/app/build.gradle b/app/build.gradle
index aa3a7f6cd..4799aa6ec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -298,7 +298,7 @@ android {
 
     defaultConfig {
 //        applicationId "myname.pdlive.shayu"
-        applicationId "com.pandora.sy"
+        applicationId "com.pandora.cs"
         minSdkVersion rootProject.ext.android.minSdkVersion
         //版本在这里修改
         targetSdkVersion rootProject.ext.android.targetSdkVersion
diff --git a/app/google-services.json b/app/google-services.json
index 293dd2490..371194e80 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
         "android_client_info": {
-          "package_name": "com.pandora.sy"
+          "package_name": "com.pandora.cs"
         }
       },
       "oauth_client": [
@@ -17,7 +17,7 @@
           "client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
           }
         },
@@ -25,7 +25,7 @@
           "client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
@@ -33,7 +33,7 @@
           "client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },
diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java
index 9ea940cce..12c42c54d 100644
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/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() {
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 8c371f8a1..6de040683 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.pandora.sy.fileprovider"
+            android:authorities="com.pandora.cs.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
index bcfc0e1e9..152df5db6 100644
--- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
@@ -417,7 +417,7 @@ public class CommonHttpUtil {
                 .params("purchaseToken", purchaseToken)
                 .params("productId", productId)
                 .params("orderno", orderno)
-                .params("package_name", "com.pandora.sy")
+                .params("package_name", "com.pandora.cs")
                 .execute(callback);
     }
 
diff --git a/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java b/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
index 1c848afe0..d7ef112f5 100644
--- a/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
+++ b/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.pandora.sy.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.pandora.sy.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.pandora.sy.fileprovider", mCorpResult);
+                Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCorpResult);
                 if (resultUri == null || mFragment == null || mContext == null) {
                     return;
                 }
diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml
index 51b015de3..104016e61 100644
--- a/common/src/main/res/values-en-rUS/strings.xml
+++ b/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>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index c98de881c..199d80d37 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/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.pandora.sy.fileprovider</string>
+    <string name="FILE_PROVIDER">com.pandora.cs.fileprovider</string>
     <string name="ren">人</string>
     <string name="ge">個</string>
     <string name="count">數量</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index e59cb38c7..686f300fd 100644
--- a/common/src/main/res/values/strings.xml
+++ b/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>
diff --git a/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java b/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java
index e4562b9dc..2ef7e1fa5 100644
--- a/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java
+++ b/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);
         }
     }
 }
diff --git a/main/google-services.json b/main/google-services.json
index 293dd2490..371194e80 100644
--- a/main/google-services.json
+++ b/main/google-services.json
@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
         "android_client_info": {
-          "package_name": "com.pandora.sy"
+          "package_name": "com.pandora.cs"
         }
       },
       "oauth_client": [
@@ -17,7 +17,7 @@
           "client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
           }
         },
@@ -25,7 +25,7 @@
           "client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
@@ -33,7 +33,7 @@
           "client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index 2305ea97f..c83c9ac69 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -1281,13 +1281,15 @@ 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);//直播
-                    vh = mMainHomeCommunityViewHolder;*/
+                    /*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;
                 } else if (position == 2) {
                     mainMessageViewHolder = new MainMessageViewHolder(this, parent);
                     vh = mainMessageViewHolder;
diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml
index 98746db2c..e15c04da7 100644
--- a/main/src/main/res/layout/activity_entry.xml
+++ b/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
@@ -192,7 +193,7 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:src="@mipmap/login_line"
-                    android:visibility="visible" />
+                    android:visibility="gone" />
 
                 <RelativeLayout
                     android:layout_width="57dp"
@@ -331,7 +332,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_centerHorizontal="true"
-            android:visibility="visible"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml
index 91ceaaccc..0b4a08207 100644
--- a/main/src/main/res/layout/view_homemain.xml
+++ b/main/src/main/res/layout/view_homemain.xml
@@ -47,18 +47,6 @@
                     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_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/main_home" />
-
-                <com.yunbao.common.custom.TabButton
-                    android:layout_width="0dp"
-                    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_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
@@ -66,6 +54,18 @@
                     app:tbn_text_size="11sp"
                     app:tbn_tip="@string/live" />
 
+                <com.yunbao.common.custom.TabButton
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="60dp"
+                    android:layout_weight="1"
+                    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/community" />
+
                 <com.yunbao.common.custom.TabButton
                     android:layout_width="0dp"
                     android:layout_height="match_parent"