From 7105f3bc820d0364792d17a9177953dd94ed0f4b Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Sat, 2 Nov 2024 11:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E9=83=A8=E5=88=86=E6=95=B4?=
 =?UTF-8?q?=E7=90=86=E4=BA=86=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/tmp/full-r8-config.txt                            |  2 --
 .../main/res/layout/item_game_type_select_view.xml    |  7 +++++--
 .../src/main/res/layout/item_home_sud_game_list2.xml  |  2 +-
 common/src/main/res/values-zh/strings.xml             | 11 +++++++++++
 common/src/main/res/values/strings.xml                |  4 ++++
 main/src/main/res/layout/activity_entry2.xml          |  4 ++--
 main/src/main/res/values/strings.xml                  |  3 +--
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt
index 1804dd9f1..859dfb00d 100644
--- a/app/tmp/full-r8-config.txt
+++ b/app/tmp/full-r8-config.txt
@@ -888,8 +888,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.yunbao.common.custom.CommonRefreshView { <init>(android.content.Context, android.util.AttributeSet); }
 
--keep class com.yunbao.common.custom.CommonRefreshWaterfallView { <init>(android.content.Context, android.util.AttributeSet); }
-
 -keep class com.yunbao.common.custom.DrawableCheckBox { <init>(android.content.Context, android.util.AttributeSet); }
 
 -keep class com.yunbao.common.custom.DrawableRadioButton { <init>(android.content.Context, android.util.AttributeSet); }
diff --git a/common/src/main/res/layout/item_game_type_select_view.xml b/common/src/main/res/layout/item_game_type_select_view.xml
index 9577da7d0..55ba94362 100644
--- a/common/src/main/res/layout/item_game_type_select_view.xml
+++ b/common/src/main/res/layout/item_game_type_select_view.xml
@@ -42,9 +42,12 @@
 
     <TextView
         android:id="@+id/gameName"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:text="@string/interactive_game_room_all"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@color/color_111111"
         android:textSize="12sp"
         android:textStyle="bold"
@@ -52,7 +55,7 @@
         app:layout_constraintEnd_toEndOf="@+id/gameBg"
         app:layout_constraintStart_toStartOf="@+id/gameBg"
         app:layout_constraintTop_toBottomOf="@+id/gameIcon"
-        app:layout_constraintVertical_bias="0.39" />
+        app:layout_constraintVertical_bias="0.34" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/common/src/main/res/layout/item_home_sud_game_list2.xml b/common/src/main/res/layout/item_home_sud_game_list2.xml
index a684cb6d2..b95f6027b 100644
--- a/common/src/main/res/layout/item_home_sud_game_list2.xml
+++ b/common/src/main/res/layout/item_home_sud_game_list2.xml
@@ -8,7 +8,7 @@
     android:layout_marginStart="16dp"
     android:layout_marginTop="9dp"
     android:layout_marginEnd="16dp"
-    android:background="@drawable/bg_f2edd7_10">
+    android:background="@mipmap/background_home_sud_game_list">
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/avatar"
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 7521b5b4c..726e699cf 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1612,4 +1612,15 @@
     <string name="offline_only">僅展示離線</string>
     <string name="read_only">展示對方已讀</string>
     <string name="unread_only">展示對方未讀</string>
+    <string name="user_rights">用戶權益</string>
+    <string name="creation_center">創作中心</string>
+    <string name="other_functions">其他功能</string>
+    <string name="game_hall">遊戲大廳</string>
+    <string name="unlimited_threshold">不限門檻</string>
+    <string name="unrestricted_players">不限玩家</string>
+    <string name="number_of_players">遊戲人數</string>
+    <string name="number_of_online">在線人數</string>
+    <string name="interaction_type">互動</string>
+    <string name="system_msg">系統消息</string>
+    <string name="user_login_account">使用手機號登錄</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index f8e4b5b3c..dd6829156 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1428,4 +1428,8 @@ Limited ride And limited avatar frame</string>
     <string name="unrestricted_players">不限玩家</string>
     <string name="number_of_players">遊戲人數</string>
     <string name="number_of_online">在線人數</string>
+    <string name="interaction_type">互動</string>
+    <string name="system_msg">系統消息</string>
+    <string name="user_login_account">Sign in with Phone number</string>
+
 </resources>
diff --git a/main/src/main/res/layout/activity_entry2.xml b/main/src/main/res/layout/activity_entry2.xml
index c4e895cba..5117ca544 100644
--- a/main/src/main/res/layout/activity_entry2.xml
+++ b/main/src/main/res/layout/activity_entry2.xml
@@ -99,7 +99,7 @@
         android:id="@+id/googleTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/user_login_facebook"
+        android:text="@string/user_login_google"
         android:textColor="@color/color_111111"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="@+id/btn_google"
@@ -143,7 +143,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/user_login_facebook"
+        android:text="@string/user_login_account"
         android:textColor="@color/color_111111"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="@+id/btn_phone"
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 826cadd22..31af88791 100644
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -108,7 +108,6 @@
     <string name="live_room_sud_hint_join">Join</string>
     <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
     <string name="game">game</string>
-    <string name="interaction_type">互動</string>
-    <string name="system_msg">系統消息</string>
+
 
 </resources>