From 52f1a78e36ee2f9935c88db9c11ded18356ac8bc Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 23 Aug 2023 16:37:53 +0800
Subject: [PATCH 1/5] =?UTF-8?q?update=20=E7=BA=A2=E5=8C=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bean/RedPacketInfoModel.java       | 10 ++++++++
 .../com/yunbao/common/http/PDLiveApi.java     |  5 ++--
 .../common/http/live/LiveNetManager.java      | 11 ++++----
 common/src/main/res/values-en-rUS/string.xml  |  2 +-
 common/src/main/res/values-zh-rHK/strings.xml |  1 +
 common/src/main/res/values-zh-rTW/strings.xml |  1 +
 common/src/main/res/values-zh/strings.xml     |  2 +-
 common/src/main/res/values/strings.xml        |  2 +-
 .../live/dialog/ReceiveRendPacketPopup.java   |  5 ++++
 .../live/dialog/SendRendPacketPopup.java      | 25 ++++++++++++++-----
 .../res/layout/view_red_packet_luck_user.xml  |  3 ++-
 .../res/layout/view_red_packet_user_list.xml  |  2 +-
 .../main/res/layout/view_send_red_packet.xml  | 15 +++++++++--
 13 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/bean/RedPacketInfoModel.java b/common/src/main/java/com/yunbao/common/bean/RedPacketInfoModel.java
index 49c05a3de..a28783b02 100644
--- a/common/src/main/java/com/yunbao/common/bean/RedPacketInfoModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/RedPacketInfoModel.java
@@ -19,6 +19,8 @@ public class RedPacketInfoModel extends BaseModel {
     private String redPacketMoney;
     @SerializedName("red_packet_quantity")
     private String redPacketQuantity;
+    @SerializedName("is_fans")
+    private String isFans;
     @SerializedName("conditions")
     private String conditions;
     @SerializedName("create_time")
@@ -270,4 +272,12 @@ public class RedPacketInfoModel extends BaseModel {
         this.userGoldenBean = userGoldenBean;
         return this;
     }
+
+    public boolean getIsFans() {
+        return isFans.equals("1");
+    }
+
+    public void setIsFans(String isFans) {
+        this.isFans = isFans;
+    }
 }
diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index 47049923e..c7adca890 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -766,18 +766,19 @@ public interface PDLiveApi {
 
 
     /**
-     * 获取盲盒礼物当前数据
+     * 创建红包
      */
     @GET("/api/public/?service=Live.createRedPacket")
     Observable<ResponseModel<Object>> createRedPacket(
             @Query("liveuid") String liveUid,
+            @Query("is_fans") int needFansGroup,
             @Query("red_packet_money") String redPacketMoney,
             @Query("red_packet_quantity") String redPacketQuantity,
             @Query("conditions") String conditions
     );
 
     /**
-     * 获取盲盒礼物当前数据
+     * 获取红包数据
      */
     @GET("/api/public/?service=Live.redPacketInfo")
     Observable<ResponseModel<RedPacketInfoModel>> redPacketInfo(
diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
index b385a72fb..d63b8dcff 100644
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -1631,10 +1631,11 @@ public class LiveNetManager {
      * @param redPacketMoney    红包金额
      * @param redPacketQuantity 红包数量
      * @param conditions        红包领取条件 0.无 1.关注主播
+     * @param needFansGroup     是否需要加入粉丝团条件
      */
-    public void createRedPacket(String liveUid, String redPacketMoney, String redPacketQuantity, String conditions, HttpCallback<String> callback) {
+    public void createRedPacket(String liveUid, String redPacketMoney, String redPacketQuantity, String conditions, boolean needFansGroup, HttpCallback<String> callback) {
         API.get().pdLiveApi(mContext)
-                .createRedPacket(liveUid, redPacketMoney, redPacketQuantity, conditions)
+                .createRedPacket(liveUid, needFansGroup ? 1 : 0, redPacketMoney, redPacketQuantity, conditions)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<Object>>() {
@@ -1931,7 +1932,7 @@ public class LiveNetManager {
 
     public void giftDetail(String liveUid, String giftId, String toUid, HttpCallback<GiftWallGiftDetail> callback) {
         API.get().pdLiveApi(mContext)
-                .giftDetail(liveUid, giftId,toUid)
+                .giftDetail(liveUid, giftId, toUid)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<GiftWallGiftDetail>>() {
@@ -2171,7 +2172,7 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
-    public void getGiftNamingInfo(String giftId,HttpCallback<GiftNamingInfoModel> callback) {
+    public void getGiftNamingInfo(String giftId, HttpCallback<GiftNamingInfoModel> callback) {
         API.get().pdLiveApi(mContext)
                 .getGiftNamingInfo(giftId)
                 .subscribeOn(Schedulers.io())
@@ -2179,7 +2180,7 @@ public class LiveNetManager {
                 .subscribe(new Consumer<ResponseModel<GiftNamingInfoModel>>() {
                     @Override
                     public void accept(ResponseModel<GiftNamingInfoModel> liveGiftBeanResponseModel) throws Exception {
-                        if (callback!=null){
+                        if (callback != null) {
                             callback.onSuccess(liveGiftBeanResponseModel.getData().getInfo());
                         }
                     }
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index e784a8e72..9aa222dc1 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1312,6 +1312,6 @@ Limited ride And limited avatar frame</string>
     <string name="cancel_ca">cancel</string>
     <string name="settings_ser">settings</string>
     <string name="too_many_gifts">Too many gifts</string>
-
+    <string name="live_send_red_packge_fans_group">Join a fans club</string>
 
 </resources>
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index 3742dc4ea..9114c48a6 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1308,4 +1308,5 @@
     <string name="cancel_ca">不再設置</string>
     <string name="settings_ser">去設置</string>
     <string name="too_many_gifts">重複添加禮物</string>
+    <string name="live_send_red_packge_fans_group">加入粉絲團</string>
 </resources>
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index df1963a96..00a7625d0 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1307,4 +1307,5 @@
     <string name="cancel_ca">不再設置</string>
     <string name="settings_ser">去設置</string>
     <string name="too_many_gifts">重複添加禮物</string>
+    <string name="live_send_red_packge_fans_group">加入粉絲團</string>
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 673c59614..33ce7f48f 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1307,6 +1307,6 @@
     <string name="cancel_ca">不再設置</string>
     <string name="settings_ser">去設置</string>
     <string name="too_many_gifts">重複添加禮物</string>
-
+    <string name="live_send_red_packge_fans_group">加入粉絲團</string>
 
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index c802d3fd7..13c1affa6 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1313,5 +1313,5 @@ Limited ride And limited avatar frame</string>
     <string name="cancel_ca">cancel</string>
     <string name="settings_ser">settings</string>
     <string name="too_many_gifts">Too many gifts</string>
-
+    <string name="live_send_red_packge_fans_group">Join a fans club</string>
 </resources>
diff --git a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
index 4dbd9a207..f09291b2c 100644
--- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
@@ -95,6 +95,11 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
         }
 
         userID = redPacketInfoModel.getUserId();
+        if(redPacketInfoModel.getIsFans()){
+            ToastUtil.show("粉丝团红包");
+        }else{
+            ToastUtil.show("普通红包");
+        }
     }
 
     private Handler timeHandler = new Handler();
diff --git a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java
index 3d2dd2c5a..34edceaf2 100644
--- a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java
@@ -24,7 +24,7 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
 
 public class SendRendPacketPopup extends CenterPopupView {
-    private Button thereIsNo, followingAnchor;
+    private Button thereIsNo, followingAnchor, joinFansGroup;
     private TextView redEnvelopeRill, totalConsumptionOfDrill;
     private TextView rill, total;
     private FrameLayout redPacketIllustrate;
@@ -58,6 +58,7 @@ public class SendRendPacketPopup extends CenterPopupView {
         redPacketIllustrate = findViewById(R.id.red_packet_illustrate);
         illustrateClose = findViewById(R.id.illustrate_close);
         iconInstructions = findViewById(R.id.icon_instructions);
+        joinFansGroup = findViewById(R.id.fans_group);
         rill = findViewById(R.id.rill);
         total = findViewById(R.id.total);
         selectText(thereIsNo, true);
@@ -65,13 +66,21 @@ public class SendRendPacketPopup extends CenterPopupView {
         ViewClicksAntiShake.clicksAntiShake(thereIsNo, () -> {
             selectText(thereIsNo, true);
             selectText(followingAnchor, false);
+            selectText(joinFansGroup, false);
             conditions = "0";
         });
         ViewClicksAntiShake.clicksAntiShake(followingAnchor, () -> {
             selectText(thereIsNo, false);
+            selectText(joinFansGroup, false);
             selectText(followingAnchor, true);
             conditions = "1";
         });
+        ViewClicksAntiShake.clicksAntiShake(joinFansGroup, () -> {
+            selectText(thereIsNo, false);
+            selectText(joinFansGroup, true);
+            selectText(followingAnchor, false);
+            conditions = "0";
+        });
         redEnvelopeRill.setText(String.format(getContext().getString(R.string.red_envelope_rill), "0"));
         totalConsumptionOfDrill.setText(String.format(getContext().getString(R.string.total_consumption_of_drill), "0"));
         rill.addTextChangedListener(new TextWatcher() {
@@ -198,7 +207,9 @@ public class SendRendPacketPopup extends CenterPopupView {
                             .createRedPacket(mLiveID,
                                     rillNumber,
                                     number,
-                                    conditions, new HttpCallback<String>() {
+                                    conditions,
+                                    joinFansGroup.getTag() != null && (boolean) joinFansGroup.getTag(),
+                                    new HttpCallback<String>() {
                                         @Override
                                         public void onSuccess(String data) {
                                             ToastUtil.show(getContext().getString(R.string.red_envelope_released_successfully));
@@ -214,10 +225,10 @@ public class SendRendPacketPopup extends CenterPopupView {
 
             }
         });
-        if(WordUtil.isNewZh()){
-            ((ImageView)findViewById(R.id.red_packet_info_img)).setImageResource(R.mipmap.bg_red_packet_info_zh);
-        }else{
-            ((ImageView)findViewById(R.id.red_packet_info_img)).setImageResource(R.mipmap.bg_red_packet_info_en);
+        if (WordUtil.isNewZh()) {
+            ((ImageView) findViewById(R.id.red_packet_info_img)).setImageResource(R.mipmap.bg_red_packet_info_zh);
+        } else {
+            ((ImageView) findViewById(R.id.red_packet_info_img)).setImageResource(R.mipmap.bg_red_packet_info_en);
         }
     }
 
@@ -225,8 +236,10 @@ public class SendRendPacketPopup extends CenterPopupView {
         textView.setSelected(select);
         if (select) {
             textView.setTextColor(Color.parseColor("#E12801"));
+            textView.setTag(true);
         } else {
             textView.setTextColor(Color.parseColor("#FDD04A"));
+            textView.setTag(false);
         }
 
     }
diff --git a/live/src/main/res/layout/view_red_packet_luck_user.xml b/live/src/main/res/layout/view_red_packet_luck_user.xml
index 78759e372..12ccd5791 100644
--- a/live/src/main/res/layout/view_red_packet_luck_user.xml
+++ b/live/src/main/res/layout/view_red_packet_luck_user.xml
@@ -11,8 +11,9 @@
         android:id="@+id/gift_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="dadsad"
+        android:text="中文测试中文测试"
         android:layout_weight="1"
+        android:maxEms="9"
         android:textColor="@color/white"
         android:textSize="16sp" />
 
diff --git a/live/src/main/res/layout/view_red_packet_user_list.xml b/live/src/main/res/layout/view_red_packet_user_list.xml
index 3437d2037..bd92dfaf2 100644
--- a/live/src/main/res/layout/view_red_packet_user_list.xml
+++ b/live/src/main/res/layout/view_red_packet_user_list.xml
@@ -33,7 +33,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/user_list"
-            android:layout_width="200dp"
+            android:layout_width="250dp"
             tools:listitem="@layout/view_red_packet_luck_user"
             android:layout_height="241dp"
             android:layout_marginTop="26dp" />
diff --git a/live/src/main/res/layout/view_send_red_packet.xml b/live/src/main/res/layout/view_send_red_packet.xml
index b2165b243..afbeaea39 100644
--- a/live/src/main/res/layout/view_send_red_packet.xml
+++ b/live/src/main/res/layout/view_send_red_packet.xml
@@ -174,6 +174,18 @@
                 android:text="@string/following_anchor"
                 android:textColor="#FDD04A"
                 android:textSize="10sp" />
+            <Button
+                android:id="@+id/fans_group"
+                android:layout_width="0dp"
+                android:layout_height="30dp"
+                android:layout_gravity="end"
+                android:layout_marginStart="5dp"
+                android:layout_weight="1"
+                android:background="@drawable/background_red_packet_select"
+                android:gravity="center"
+                android:text="@string/live_send_red_packge_fans_group"
+                android:textColor="#FDD04A"
+                android:textSize="10sp" />
         </LinearLayout>
     </LinearLayout>
 
@@ -232,8 +244,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/background_send_red_packet_illustrate"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:visibility="gone">
 
 
         <androidx.core.widget.NestedScrollView

From 7f11195edeaf42081033c44b24cbceec13d2d4d6 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 24 Aug 2023 09:43:33 +0800
Subject: [PATCH 2/5] update 6.5.5

---
 .../com/yunbao/live/dialog/ReceiveRendPacketPopup.java   | 7 +++++--
 .../java/com/yunbao/live/views/LiveRoomViewHolder.java   | 9 +++++++--
 .../java/com/yunbao/live/views/PortraitLiveManager.java  | 1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
index f09291b2c..fc6da76a3 100644
--- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
@@ -46,10 +46,13 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
     private ImageView isAttention;
     private RedPacketInfoModel redPacketInfoModel;
     private boolean isSuperJackpot;
+    private boolean isFans=false;
 
     public ReceiveRendPacketPopup(@NonNull Context context, int time, String mLiveUid, String stream,
                                   String redPacketId, RedPacketInfoModel redPacketInfoModel,
-                                  boolean isSuperJackpot) {
+                                  boolean isSuperJackpot,
+                                  boolean isFans
+    ) {
 
         super(context);
         this.time = time;
@@ -58,7 +61,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
         this.redPacketId = redPacketId;
         this.redPacketInfoModel = redPacketInfoModel;
         this.isSuperJackpot = isSuperJackpot;
-
+        this.isFans=isFans;
     }
 
     // 返回自定义弹窗的布局离开
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 4e780859d..0f5bbb444 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -374,6 +374,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
     private String mAnchorName;//主播名字
     private boolean isHinde = false;
+    private boolean isFans=false;
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onUpdata(String str) {
@@ -1509,7 +1510,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                     if (TextUtils.equals(data.getReceiveStatus(), "0")) {
                                         redTimeCountdown = redTimeCountdown - 1;
                                         new XPopup.Builder(mContext)
-                                                .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false))
+                                                .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false,isFans))
                                                 .show();
                                     } else if (TextUtils.equals(data.getReceiveStatus(), "1")) {
                                         new XPopup.Builder(mContext)
@@ -1546,7 +1547,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     public void setRedPacketInfoModel(RedPacketInfoModel redPacket) {
         new XPopup.Builder(mContext)
-                .asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true))
+                .asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true,isFans))
                 .show();
     }
 
@@ -3941,6 +3942,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         voteManager.setCreateVoteModel(voteModel);
     }
 
+    public void setFansGroup(String isFans) {
+        this.isFans=isFans.equals("1");
+    }
+
 
     private static class LiveRoomHandler extends Handler {
 
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index d4b8cdb8d..08fe91972 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -520,6 +520,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                             mLiveRoomViewHolder.updateTopBanner();
                             mLiveRoomViewHolder.setVoteData(data.getEnterRoomInfo().getVoteModel());
                             mLiveRoomViewHolder.updateFansMessageRed();
+                            mLiveRoomViewHolder.setFansGroup(data.getEnterRoomInfo().getIsFans());
 
                             isattention = Integer.parseInt(data.getEnterRoomInfo().getIsattention());
                             if (isattention == 0) {

From cee1476ab1fb51d33aa6175549f09fdeeeb18449 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 24 Aug 2023 14:26:38 +0800
Subject: [PATCH 3/5] update 6.5.5

---
 gradle.properties                               |  4 ++--
 .../live/dialog/ReceiveRendPacketPopup.java     | 17 +++++++++++------
 live/src/main/res/values-en/strings.xml         |  2 ++
 live/src/main/res/values/strings.xml            |  2 ++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e850a38e3..3265ac671 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,6 +21,6 @@ android.enableJetifier=true
 
 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=10809
-systemProp.http.proxyPort=10809
+systemProp.https.proxyPort=7890
+systemProp.http.proxyPort=7890
 #android.enableR8.fullMode=true
\ No newline at end of file
diff --git a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
index fc6da76a3..f71ff4532 100644
--- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
+++ b/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();
                 }
diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml
index 35b74993a..f7a06979e 100644
--- a/live/src/main/res/values-en/strings.xml
+++ b/live/src/main/res/values-en/strings.xml
@@ -115,4 +115,6 @@
     <string name="live_fans_group_buy_buy">%s Diamond</string>
     <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
     <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
+    <string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
+    <string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
 </resources>
\ No newline at end of file
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index 0fcc61a5b..6032e4436 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -113,4 +113,6 @@
     <string name="live_fans_group_buy_buy">%s鑽購買</string>
     <string name="live_fans_group_enter_room">粉絲團成員歡迎進房</string>
     <string name="live_fans_group_send_gift_tips">粉絲團等級達到 Lv%s 可送出該禮物</string>
+    <string name="live_rad_pack_join_fans_group_tip">加入粉絲團可開啟【加入】</string>
+    <string name="live_rad_pack_join_fans_group_click_tip">加入粉絲團可開啟</string>
 </resources>

From e1f4e8dde4f8848b91c85c543e9b76d789c41081 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 24 Aug 2023 16:31:14 +0800
Subject: [PATCH 4/5] update 6.5.5

---
 .../live/activity/LiveAudienceActivity.java   |  1 +
 .../yunbao/live/dialog/LiveFansFragment.java  |  1 +
 .../com/yunbao/live/dialog/LiveGiftPopup.java |  1 +
 .../live/dialog/ReceiveRendPacketPopup.java   | 13 +++--
 .../yunbao/live/views/LiveRoomViewHolder.java | 25 ++++----
 .../live/views/PortraitLiveManager.java       |  3 +
 .../main/res/layout/view_send_red_packet.xml  | 58 ++++++++++---------
 7 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
index b21768400..a461e1f0b 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -755,6 +755,7 @@ public class LiveAudienceActivity extends LiveActivity {
         if (manager != null && !StringUtil.isEmpty(is_fans)) {
             if (is_fans.equals("-2")) {
                 manager.setAttention(0);
+                mLiveRoomViewHolder.setFansGroup("0");
                 is_fans = "2";
             }
         }
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
index 45a3c034a..d92669e1c 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
@@ -132,6 +132,7 @@ public class LiveFansFragment extends AbsDialogFragment {
                 int num = LiveAudienceActivity.fansNum - 1;
                 LiveRoomViewHolder.setFansNum(num);
                 ToastUtil.show("退出成功");
+                EventBus.getDefault().post("exitFansGroup");
                 dismiss();
             } else if (TextUtils.equals(event.getMethod(), "sendFansCard")) {
                 if (LiveRoomViewHolder.mBtnFollow != null && LiveRoomViewHolder.mBtnFollow.getVisibility() == View.VISIBLE) {
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
index a7258c47d..29a5a467d 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -785,6 +785,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
         if (liveGiftModel.getType() == 7) {
             iconArrow.setVisibility(View.GONE);
             showBlindProgress(liveGiftModel.getBlind_box_type());
+            description.setTag(liveGiftModel.getBlind_box_type());
         } else {
             blindBox.setVisibility(View.INVISIBLE);
             mCount = DEFAULT_COUNT;
diff --git a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
index f71ff4532..3cf62692e 100644
--- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
@@ -99,11 +99,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
         }
 
         userID = redPacketInfoModel.getUserId();
-        if (redPacketInfoModel.getIsFans()) {
-            if (!isFans) {
-                ToastUtil.show(R.string.live_rad_pack_join_fans_group_tip);
-            }
-        }
+
     }
 
     private Handler timeHandler = new Handler();
@@ -158,6 +154,11 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
             redPacketTimeLayout.setVisibility(GONE);
             redPacketOpen.setVisibility(VISIBLE);
         }
+        ViewClicksAntiShake.clicksAntiShake(redPacketTimeLayout, () -> {
+            if (!isFans && redPacketInfoModel.getIsFans()) {
+                ToastUtil.show(getContext().getString(R.string.live_rad_pack_join_fans_group_click_tip));
+            }
+        });
 
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.red_packet_open), () -> {
             if (isSuperJackpot) {
@@ -189,7 +190,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
                         });
             } else {
                 if (!isFans && redPacketInfoModel.getIsFans()) {
-                    ToastUtil.show(R.string.live_rad_pack_join_fans_group_click_tip);
+                    ToastUtil.show(getContext().getString(R.string.live_rad_pack_join_fans_group_click_tip));
                     return;
                 }
                 if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) {
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 0f5bbb444..99fdba5ac 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -374,7 +374,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
     private String mAnchorName;//主播名字
     private boolean isHinde = false;
-    private boolean isFans=false;
+    private boolean isFans = false;
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onUpdata(String str) {
@@ -457,6 +457,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             }
         } else if ("checkNewLetter".equals(str)) {
             checkNewLetter();
+        }else  if("exitFansGroup".equals(str)){
+            setFansGroup("0");
         }
     }
 
@@ -1510,7 +1512,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                     if (TextUtils.equals(data.getReceiveStatus(), "0")) {
                                         redTimeCountdown = redTimeCountdown - 1;
                                         new XPopup.Builder(mContext)
-                                                .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false,isFans))
+                                                .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false, isFans))
                                                 .show();
                                     } else if (TextUtils.equals(data.getReceiveStatus(), "1")) {
                                         new XPopup.Builder(mContext)
@@ -1547,7 +1549,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     public void setRedPacketInfoModel(RedPacketInfoModel redPacket) {
         new XPopup.Builder(mContext)
-                .asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true,isFans))
+                .asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true, isFans))
                 .show();
     }
 
@@ -1798,7 +1800,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                                     .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                                         }
                                         if (TextUtils.equals(type, "1")) {
-                                            ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
+                                            ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
                                         } else {
                                             Bundle bundle = new Bundle();
                                             bundle.putString("url", htmlUrl.toString());
@@ -1864,7 +1866,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                                     .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                                         }
                                         if (TextUtils.equals(type, "1")) {
-                                            ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
+                                            ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
                                         } else {
                                             Bundle bundle = new Bundle();
                                             bundle.putString("url", htmlUrl.toString());
@@ -2018,10 +2020,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                         } else {
                                             url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
                                         }
-                                        ZhuangBanActivity.forward(mContext, url, false,1);
+                                        ZhuangBanActivity.forward(mContext, url, false, 1);
                                     } else if (link.equals("zxb")) {
                                         String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
-                                        ZhuangBanActivity.forward(mContext, url, false,1);
+                                        ZhuangBanActivity.forward(mContext, url, false, 1);
                                     } else if (link.equals("xyd")) {
                                         openWishListWindow();
                                     }
@@ -3475,8 +3477,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             ((LiveAudienceActivity) mContext).openFansMedalOkWindow();
 
         }
-        if (!isAncher && bean.getGiftName().equals("粉絲牌")) {
+        if (!isAncher && bean.getGiftName().equals("粉絲牌") && bean.getUid().equals(CommonAppConfig.getInstance().getUid())) {
             LiveAudienceActivity.is_fans = "1";
+            setFansGroup("1");
         }
         Log.i("tvss", bean.getDrpk_status() + "是" + mLiveUid + "vsss" + bean.getRoomnum());
         if (mLiveGiftAnimPresenter == null) {
@@ -3943,7 +3946,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     public void setFansGroup(String isFans) {
-        this.isFans=isFans.equals("1");
+        this.isFans = isFans.equals("1");
     }
 
 
@@ -5277,7 +5280,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                         .append("&isZh=")
                                         .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                                 if (TextUtils.equals(type, "1")) {
-                                    ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
+                                    ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
                                 } else {
                                     Bundle bundle = new Bundle();
                                     bundle.putString("url", htmlUrl.toString());
@@ -5357,7 +5360,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                         .append("&isZh=")
                                         .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                                 if (TextUtils.equals(type, "1")) {
-                                    ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1);
+                                    ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
                                 } else {
                                     Bundle bundle = new Bundle();
                                     bundle.putString("url", htmlUrl.toString());
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index 08fe91972..dac2cefe1 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -675,6 +675,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                                 mLiveRoomViewHolder.showPrizePoolLevel(String.valueOf(giftPrizePoolLevel));
                             }
                         }
+                        AppManager.runDebugCode(()->{
+                            liveHandler.postDelayed(loadTimeoutRunnableGone, 1_000);
+                        });
                         liveHandler.postDelayed(loadTimeoutRunnableGone, 15_000);
                         if (TextUtils.equals(data.getEnterRoomInfo().getIsconnection(), "1")) {
                             //通知心愿单位置换地方
diff --git a/live/src/main/res/layout/view_send_red_packet.xml b/live/src/main/res/layout/view_send_red_packet.xml
index afbeaea39..857692e35 100644
--- a/live/src/main/res/layout/view_send_red_packet.xml
+++ b/live/src/main/res/layout/view_send_red_packet.xml
@@ -148,7 +148,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="30dp">
 
@@ -161,31 +161,37 @@
                 android:text="@string/there_is_no"
                 android:textColor="#FDD04A"
                 android:textSize="13sp" />
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="70dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                >
+                <Button
+                    android:id="@+id/following_anchor"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_gravity="end"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/background_red_packet_select"
+                    android:gravity="center"
+                    android:text="@string/following_anchor"
+                    android:layout_marginBottom="5dp"
+                    android:textColor="#FDD04A"
+                    android:textSize="10sp" />
+                <Button
+                    android:id="@+id/fans_group"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_gravity="end"
+                    android:layout_marginStart="5dp"
+                    android:background="@drawable/background_red_packet_select"
+                    android:gravity="center"
+                    android:text="@string/live_send_red_packge_fans_group"
+                    android:textColor="#FDD04A"
+                    android:textSize="10sp" />
+            </LinearLayout>
 
-            <Button
-                android:id="@+id/following_anchor"
-                android:layout_width="0dp"
-                android:layout_height="30dp"
-                android:layout_gravity="end"
-                android:layout_marginStart="5dp"
-                android:layout_weight="1"
-                android:background="@drawable/background_red_packet_select"
-                android:gravity="center"
-                android:text="@string/following_anchor"
-                android:textColor="#FDD04A"
-                android:textSize="10sp" />
-            <Button
-                android:id="@+id/fans_group"
-                android:layout_width="0dp"
-                android:layout_height="30dp"
-                android:layout_gravity="end"
-                android:layout_marginStart="5dp"
-                android:layout_weight="1"
-                android:background="@drawable/background_red_packet_select"
-                android:gravity="center"
-                android:text="@string/live_send_red_packge_fans_group"
-                android:textColor="#FDD04A"
-                android:textSize="10sp" />
         </LinearLayout>
     </LinearLayout>
 
@@ -193,7 +199,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="23dp"
-        android:layout_marginTop="266dp"
+        android:layout_marginTop="286dp"
         android:layout_marginEnd="29dp">
 
         <TextView

From fa8d8a74219995ba17cf04b85e2b84fa62cd0184 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 28 Aug 2023 10:14:38 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BA=A2=E5=8C=85?=
 =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java     | 2 +-
 .../src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
index 3cf62692e..c08778b6b 100644
--- a/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
@@ -107,7 +107,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
     private Runnable timeRunnable = new Runnable() {
         @Override
         public void run() {
-            if (time > 0) {
+            if (time > 1) {
                 circleProgress.setCurrent(time--);
                 timeHandler.postDelayed(timeRunnable, 1000);
                 String countdown = TimeUtils.getTime(time);
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 99fdba5ac..ad15f75db 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1404,9 +1404,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         @Override
         public void run() {
             if (redTimeCountdown > 1) {
-                redTimeCountdown = redTimeCountdown - 1;
                 timeHandler.postDelayed(timeRunnable, 1000);
                 redPacketCountdown.setText(String.format(mContext.getString(R.string.red_packet_countdown), TimeUtils.getTime(redTimeCountdown)));
+                redTimeCountdown = redTimeCountdown - 1;
             } else {
                 redTimeCountdown = 0;
                 timeHandler.removeCallbacks(timeRunnable);