From c3ca76df0768b2a75b37f4f8ee238193e0735381 Mon Sep 17 00:00:00 2001
From: hch <16607480311@163.com>
Date: Thu, 21 Mar 2024 17:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/common/adapter/CommentAdapter.java |  2 ++
 .../common/adapter/CommentVideoAdapter.java   |  2 ++
 .../res/layout/activity_community_details.xml |  2 +-
 .../main/res/layout/activity_user_home.xml    | 24 ++++++++-----------
 .../src/main/res/layout/item_comment_view.xml |  6 ++---
 common/src/main/res/values-en-rUS/string.xml  |  2 ++
 common/src/main/res/values-en-rUS/strings.xml |  5 ++++
 common/src/main/res/values-zh-rHK/strings.xml |  4 ++++
 common/src/main/res/values-zh-rTW/strings.xml |  5 ++++
 common/src/main/res/values-zh/strings.xml     |  5 ++++
 common/src/main/res/values/strings.xml        |  8 ++++---
 .../main/activity/UserHomeActivity.java       | 11 +++++----
 12 files changed, 50 insertions(+), 26 deletions(-)
 create mode 100644 common/src/main/res/values-en-rUS/strings.xml

diff --git a/common/src/main/java/com/yunbao/common/adapter/CommentAdapter.java b/common/src/main/java/com/yunbao/common/adapter/CommentAdapter.java
index c9ef57e55..853378b73 100644
--- a/common/src/main/java/com/yunbao/common/adapter/CommentAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/CommentAdapter.java
@@ -144,8 +144,10 @@ public class CommentAdapter extends RecyclerView.Adapter {
         @SuppressLint("SetTextI18n")
         public void setData(CommentBean bean) {
             del.setTag(bean);
+            del1.setTag(bean);
             report.setTag(bean);
             replyTextView.setTag(bean);
+            report1.setTag(bean);
             ImgLoader.display(itemView.getContext(), bean.getUser_avatar(), mAvatar);
             name.setText(bean.getUser_name());
             content.setText(bean.getContent());
diff --git a/common/src/main/java/com/yunbao/common/adapter/CommentVideoAdapter.java b/common/src/main/java/com/yunbao/common/adapter/CommentVideoAdapter.java
index e67bab3ff..0818c13a9 100644
--- a/common/src/main/java/com/yunbao/common/adapter/CommentVideoAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/CommentVideoAdapter.java
@@ -144,8 +144,10 @@ public class CommentVideoAdapter extends RefreshAdapter<CommentBean> {
         @SuppressLint("SetTextI18n")
         public void setData(CommentBean bean) {
             del.setTag(bean);
+            report1.setTag(bean);
             report.setTag(bean);
             replyTextView.setTag(bean);
+            del1.setTag(bean);
             ImgLoader.display(itemView.getContext(), bean.getUser_avatar(), mAvatar);
             name.setText(bean.getUser_name());
             content.setText(bean.getContent());
diff --git a/common/src/main/res/layout/activity_community_details.xml b/common/src/main/res/layout/activity_community_details.xml
index 502d17e28..9a0531d4c 100644
--- a/common/src/main/res/layout/activity_community_details.xml
+++ b/common/src/main/res/layout/activity_community_details.xml
@@ -81,7 +81,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
-                        android:text="关注"
+                        android:text="@string/follow"
                         android:textColor="@color/white"
                         android:textSize="14dp"
                         android:textStyle="bold" />
diff --git a/common/src/main/res/layout/activity_user_home.xml b/common/src/main/res/layout/activity_user_home.xml
index 8422a3d9f..6ca4ac99c 100644
--- a/common/src/main/res/layout/activity_user_home.xml
+++ b/common/src/main/res/layout/activity_user_home.xml
@@ -112,11 +112,11 @@
                                     android:id="@+id/liveStatus"
                                     android:layout_width="wrap_content"
                                     android:layout_height="20dp"
-                                    android:visibility="gone"
                                     android:layout_alignParentBottom="true"
                                     android:layout_centerHorizontal="true"
                                     android:layout_marginBottom="2dp"
-                                    android:src="@mipmap/icon_liveing_cn" />
+                                    android:src="@mipmap/icon_liveing_cn"
+                                    android:visibility="gone" />
 
                             </RelativeLayout>
 
@@ -169,11 +169,10 @@
                                         <TextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
-                                            android:text="粉丝"
+                                            android:text="@string/fans"
                                             android:textColor="#777777"
                                             android:textSize="12dp" />
 
-
                                     </LinearLayout>
 
                                     <LinearLayout
@@ -195,16 +194,14 @@
                                         <TextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
-                                            android:text="获赞"
+                                            android:text="@string/praise"
                                             android:textColor="#777777"
                                             android:textSize="12dp" />
 
-
                                     </LinearLayout>
 
                                 </LinearLayout>
 
-
                             </LinearLayout>
 
                             <LinearLayout
@@ -226,7 +223,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginLeft="5dp"
-                                    android:text="关注"
+                                    android:text="@string/follow"
                                     android:textColor="@color/white"
                                     android:textSize="14dp"
                                     android:textStyle="bold" />
@@ -256,7 +253,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_marginLeft="10dp"
                                 android:gravity="center_vertical"
-                                android:text="在线"
+                                android:text="@string/activity_msg_chat_top_status_online"
                                 android:textColor="#777777"
                                 android:textSize="10dp" />
 
@@ -312,7 +309,7 @@
                                     android:layout_height="20dp"
                                     android:layout_marginLeft="27dp"
                                     android:gravity="center_vertical"
-                                    android:text="工会"
+                                    android:text="@string/trade_union"
                                     android:textColor="#F65BBB"
                                     android:textSize="12dp" />
 
@@ -335,7 +332,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginLeft="5dp"
-                                    android:text="真人认证"
+                                    android:text="@string/real_person"
                                     android:textColor="#333333"
                                     android:textSize="12dp" />
 
@@ -703,7 +700,7 @@
                                 android:id="@+id/moreText"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="查看更多"
+                                android:text="@string/moer"
                                 android:textColor="#FF4874"
                                 android:textSize="13dp"
                                 android:textStyle="bold" />
@@ -720,7 +717,6 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
 
-
                         </LinearLayout>
 
                         <View
@@ -744,7 +740,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="个人动态"
+                                android:text="@string/commen_user_active"
                                 android:textColor="#333333"
                                 android:textSize="16dp"
                                 android:textStyle="bold" />
diff --git a/common/src/main/res/layout/item_comment_view.xml b/common/src/main/res/layout/item_comment_view.xml
index 11e92d34b..558e3cc05 100644
--- a/common/src/main/res/layout/item_comment_view.xml
+++ b/common/src/main/res/layout/item_comment_view.xml
@@ -83,7 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:padding="10dp"
-            android:text="回复"
+            android:text="@string/dialog_message_chat_notify_btn"
             android:textColor="#777777"
             android:textSize="11dp" />
 
@@ -94,7 +94,7 @@
             android:layout_marginTop="10dp"
             android:layout_marginRight="5dp"
             android:padding="10dp"
-            android:text="举报"
+            android:text="@string/chat_report"
             android:textColor="#333333"
             android:textSize="11dp"
             android:textStyle="bold" />
@@ -171,7 +171,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginRight="5dp"
                 android:padding="10dp"
-                android:text="举报"
+                android:text="@string/chat_report"
                 android:textColor="#333333"
                 android:textSize="11dp"
                 android:textStyle="bold" />
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index c5b799b9d..84f93b757 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -778,6 +778,7 @@
     <string name="now_noble_time">Expiration time： </string>
 
     <string name="black_succer">Successfully joined the blacklist</string>
+    <string name="black_add">Add to blacklist</string>
     <string name="black_error">Failed to join blacklist</string>
 
     <string name="black_succer_more">Blacklist removed successfully</string>
@@ -1464,4 +1465,5 @@ Limited ride And limited avatar frame</string>
     <string name="dialog_message_chat_notify_btn">Reply</string>
     <string name="activity_msg_chat_top_status_online">Online</string>
     <string name="activity_msg_chat_top_status_offline">Offline</string>
+    <string name="commen_user_active">Personal updates</string>
 </resources>
diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml
new file mode 100644
index 000000000..9dc2dcab2
--- /dev/null
+++ b/common/src/main/res/values-en-rUS/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="real_person">真人认证</string>
+    <string name="trade_union">工会</string>
+</resources>
\ No newline at end of file
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index c2f272128..09c3d9a13 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -820,6 +820,7 @@
     <string name="now_noble">當前貴族： </string>
     <string name="now_noble_time">到期時間： </string>
     <string name="black_succer">已加入黑名单</string>
+    <string name="black_add">加入黑名單</string>
     <string name="black_error">加入黑名单失败</string>
     <string name="black_succer_more">移除黑名单成功</string>
     <string name="black_error_more">移除黑名单失败</string>
@@ -1460,6 +1461,9 @@
     <string name="dialog_message_say_hi_age">年齡:</string>
     <string name="dialog_message_say_hi_btn">打招呼</string>
     <string name="dialog_message_chat_notify_btn">回復</string>
+    <string name="commen_user_active">個人動態</string>
+    <string name="real_person">真人认证</string>
+    <string name="trade_union">工会</string>
     <string name="activity_msg_chat_top_status_online">在線</string>
     <string name="activity_msg_chat_top_status_offline">離線</string>
 </resources>
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index 6c9dc1b4e..10a2ef80f 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -820,6 +820,7 @@
     <string name="now_noble">當前貴族： </string>
     <string name="now_noble_time">到期時間： </string>
     <string name="black_succer">已加入黑名单</string>
+    <string name="black_add">加入黑名單</string>
     <string name="black_error">加入黑名单失败</string>
     <string name="black_succer_more">移除黑名单成功</string>
     <string name="black_error_more">移除黑名单失败</string>
@@ -1459,6 +1460,10 @@
     <string name="dialog_message_say_hi_age">年齡:</string>
     <string name="dialog_message_say_hi_btn">打招呼</string>
     <string name="dialog_message_chat_notify_btn">回復</string>
+    <string name="commen_user_active">個人動態</string>
+    <string name="real_person">真人认证</string>
+    <string name="trade_union">工会</string>
+
     <string name="activity_msg_chat_top_status_online">在線</string>
     <string name="activity_msg_chat_top_status_offline">離線</string>
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index f1dd719bb..1771677a9 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -819,6 +819,7 @@
     <string name="now_noble">當前貴族： </string>
     <string name="now_noble_time">到期時間： </string>
     <string name="black_succer">已加入黑名單</string>
+    <string name="black_add">加入黑名單</string>
     <string name="black_error">加入黑名單失敗</string>
     <string name="black_succer_more">移除黑名單成功</string>
     <string name="black_error_more">移除黑名單失敗</string>
@@ -1456,6 +1457,10 @@
     <string name="dialog_message_say_hi_age">年齡:</string>
     <string name="dialog_message_say_hi_btn">打招呼</string>
     <string name="dialog_message_chat_notify_btn">回復</string>
+    <string name="commen_user_active">個人動態</string>
+    <string name="real_person">真人认证</string>
+    <string name="trade_union">工会</string>
     <string name="activity_msg_chat_top_status_online">在線</string>
     <string name="activity_msg_chat_top_status_offline">離線</string>
+    <string name="praise">獲讚</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index d81462798..e54aae184 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -776,7 +776,7 @@
 
     <string name="now_noble">Current VIP : </string>
     <string name="now_noble_time">Expiration time： </string>
-
+    <string name="black_add">Add to blacklist</string>
     <string name="black_succer">Successfully joined the blacklist</string>
     <string name="black_error">Failed to join blacklist</string>
 
@@ -1481,8 +1481,10 @@ Limited ride And limited avatar frame</string>
     <string name="permission_storage">文件读写</string>
     <string name="activity_msg_chat_top_status_online">Online</string>
     <string name="activity_msg_chat_top_status_offline">Offline</string>
-
-
+    <string name="commen_user_active">个人动态</string>
+    <string name="real_person">真人认证</string>
+    <string name="trade_union">工会</string>
+    <string name="praise">Like</string>
 
 
 </resources>
diff --git a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
index 53ccb1318..af4a6a0a8 100644
--- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
@@ -59,6 +59,7 @@ import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.UserHomeImgsViewHolder;
 
 import java.io.File;
@@ -227,7 +228,7 @@ public class UserHomeActivity extends AbsActivity {
         }
 
         if (userInfo.getUserHomeTopInfo().getRong_online().equals("0")) {
-            userStatus.setText(R.string.activity_msg_chat_top_status_online);
+            userStatus.setText(getResources().getString(R.string.activity_msg_chat_top_status_online));
             userStatusIcon.setImageDrawable(getResources().getDrawable(R.mipmap.icon_green));
         } else {
             userStatus.setText(R.string.activity_msg_chat_top_status_offline);
@@ -258,7 +259,7 @@ public class UserHomeActivity extends AbsActivity {
         });
         tagList = new ArrayList<>();
         if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getAge())) {
-            tagList.add(userInfo.getUserHomeTopInfo().getAge() + "岁");
+            tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "Age"));
         }
         if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getHeight())) {
             tagList.add(userInfo.getUserHomeTopInfo().getHeight());
@@ -551,9 +552,9 @@ public class UserHomeActivity extends AbsActivity {
             @Override
             public void onClick(View v) {
                 SparseArray<String> array = new SparseArray<>();
-                array.append(1, "不感兴趣");
-                array.append(0, "举报");
-                array.append(2, "加入黑名单");
+                array.append(1, "不感興趣");
+                array.append(0, getResources().getString(R.string.report));
+                array.append(2, getResources().getString(R.string.black_add));
                 DialogUitl.showStringArrayDialog(UserHomeActivity.this, array, new DialogUitl.StringArrayDialogCallback() {
                     @Override
                     public void onItemClick(String text, int tag) {