From 3226109442321d39159795c39769d591d6ce4161 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Wed, 26 Jun 2024 21:22:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E9=A1=B5=E9=83=A8=E5=88=86BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chwl/app/ui/user/activity/UserInfoActivity.java |  1 -
 .../ui/user/adapter/UserInfoIndicatorAdapter.java   |  2 +-
 .../main/res/drawable-ldrtl/user_info_bg_live.xml   | 13 +++++++++++++
 app/src/main/res/layout/activity_user_info.xml      |  2 +-
 app/src/main/res/values-ar/strings.xml              |  2 +-
 app/src/main/res/values-zh-rTW/strings.xml          |  2 +-
 app/src/main/res/values/strings.xml                 |  2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable-ldrtl/user_info_bg_live.xml

diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
index b9e3e2de2..dbac1db84 100644
--- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
+++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
@@ -55,7 +55,6 @@ import com.chwl.app.ui.utils.ImageLoadUtilsV2;
 import com.chwl.app.ui.widget.ButtonItem;
 import com.chwl.app.ui.widget.ObservableScrollView;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
-import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
 import com.chwl.app.utils.RegexUtil;
 import com.chwl.core.XConstants;
 import com.chwl.core.auth.AuthModel;
diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java
index 76f0a429d..cb8ccc5a3 100644
--- a/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java
+++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoIndicatorAdapter.java
@@ -42,7 +42,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
         scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_191919));
         scaleTransitionPagerTitleView.setMinScale(minScale);
         scaleTransitionPagerTitleView.setTextSize(textSize);
-        int padding = UIUtil.dip2px(context, 12);
+        int padding = context.getResources().getDimensionPixelOffset(R.dimen.dp_12);
         scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0);
         scaleTransitionPagerTitleView.setText(mTitleList.get(i));
         scaleTransitionPagerTitleView.setOnClickListener(view -> {
diff --git a/app/src/main/res/drawable-ldrtl/user_info_bg_live.xml b/app/src/main/res/drawable-ldrtl/user_info_bg_live.xml
new file mode 100644
index 000000000..3121b45ee
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl/user_info_bg_live.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="0px"
+        android:bottomRightRadius="@dimen/dp_11"
+        android:topLeftRadius="0px"
+        android:topRightRadius="@dimen/dp_11" />
+
+    <gradient
+        android:endColor="#FFD936"
+        android:startColor="#F2A20F" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 05eba3709..36eca216f 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -313,7 +313,7 @@
                             android:gravity="center_horizontal"
                             android:hint="@string/msg_no_user_desc"
                             android:paddingHorizontal="@dimen/dp_23"
-                            android:textColor="#991A1A1A"
+                            android:textColor="#1A1A1A"
                             android:textColorHint="#991A1A1A"
                             android:textSize="@dimen/dp_12"
                             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 5c0209375..5b2ec219d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -974,7 +974,7 @@
     <string name="me_personal_center_recharge_card_click">نقرة على بطاقة إعادة الشحن في مركز الفرد</string>
     <string name="me_click_my_center">نقرة على وحدة ميزات مركز الفرد</string>
     <string name="me_in_live">مباشر</string>
-    <string name="me_data">البيانات</string>
+    <string name="me_data">المعلومات</string>
     <string name="me_dynamic">ديناميكيات</string>
     <string name="me_gift_wall">جدار الهدايا</string>
     <string name="me_shield_room">حجرة الدرع</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 831724590..a434ec9f6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -168,7 +168,7 @@
     <string name="home_ktv_hottest">最熱</string>
     <string name="find_newer_list_title">新人駕到</string>
     <string name="find_invite_title">邀請好友送豪禮</string>
-    <string name="msg_no_user_desc">這人什麼都冇有留下~</string>
+    <string name="msg_no_user_desc">這人什麼都沒有留下~</string>
     <string name="hall_new_ait_tip">新消息：%1$s 在公聊大廳@你</string>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c0aea6bc..9a049caf6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -988,7 +988,7 @@
     <string name="me_personal_center_recharge_card_click">Personal Center Recharge Card Click</string>
     <string name="me_click_my_center">Personal Center Feature Module Click</string>
     <string name="me_in_live">Live</string>
-    <string name="me_data">Data</string>
+    <string name="me_data">Profile</string>
     <string name="me_dynamic">Dynamic</string>
     <string name="me_gift_wall">Gift Wall</string>
     <string name="me_shield_room">Shield Room</string>