From 950bcee232d7cad485da134eafbe3014739090fa Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Mon, 7 Oct 2024 10:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=96=B0=E4=BA=BA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/dialog/LiveGiftPopup2.java    |  6 +++---
 .../yunbao/live/views/LiveRoomViewHolder.java | 19 ++++++++++---------
 live/src/main/res/layout/view_live_room.xml   |  6 ++++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
index 4d5bb2683..6c7c0718c 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
@@ -299,10 +299,9 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
 //        ImgLoader.display(getContext(), R.mipmap.ic_gift_right_arrow, liveGiftImg);
 
         //设置礼物的信息
-        RecyclerView.LayoutManager layoutManager = new GridLayoutManager(getActivity(), 4, GridLayoutManager.VERTICAL, false);
+        GridLayoutManager layoutManager = new GridLayoutManager(getActivity(), 4, GridLayoutManager.VERTICAL, false);
         giftRecyclerView.setLayoutManager(layoutManager);
 
-        //礼物分类tab
         //礼物分类tab
         LinearLayoutManager manager = new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false);
         giftTitleRecyclerView.setLayoutManager(manager);
@@ -363,7 +362,6 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
                 giftWrapTv.setTextColor(ContextCompat.getColor(mContext, com.yunbao.live.R.color.feea36));
                 isWrap = true;
                 giftSendGroup.setVisibility(View.INVISIBLE);
-                //TODO 切换到包裹取消更爱
                 GiftCacheUtil.getInstance().addDownloadList(mWrapGiftList);
 
                 //礼物过滤掉数量为0的礼物
@@ -380,6 +378,8 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
                     }
                     if (number == 0) {
                         iterator.remove();
+                    }else {
+                        bean.setChecked(false);
                     }
                 }
 
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 d5c572a98..5b43f51e1 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -5656,15 +5656,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     public void setShowTask(String url, boolean isShow) {
-        newTaskGroup = findViewById(R.id.newTaskGroup);
-        newTaskBg = findViewById(R.id.newTaskBg);
-        newTaskBg.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ZhuangBanActivity.forward(mContext, url, true, 1);
-            }
-        });
-        newTaskGroup.setVisibility(isShow ? View.VISIBLE : View.GONE);
+        //隐藏新手任务
+//        newTaskGroup = findViewById(R.id.newTaskGroup);
+//        newTaskBg = findViewById(R.id.newTaskBg);
+//        newTaskBg.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                ZhuangBanActivity.forward(mContext, url, true, 1);
+//            }
+//        });
+//        newTaskGroup.setVisibility(isShow ? View.VISIBLE : View.GONE);
 
 //        anTask = findViewById(R.id.anTask);
 //        anTask.setOnClickListener(new View.OnClickListener() {
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 38d67bc8e..d31385eaf 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -2538,7 +2538,9 @@
             android:layout_height="30dp"
             android:layout_alignParentBottom="true"
             android:layout_marginStart="10dp"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:layout_marginEnd="70dp"
+            tools:visibility="visible"/>
     </RelativeLayout>
 
 
@@ -3212,7 +3214,7 @@
                 android:scrollHorizontally="true"
                 android:singleLine="true"
                 tools:text="主播創建了【游戲名】房間"
-                android:textColor="@color/black1"
+                 android:textColor="@color/black1"
                 android:textSize="12dp" />
 
             <TextView