From 4b3b47b65fd182056d72c47f2020a7d007d3827f Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Sat, 23 Sep 2023 10:31:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B8=83=E5=B1=80&=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/common/utils/ToastUtil.java     |  1 +
 common/src/main/res/values-en-rUS/string.xml        |  4 ++--
 common/src/main/res/values/strings.xml              |  2 +-
 .../layout/view_funs_live_anchor_start_notify.xml   | 13 +++++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/utils/ToastUtil.java b/common/src/main/java/com/yunbao/common/utils/ToastUtil.java
index d2240037d..35ada5438 100644
--- a/common/src/main/java/com/yunbao/common/utils/ToastUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/ToastUtil.java
@@ -92,6 +92,7 @@ public class ToastUtil {
         if (TextUtils.isEmpty(s)) {
             return;
         }
+        Log.i("Toast", "Toast show: "+s);
         Log.i("ts","ll");
         Toast.makeText(CommonAppContext.sInstance,s,Toast.LENGTH_SHORT).show();
         Log.i("ts","22");
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index a0b0d26c1..d5b40f03a 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -683,7 +683,7 @@
     <string name="live_user_shut_up">Banned users</string>
     <string name="live_user_shut_up_list">List of forbidden users</string>
     <string name="live_admin_room">Live room of</string>
-    <string name="live_admin_shut_up_cancel">Lifting of the ban</string>
+    <string name="live_admin_shut_up_cancel">Remove</string>
     <string name="live_user_black_list">Blacklist of users</string>
     <string name="live_no_shut_up">No banned users</string>
     <string name="live_no_black">No blacklisted users</string>
@@ -956,7 +956,7 @@ Limited ride And limited avatar frame</string>
     <string name="chat_chat">Chat</string>
     <string name="lucky_angel">Congratulations %s have won %s in the Lucky Angel! The next lucky angel will be you!</string>
     <string name="lucky_100">Congratulations on %s winning %s in Luck 100 %%! Go pass on the good luck!</string>
-    <string name="user_card_guard">Guardian  %s</string>
+    <string name="user_card_guard">guard  %s</string>
     <string name="to_receive">receive</string>
     <string name="to_complete">To finish</string>
     <string name="already_collected">Already collected</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 480f62744..8719d9e54 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -683,7 +683,7 @@
     <string name="live_user_shut_up">Banned users</string>
     <string name="live_user_shut_up_list">List of forbidden users</string>
     <string name="live_admin_room">Live room of</string>
-    <string name="live_admin_shut_up_cancel">Lifting of the ban</string>
+    <string name="live_admin_shut_up_cancel">Remove</string>
     <string name="live_user_black_list">Blacklist of users</string>
     <string name="live_no_shut_up">No banned users</string>
     <string name="live_no_black">No blacklisted users</string>
diff --git a/live/src/main/res/layout/view_funs_live_anchor_start_notify.xml b/live/src/main/res/layout/view_funs_live_anchor_start_notify.xml
index 43c6443be..fd24fc00a 100644
--- a/live/src/main/res/layout/view_funs_live_anchor_start_notify.xml
+++ b/live/src/main/res/layout/view_funs_live_anchor_start_notify.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="340dp"
-    android:layout_height="75dp"
+    android:layout_height="wrap_content"
+    android:minHeight="75dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="@mipmap/bg_funs_live_anchor_start">
@@ -9,7 +10,7 @@
     <com.yunbao.common.custom.RatioRoundImageView
         android:id="@+id/avatar"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="7dp"
         android:layout_marginBottom="7dp"
@@ -34,12 +35,16 @@
 
     <TextView
         android:id="@+id/description"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/main_anchor_live_notify_info"
-        android:textSize="13sp"
         android:textColor="#CCFFFFFF"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/liveGo"
         app:layout_constraintStart_toStartOf="@+id/anchorName"
         app:layout_constraintTop_toBottomOf="@+id/anchorName" />