From a51813e706e487f420fd26d41ad08f5409f6d8ca Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Sun, 26 Nov 2023 15:43:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9google=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E5=90=8D=20feat:=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                  |  6 ++++++
 app/src/main/AndroidManifest.xml                  | 15 +--------------
 app/src/main/res/values/strings.xml               |  1 -
 .../java/com/chwl/library/common/Constants.java   |  4 +---
 nim_uikit/res/values/strings-ptr.xml              |  1 -
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8cfa14299..6c8d592e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,6 +17,12 @@ android {
 
         flavorDimensions 'default'
         buildConfigField "boolean", "ISOLATION_MODE", "$isolationMode"
+
+        if (isolationMode) {
+            resValue "string", "app_name", "Hi-d"
+        } else {
+            resValue "string", "app_name", "Hi"
+        }
     }
 
     splits {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5e7bad6b2..60cf0dcbc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -94,7 +94,7 @@
         android:supportsRtl="true"
         android:testOnly="false"
         android:theme="@style/MyMaterialTheme"
-        tools:replace="android:name,android:allowBackup"
+        tools:replace="android:name,android:label,android:allowBackup"
         tools:targetApi="n">
 
         <activity
@@ -520,15 +520,6 @@
             android:name=".family.view.activity.FamilyGameListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".treasure_box.activity.TreasureBoxActivity"
-            android:theme="@style/dialog_web_view_activity" />
-        <activity
-            android:name=".treasure_box.activity.BoxRankingActivity"
-            android:theme="@style/room_message_activity" />
-        <activity
-            android:name=".treasure_box.activity.TreasureBoxHonourActivity"
-            android:theme="@style/dialog_web_view_activity" />
         <activity android:name=".ui.setting.VerifyPhoneActivity" />
         <activity android:name=".ui.setting.ModifyPwdActivity" />
         <activity
@@ -982,10 +973,6 @@
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".treasurefairy.HomeFairyActivity"
-            android:exported="false"
-            android:theme="@style/transparent_activity" />
 
         <activity
             android:name=".ui.webview.FairyDialogWebViewActivity"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4d5bc20b..412f2f59c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <!DOCTYPE resources [<!ENTITY app_name "Habu Live" >]>
 <resources>
-    <string name="app_name">&app_name;</string>
     <string name="no_list_data">暫無消息</string>
     <string name="str_network_not_capable">網絡不給力</string>
     <string name="network_error_reload">網絡異常，加載失敗</string>
diff --git a/library/src/module_common/java/com/chwl/library/common/Constants.java b/library/src/module_common/java/com/chwl/library/common/Constants.java
index 1b53c0b5d..2d17ffdcf 100644
--- a/library/src/module_common/java/com/chwl/library/common/Constants.java
+++ b/library/src/module_common/java/com/chwl/library/common/Constants.java
@@ -6,7 +6,5 @@ public class Constants {
     public static final int UPLOAD_IMAGE_MAX_FILE_LENGTH = 640;
     //上传的图片 默认宽高最大值 2340
     public static final int UPLOAD_IMAGE_MAX_SIZE = 2340;
-    //上传的gif 默认大小不能超过 1MB
-    public static final int UPLOAD_GIF_MAX_SIZE = 1 << 20;
-    public static final String GOOGLE = "google_habu";
+    public static final String GOOGLE = "google_hiyoo";
 }
diff --git a/nim_uikit/res/values/strings-ptr.xml b/nim_uikit/res/values/strings-ptr.xml
index 3c627a978..87cc77a54 100644
--- a/nim_uikit/res/values/strings-ptr.xml
+++ b/nim_uikit/res/values/strings-ptr.xml
@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name">Library</string>
     <string name="loading">正在加载中...</string>
     <string name="load_failed">加載失敗，請點我重試</string>
     <string name="load_end">沒有更多數據</string>