From d61d142ec1dcc75518822b5856a1f25dcebfe02b Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Mon, 5 Aug 2024 14:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96[=E7=A4=BE=E5=8C=BA=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E6=8E=92=E7=89=88]=20=E4=BF=AE=E5=A4=8D[=E5=AE=98?=
 =?UTF-8?q?=E6=96=B9=E9=80=9A=E7=9F=A5-=E2=80=9C=E9=BB=9E=E6=93=8A?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E2=80=9D-=E8=8B=B1=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AD=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_comment_view.xml | 123 +++++++++---------
 .../dialog/LiveUserAnchorMsgPopDialog.java    |   1 +
 live/src/main/res/layout/item_sys_msg.xml     |   2 +-
 3 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/common/src/main/res/layout/item_comment_view.xml b/common/src/main/res/layout/item_comment_view.xml
index ef0af0cb0..fc77a2ae0 100644
--- a/common/src/main/res/layout/item_comment_view.xml
+++ b/common/src/main/res/layout/item_comment_view.xml
@@ -11,94 +11,89 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:orientation="horizontal">
-
-        <com.makeramen.roundedimageview.RoundedImageView
-            android:id="@+id/avatar"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/icon_data_empty"
-            app:riv_oval="true" />
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="7dp"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/avatar"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:scaleType="centerCrop"
+                android:src="@mipmap/icon_data_empty"
+                app:riv_oval="true" />
 
             <TextView
                 android:id="@+id/name"
+                android:layout_weight="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
                 android:text="栗子栗子🌰zzz"
                 android:textColor="#777777"
                 android:textSize="12dp" />
 
             <TextView
-                android:id="@+id/content"
+                android:id="@+id/author"
+                android:layout_width="45dp"
+                android:layout_height="17dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/bg_main_com_author"
+                android:gravity="center"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/active_author"
+                android:textColor="@color/white"
+                android:textSize="10dp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/del"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="栗子栗子🌰zzz"
+                android:padding="10dp"
+                android:text="@string/delete"
+                android:textColor="#777777"
+                android:textSize="11dp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/replyTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="9dp"
+                android:text="@string/dialog_message_chat_notify_btn"
+                android:textColor="#777777"
+                android:textSize="11dp" />
+
+            <TextView
+                android:id="@+id/report"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp"
+                android:padding="9dp"
+                android:text="@string/chat_report"
                 android:textColor="#333333"
-                android:textSize="12dp" />
+                android:textSize="11dp"
+                android:textStyle="bold" />
 
         </LinearLayout>
 
         <TextView
-            android:id="@+id/author"
-            android:layout_width="45dp"
-            android:layout_height="17dp"
-            android:layout_marginLeft="10dp"
-            android:background="@drawable/bg_main_com_author"
-            android:gravity="center"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:text="@string/active_author"
-            android:textColor="@color/white"
-            android:textSize="10dp"
-            android:visibility="gone" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/del"
+            android:id="@+id/content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="@string/delete"
-            android:textColor="#777777"
-            android:textSize="11dp"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/replyTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="9dp"
-            android:text="@string/dialog_message_chat_notify_btn"
-            android:textColor="#777777"
-            android:textSize="11dp" />
-
-        <TextView
-            android:id="@+id/report"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
-            android:padding="9dp"
-            android:text="@string/chat_report"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="40dp"
+            android:layout_marginTop="5dp"
+            android:text="栗子栗子🌰栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子zzz"
             android:textColor="#333333"
-            android:textSize="11dp"
-            android:textStyle="bold" />
-
+            android:textSize="12dp" />
     </LinearLayout>
 
+
     <LinearLayout
         android:id="@+id/replyLayout"
         android:layout_width="match_parent"
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMsgPopDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMsgPopDialog.java
index 171591a07..2619f6c24 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMsgPopDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMsgPopDialog.java
@@ -83,6 +83,7 @@ public class LiveUserAnchorMsgPopDialog extends AbsDialogFragment {
         mIndicator = (MagicIndicator) findViewById(R.id.indicator);
         viewPager = (ViewPager2) findViewById(R.id.viewPager);
         titleCount= (TextView) findViewById(R.id.titleCount);
+        titleCount.setText(getResources().getString(R.string.message_chat_msg_all_an_a)+"(0)");
         fragmentList = new ArrayList<>();
         fragmentList.add(new MainMessageChatListFragment(AppManager.getInstance().getLiveActivity()));
         viewPager.setAdapter(new FragmentStateAdapter((FragmentActivity) AppManager.getInstance().getLiveActivity()) {
diff --git a/live/src/main/res/layout/item_sys_msg.xml b/live/src/main/res/layout/item_sys_msg.xml
index c6d132a00..015881553 100644
--- a/live/src/main/res/layout/item_sys_msg.xml
+++ b/live/src/main/res/layout/item_sys_msg.xml
@@ -83,7 +83,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="點擊查看"
+                android:text="@string/click_to_view"
                 android:textColor="#ffaaaaaa"
                 android:textSize="12sp" />