update 6.5.5

live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java

@@ -25,6 +25,7 @@ import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.TimeUtils;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.CircleProgress;
 import com.yunbao.common.views.weight.ClipPathCircleImage;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -46,7 +47,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
     private ImageView isAttention;
     private RedPacketInfoModel redPacketInfoModel;
     private boolean isSuperJackpot;
-    private boolean isFans=false;
+    private boolean isFans = false;
 
     public ReceiveRendPacketPopup(@NonNull Context context, int time, String mLiveUid, String stream,
                                   String redPacketId, RedPacketInfoModel redPacketInfoModel,
@@ -61,7 +62,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
         this.redPacketId = redPacketId;
         this.redPacketInfoModel = redPacketInfoModel;
         this.isSuperJackpot = isSuperJackpot;
-        this.isFans=isFans;
+        this.isFans = isFans;
     }
 
     // 返回自定义弹窗的布局离开
@@ -98,10 +99,10 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
         }
 
         userID = redPacketInfoModel.getUserId();
-        if(redPacketInfoModel.getIsFans()){
-            ToastUtil.show("粉丝团红包");
-        }else{
-            ToastUtil.show("普通红包");
+        if (redPacketInfoModel.getIsFans()) {
+            if (!isFans) {
+                ToastUtil.show(R.string.live_rad_pack_join_fans_group_tip);
+            }
         }
     }
 
@@ -187,6 +188,10 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
                             }
                         });
             } else {
+                if (!isFans && redPacketInfoModel.getIsFans()) {
+                    ToastUtil.show(R.string.live_rad_pack_join_fans_group_click_tip);
+                    return;
+                }
                 if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) {
                     LiveRoomViewHolder.follow();
                 }