From 020bbf322d79ec8a3d3f89cf92c1a3238d47ccb9 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 29 Nov 2022 13:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E4=B8=BB=E6=92=AD=E5=90=8E=E8=B5=A0=E9=80=81=E7=B2=89=E4=B8=9D?=
 =?UTF-8?q?=E7=89=8C=E5=90=8E=E8=BF=9B=E4=B8=8D=E5=8E=BB=E7=B2=89=E4=B8=9D?=
 =?UTF-8?q?=E5=9B=A2=E4=BB=BB=E5=8A=A1=E7=95=8C=E9=9D=A2=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E9=87=8D=E8=BF=9B=E7=9B=B4=E6=92=AD=E9=97=B4=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E3=80=82=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/live/views/LiveRoomViewHolder.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 6519973e2..1b15c4aa6 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -349,16 +349,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         updataCleanMic();
         //拿到原始数据
         for (int i = 0; i < list.size(); i++) {
-            LinkMicUserBean bean=list.get(i);
-            if(i==1){
+            LinkMicUserBean bean = list.get(i);
+            if (i == 1) {
                 mic_view.setVisibility(View.VISIBLE);
                 mic_ids.add(bean.getId());
                 ImgLoader.display2(Contexts, bean.getAvatar(), mic_ico);
-            }else if(i==2){
+            } else if (i == 2) {
                 mic_view1.setVisibility(View.VISIBLE);
                 mic_ids.add(bean.getId());
                 ImgLoader.display2(Contexts, bean.getAvatar(), mic_ico1);
-            }else if(i==3){
+            } else if (i == 3) {
                 mic_view2.setVisibility(View.VISIBLE);
                 mic_ids.add(bean.getId());
                 ImgLoader.display2(Contexts, bean.getAvatar(), mic_ico2);
@@ -2713,6 +2713,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             ((LiveAudienceActivity) mContext).openFansMedalOkWindow();
 
         }
+        if (!isAncher && bean.getGiftName().equals("粉絲牌")) {
+            LiveAudienceActivity.is_fans = "1";
+        }
         Log.i("tvss", bean.getDrpk_status() + "是" + mLiveUid + "vsss" + bean.getRoomnum());
         if (mLiveGiftAnimPresenter == null) {
             mLiveGiftAnimPresenter = new LiveGiftAnimPresenter(mContext, mContentView, mGifImageView, mSVGAImageView, mLiveGiftPrizePoolContainer, windowManager);
@@ -3171,7 +3174,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
         if (taskModel != null) {
             GiftModel giftModel = newPeopleTask.getGift();
-            if (giftModel!=null){
+            if (giftModel != null) {
                 RewardAllModel rewardOne = newPeopleTask.getRewardOne();
                 String gold = rewardOne.getGold();
                 String experience = rewardOne.getExperience();
@@ -3582,7 +3585,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                         .setMicIng(2)
                                         .setBean(liveBean).setLiveType(liveType).setLiveTypeVal(Integer.parseInt(liveTypeVal)));
                             } else {
-                                if(MicStatusManager.getInstance().isMic(liveUid)){
+                                if (MicStatusManager.getInstance().isMic(liveUid)) {
                                     MicStatusManager.getInstance().showDownMicDialog(mContext);
                                     return;
                                 }