From 40a2843696d0fffe0a62f5d74b67751d3ed510e0 Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Wed, 3 Jul 2024 11:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=88=E6=8A=A4=E6=A6=9C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=9C=80=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/layout/view_sud_game_user_list_holder.xml | 1 +
 .../java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java | 4 ++++
 live/src/main/res/layout/view_new_guard_item.xml              | 2 +-
 live/src/main/res/values-en/strings.xml                       | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/main/res/layout/view_sud_game_user_list_holder.xml b/common/src/main/res/layout/view_sud_game_user_list_holder.xml
index 46fe981f7..12dbc2365 100644
--- a/common/src/main/res/layout/view_sud_game_user_list_holder.xml
+++ b/common/src/main/res/layout/view_sud_game_user_list_holder.xml
@@ -61,6 +61,7 @@
             android:text="用户名"
             android:layout_marginTop="40dp"
             android:ellipsize="end"
+            android:visibility="gone"
             android:maxLines="1"
             android:gravity="center"
             android:textColor="#333333"
diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
index 4fd00f1d4..8d6eb1361 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
@@ -1088,6 +1088,7 @@ public class LiveGiftAnimPresenter {
             textRender.render(mContext, mGifGiftTipAllServer, mTempGifGiftBean.getGiftIcon(), mTempGifGiftBean.getUserNiceName(), mAncherName, mTempGifGiftBean.getGiftName(), 1, mWindowManager, "");
             mIvLook.setVisibility(View.VISIBLE);
             mIvLook.setTag(bean);
+           mIvLook.setVisibility(mLiveUid.equals(bean.getUid())?View.GONE:View.VISIBLE);
             mGifGiftTipShowAnimatorAllServer.start();
 
         }
@@ -1381,6 +1382,7 @@ public class LiveGiftAnimPresenter {
 
     //购买守护 全服通知
     public void showBuyGuardGiftAnim(LiveReceiveGiftBean bean) {
+        mIvLookBuyGuard.setVisibility(mLiveUid.equals(bean.getUid())?View.GONE:View.VISIBLE);
         if (bean.ismTypeBuyGuard()) {
             mTempGifGiftBean = bean;
             if (mShowAllServer) {
@@ -1518,6 +1520,8 @@ public class LiveGiftAnimPresenter {
                 iv_look_buy_vip.setVisibility(View.GONE);
             }
 
+            iv_look_buy_vip.setVisibility(mLiveUid.equals(bean.getUid())?View.GONE:View.VISIBLE);
+
             mGifGiftTipBuyVip.setSelected(false);
 
             if (!"0".equals(bean.getmLiveUId())) {
diff --git a/live/src/main/res/layout/view_new_guard_item.xml b/live/src/main/res/layout/view_new_guard_item.xml
index 7166b456c..496f5bba7 100644
--- a/live/src/main/res/layout/view_new_guard_item.xml
+++ b/live/src/main/res/layout/view_new_guard_item.xml
@@ -15,7 +15,7 @@
 
             <ImageView
                 android:id="@+id/guard_number_img"
-                android:layout_width="19dp"
+                android:layout_width="38.5dp"
                 android:layout_height="19dp"
                 android:layout_gravity="center"
                 android:src="@mipmap/icon_one_guard"
diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml
index 9bc52e520..d0dcf7d23 100644
--- a/live/src/main/res/values-en/strings.xml
+++ b/live/src/main/res/values-en/strings.xml
@@ -147,5 +147,5 @@
     <string name="prank_open_live_msg">Entertainment Tricky has been newly upgraded. Go and set up Tricky content to add more fun to the live broadcast room!</string>
     <string name="prank_im_immediately_go">Go now</string>
     <string name="live_room_sud_hint_join">Join</string>
-    <string name="live_dialog_top_guardian_tasks">守護任務</string>
+    <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
 </resources>
\ No newline at end of file