From dfeb3a78c117a06b028bcd1d6e5321f742412cbe Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Fri, 21 Jul 2023 13:34:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B1=E6=96=87=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8B=EF=BC=8C=E8=B4=AD=E4=B9=B0=E6=98=AF=E5=AE=88?=
 =?UTF-8?q?=E6=8A=A4=E6=96=87=E6=A1=88=E8=B6=85=E9=95=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/dialog_new_guard_buy.xml   | 16 +++++++++++-----
 .../main/res/layout/dialog_new_guard_list.xml  | 18 +++++++++++++++---
 live/src/main/res/layout/view_live_room.xml    |  3 ++-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/live/src/main/res/layout/dialog_new_guard_buy.xml b/live/src/main/res/layout/dialog_new_guard_buy.xml
index b2bdcef04..75e04fce3 100644
--- a/live/src/main/res/layout/dialog_new_guard_buy.xml
+++ b/live/src/main/res/layout/dialog_new_guard_buy.xml
@@ -145,14 +145,20 @@
                 android:layout_marginTop="25dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                tools:visibility="gone">
+                tools:visibility="visible">
 
 
-                <TextView
+                <com.yunbao.common.views.weight.MarqueeTextView
                     android:id="@+id/guard_coin_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true"
                     android:layout_marginLeft="10dp"
                     android:textColor="#9E7CFD"
                     android:textSize="14sp" />
@@ -173,13 +179,13 @@
                     android:id="@+id/guard_btn_buy"
                     android:layout_width="110dp"
                     android:layout_height="30dp"
-                    android:maxLines="1"
-                    android:ellipsize="end"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:layout_marginEnd="15dp"
                     android:background="@drawable/bg_guard_btn_buy"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:text="@string/guard_buy"
                     android:textColor="@color/white"
                     android:textSize="14sp" />
@@ -194,7 +200,7 @@
                 android:orientation="vertical"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                tools:visibility="visible">
+                tools:visibility="invisible">
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/live/src/main/res/layout/dialog_new_guard_list.xml b/live/src/main/res/layout/dialog_new_guard_list.xml
index 692c0c5c4..981a39668 100644
--- a/live/src/main/res/layout/dialog_new_guard_list.xml
+++ b/live/src/main/res/layout/dialog_new_guard_list.xml
@@ -115,21 +115,27 @@
                 app:layout_constraintStart_toStartOf="parent">
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="280dp"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:orientation="vertical">
 
-                    <TextView
+                    <com.yunbao.common.views.weight.MarqueeTextView
                         android:id="@+id/guard_tip1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
                         android:text=""
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
                         android:textColor="#A281FD"
                         android:textSize="14sp" />
 
-                    <TextView
+                    <com.yunbao.common.views.weight.MarqueeTextView
                         android:id="@+id/guard_tip2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -138,6 +144,12 @@
                         android:layout_marginLeft="10dp"
                         android:drawablePadding="4dp"
                         android:text="456"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
                         android:textColor="#A281FD"
                         android:textSize="14sp"
                         android:visibility="gone" />
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 7e621c3d3..7ecea37ba 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -515,7 +515,8 @@
         android:clickable="true"
         android:focusable="true"
         android:gravity="center"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:visibility="visible">
 
         <ImageView
             android:layout_width="8dp"