From 08804a45d64ad4e6f984834349b16e82a01ddf57 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 18 Jun 2024 18:36:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5PD=E4=BF=AE=E5=A4=8D=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9:=20=E4=BF=AE=E5=A4=8D=E6=95=B4=E8=9B=8A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=BF=9E=E5=87=BB=E6=95=B0=E6=9C=89xN=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=20=E4=BF=AE=E5=A4=8DPK=E6=97=B6=E6=95=B4?=
 =?UTF-8?q?=E8=9B=8A=E8=A7=82=E4=BC=97=E7=AB=AF=E8=81=94=E7=B3=BB=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=9A=E9=97=AA=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/live/adapter/LivePrankRecyclerAdapter.java     | 2 +-
 .../main/java/com/yunbao/live/views/LiveRoomViewHolder.java   | 2 +-
 live/src/main/res/layout/view_live_room.xml                   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/adapter/LivePrankRecyclerAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LivePrankRecyclerAdapter.java
index 25cf9ef60..fada088a7 100644
--- a/live/src/main/java/com/yunbao/live/adapter/LivePrankRecyclerAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/LivePrankRecyclerAdapter.java
@@ -127,7 +127,7 @@ public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecy
         public void setDate(PrankGiftBean bean, int position) {
             ImgLoader.display(mContext, bean.getIcon(), mIcon);
             itemView.setTag(position);
-            mName.setText(bean.getName()+"*"+bean.getNum());
+            mName.setText(bean.getName());
             mTitle.setText(bean.getTitle());
             mRemove.setTag(bean);
         }
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 5fd63fee8..e12052bb5 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1738,7 +1738,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
         //点击收起
         prank_group_bottom_icon.setOnClickListener(v->{
-            prank_group.setVisibility(View.GONE);
+            prank_group.setVisibility(View.INVISIBLE);
             prank_small_icon.setVisibility(View.VISIBLE);
             if (CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
                 switchGifDrawable(!completedList.isEmpty());
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index c68a41e3c..96261cf97 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -2417,7 +2417,9 @@
             android:layout_width="52dp"
             android:layout_height="76dp"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="5dp"
+            tools:visibility="visible"
+            android:layout_gravity="end"
+            android:layout_marginEnd="16dp"
             android:visibility="gone"
             app:delay_time="5000"
             app:indicator_height="8dp"