From 3ab91a74d150ade75f31ba38bdc823ccdc5b2d0b Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 7 Aug 2023 18:26:45 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BC=E7=89=A9?=
 =?UTF-8?q?=E6=A0=8F=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0=E9=87=8F=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AA=E9=80=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/common/views/GiftNumberPopup.java  |  4 +++-
 .../java/com/yunbao/common/views/InputCustomPopup.java | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
index 4294b8b34..7a654aaba 100644
--- a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
@@ -54,7 +54,9 @@ public class GiftNumberPopup extends BottomPopupView {
                 new XPopup.Builder(getContext())
                         .asCustom(new InputCustomPopup(getContext(),
                                 getContext().getString(R.string.the_title_financier3),
-                                R.string.custom_quantity, true).setListener(new InputCustomPopup.InputCustomListener() {
+                                R.string.custom_quantity, true)
+                                .setMaxValue(4)
+                                .setListener(new InputCustomPopup.InputCustomListener() {
                             @Override
                             public void onConfirm(String text) {
                                 if (!TextUtils.isEmpty(text)) {
diff --git a/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java b/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
index b2598cd14..80b31e916 100644
--- a/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
@@ -1,6 +1,7 @@
 package com.yunbao.common.views;
 
 import android.content.Context;
+import android.text.InputFilter;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
@@ -22,6 +23,7 @@ public class InputCustomPopup extends CenterPopupView {
     private String message = "";
     private int title = R.string.dialog_tip;
     private boolean isType;
+    private int maxValue=0;
 
     public InputCustomPopup(@NonNull Context context, String message, int title) {
         super(context);
@@ -36,6 +38,11 @@ public class InputCustomPopup extends CenterPopupView {
         this.isType = isType;
     }
 
+    public InputCustomPopup setMaxValue(int maxValue) {
+        this.maxValue = maxValue;
+        return this;
+    }
+
     public InputCustomPopup(@NonNull Context context, int title) {
         super(context);
         this.title = title;
@@ -53,6 +60,9 @@ public class InputCustomPopup extends CenterPopupView {
         super.onCreate();
         EditText content = findViewById(R.id.content);
         TextView titleText = findViewById(R.id.title);
+        if(maxValue>0){
+            content.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxValue)});
+        }
 
         if (isType) {
             content.setHint(message);

From 994bd2a3aa1001e73d4f16ccf3048b9c079c0707 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 09:34:15 +0800
Subject: [PATCH 02/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/http/PDLiveApi.java     |  9 +++
 .../common/http/live/LiveNetManager.java      | 26 +++++++-
 .../live/views/GiftAlreadyWallFragment.java   | 61 +++++++++++++------
 3 files changed, 76 insertions(+), 20 deletions(-)

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 8779c4866..a32b22392 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -863,6 +863,15 @@ public interface PDLiveApi {
             @Query("to_uid") String toUid
     );
 
+    /**
+     * 礼物墙已点亮
+     */
+    @GET("/api/public/?service=Gift.giftUserSendWall")
+    Observable<ResponseModel<GiftAlreadyWallModel>> giftUserSendWall(
+            @Query("liveuid") String liveUid,
+            @Query("to_uid") String toUid
+    );
+
     /**
      * 礼物墙未点亮
      */
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 aeeb32a15..b628a359e 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
@@ -1874,6 +1874,28 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
+    public void giftUserSendWall(String liveUid, String toUid, HttpCallback<GiftAlreadyWallModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .giftUserSendWall(liveUid, toUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<GiftAlreadyWallModel>>() {
+                    @Override
+                    public void accept(ResponseModel<GiftAlreadyWallModel> giftAlreadyWallModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(giftAlreadyWallModelResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
     public void giftWithoutWall(String liveUid, String toUid, HttpCallback<GiftAlreadyWallModel> callback) {
         API.get().pdLiveApi(mContext)
                 .giftWithoutWall(liveUid, toUid)
@@ -2072,9 +2094,9 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
-    public void buyFansExclusivePack(String liveUid, String packId,String stream, HttpCallback<HttpCallbackModel> callback) {
+    public void buyFansExclusivePack(String liveUid, String packId, String stream, HttpCallback<HttpCallbackModel> callback) {
         API.get().pdLiveApi(mContext)
-                .buyFansExclusivePack(liveUid, packId,stream)
+                .buyFansExclusivePack(liveUid, packId, stream)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<HttpCallbackModel>>() {
diff --git a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
index 542558451..0eb6d30d1 100644
--- a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
+++ b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
@@ -82,27 +82,52 @@ public class GiftAlreadyWallFragment extends BaseFragment {
 
     @Override
     protected void loadData() {
-        LiveNetManager.get(getActivity()).
-                giftAlreadyWall(mLiveUid, toUid, new HttpCallback<GiftAlreadyWallModel>() {
-                    @Override
-                    public void onSuccess(GiftAlreadyWallModel data) {
-                        if (data.getGiftWall().size() > 0) {
-                            giftWallNoData.setVisibility(View.GONE);
-                            giftWallData.setVisibility(View.VISIBLE);
-                            alreadyWallAdapter.addAllData(data.getGiftWall());
-                            litIcon.setText(data.getGiftWallLightenNumber());
-                            giftAll.setText("/" + data.getGiftWallLightenTotal());
-                        } else {
-                            giftWallNoData.setVisibility(View.VISIBLE);
-                            giftWallData.setVisibility(View.GONE);
+        if (isAnchor){
+            LiveNetManager.get(getActivity()).
+                    giftAlreadyWall(mLiveUid, toUid, new HttpCallback<GiftAlreadyWallModel>() {
+                        @Override
+                        public void onSuccess(GiftAlreadyWallModel data) {
+                            if (data.getGiftWall().size() > 0) {
+                                giftWallNoData.setVisibility(View.GONE);
+                                giftWallData.setVisibility(View.VISIBLE);
+                                alreadyWallAdapter.addAllData(data.getGiftWall());
+                                litIcon.setText(data.getGiftWallLightenNumber());
+                                giftAll.setText("/" + data.getGiftWallLightenTotal());
+                            } else {
+                                giftWallNoData.setVisibility(View.VISIBLE);
+                                giftWallData.setVisibility(View.GONE);
+                            }
                         }
-                    }
 
-                    @Override
-                    public void onError(String error) {
+                        @Override
+                        public void onError(String error) {
+
+                        }
+                    });
+        }else {
+            LiveNetManager.get(getActivity()).
+                    giftUserSendWall(mLiveUid, toUid, new HttpCallback<GiftAlreadyWallModel>() {
+                        @Override
+                        public void onSuccess(GiftAlreadyWallModel data) {
+                            if (data.getGiftWall().size() > 0) {
+                                giftWallNoData.setVisibility(View.GONE);
+                                giftWallData.setVisibility(View.VISIBLE);
+                                alreadyWallAdapter.addAllData(data.getGiftWall());
+                                litIcon.setText(data.getGiftWallLightenNumber());
+                                giftAll.setText("/" + data.getGiftWallLightenTotal());
+                            } else {
+                                giftWallNoData.setVisibility(View.VISIBLE);
+                                giftWallData.setVisibility(View.GONE);
+                            }
+                        }
+
+                        @Override
+                        public void onError(String error) {
+
+                        }
+                    });
+        }
 
-                    }
-                });
     }
 
     public static GiftAlreadyWallFragment newInstance(String mStream, String mLiveUid, String toUid, boolean isAnchor) {

From 82ccd2d89c0491a54cbf935fa861889265ce4cf8 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 11:37:19 +0800
Subject: [PATCH 03/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/LiveNewWishListFragment.java     | 56 ++++++++++++++++++-
 common/src/main/res/values-en-rUS/string.xml  |  3 +
 common/src/main/res/values-zh-rHK/strings.xml |  3 +
 common/src/main/res/values-zh-rTW/strings.xml |  3 +
 common/src/main/res/values-zh/strings.xml     |  3 +
 common/src/main/res/values/strings.xml        |  3 +
 6 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
index c6dfaf62d..32197b1d5 100644
--- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
@@ -22,6 +22,7 @@ import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.HintCustomPopup;
 import com.yunbao.common.views.LiveNewWishGiftPopup;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
@@ -66,7 +67,7 @@ public class LiveNewWishListFragment extends BaseFragment {
             @Override
             public void onViewClicks() {
                 saveWish();
-                Bus.get().post(new PopupViewDismissEvent());
+
             }
         });
     }
@@ -110,7 +111,7 @@ public class LiveNewWishListFragment extends BaseFragment {
         List<WishModel2> wishList2 = new ArrayList<>();
         Gson gson = new Gson();
         for (WishModel model : wishList) {
-            if (model!=null){
+            if (model != null) {
                 WishModel2 model2 = gson.fromJson(gson.toJson(model), WishModel2.class);
                 wishList2.add(model2);
             }
@@ -118,8 +119,57 @@ public class LiveNewWishListFragment extends BaseFragment {
         }
         if (wishList2.size() == 0) {
             Bus.get().post(new PopupViewDismissEvent());
+        } else if (wishList2.size() == 1) {
+            new XPopup.Builder(getContext())
+                    .asCustom(new HintCustomPopup(getContext(),
+                            getContext().getString(R.string.dialog_tip),
+                            getContext().getString(R.string.sett_rigger))
+                            .setLiveOpenOk(getContext().getString(R.string.cancel_ca))
+                            .setLiveOpenCancel(getContext().getString(R.string.settings_ser))
+                            .setCallBack(new HintCustomPopup.HintCustomCallBack() {
+                                @Override
+                                public void onSure() {
+
+                                    if (wishList2.size() > 10) {
+                                        ToastUtil.show(R.string.must_hint);
+                                        return;
+                                    }
+                                    LiveNetManager.get(getContext()).
+                                            setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
+                                                @Override
+                                                public void onSuccess(String data) {
+                                                    Bus.get().post(new PopupViewDismissEvent());
+                                                }
+
+                                                @Override
+                                                public void onError(String error) {
+                                                    ToastUtil.show(R.string.net_error);
+                                                }
+                                            });
+                                    switch (type) {
+                                        case 1:
+                                            Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
+                                            break;
+                                        case 2:
+                                            Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
+                                            break;
+                                        case 3:
+                                            Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
+                                            break;
+                                        case 4:
+                                            Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
+                                            break;
+                                    }
+                                }
+
+                                @Override
+                                public void onCancel() {
+
+                                }
+                            })).show();
         } else {
-            if (wishList2.size()>10){
+            Bus.get().post(new PopupViewDismissEvent());
+            if (wishList2.size() > 10) {
                 ToastUtil.show(R.string.must_hint);
                 return;
             }
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 01a937fd8..c0ec19604 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1308,6 +1308,9 @@ Limited ride And limited avatar frame</string>
     <string name="the__gifts_in_the_studio">Please make gifts in the studio</string>
     <string name="been_sent">Been sent out</string>
     <string name="been_sent_must">Send out</string>
+    <string name="sett_rigger">"At least 2 types of gifts can be set to trigger the wish list special effect gift.     "</string>
+    <string name="cancel_ca">cancel</string>
+    <string name="settings_ser">settings</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 a1b2ca7d1..9724141a6 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1304,4 +1304,7 @@
     <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
+    <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
+    <string name="cancel_ca">不再设置</string>
+    <string name="settings_ser">去设置</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 56cc1c802..643b04889 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1303,4 +1303,7 @@
     <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
+    <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
+    <string name="cancel_ca">不再设置</string>
+    <string name="settings_ser">去设置</string>
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index ebe4b025f..bf87d8472 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1303,6 +1303,9 @@
     <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
+    <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
+    <string name="cancel_ca">不再设置</string>
+    <string name="settings_ser">去设置</string>
 
 
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index d3e9b1d33..d6af03ba2 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1309,5 +1309,8 @@ Limited ride And limited avatar frame</string>
     <string name="the__gifts_in_the_studio">Please make gifts in the studio</string>
     <string name="been_sent">Been sent out</string>
     <string name="been_sent_must">Send out</string>
+    <string name="sett_rigger">At least 2 types of gifts can be set to trigger the wish list special effect gift.     </string>
+    <string name="cancel_ca">cancel</string>
+    <string name="settings_ser">settings</string>
 
 </resources>

From 40e744a533de6885545b7e35af061621bc06a2ea Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 8 Aug 2023 13:32:42 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B2=89=E4=B8=9D?=
 =?UTF-8?q?=E5=9B=A2=E5=8C=85=E8=A3=B9=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BC=9A?=
 =?UTF-8?q?=E5=85=B3=E6=8E=89=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
index c75201359..346b57079 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
@@ -85,9 +85,6 @@ public class LiveFansGroupSendGiftDialog extends AbsDialogCenterPopupWindow {
                     @Override
                     public void onSuccess(List<FansGroupGiftPack> data) {
                         adapter.setList(data);
-                        if (data.size() == 0) {
-                            dismiss();
-                        }
                     }
 
                     @Override

From 44b95cb1c61edf887bcfb613c005a789fdbf6d24 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 14:50:13 +0800
Subject: [PATCH 05/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/adapter/LiveNewWishAdapter.java    | 16 ++++++-
 .../fragment/LiveNewWishListFragment.java     | 45 +++++++------------
 .../common/views/LiveNewWishListPopup.java    |  3 +-
 .../res/layout/dialog_live_new_wish_list.xml  |  5 ++-
 common/src/main/res/values-en-rUS/string.xml  |  1 +
 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     |  1 +
 common/src/main/res/values/strings.xml        |  1 +
 9 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java
index e6550b62d..4363e6dd2 100644
--- a/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java
@@ -1,5 +1,6 @@
 package com.yunbao.common.adapter;
 
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +12,7 @@ import com.yunbao.common.R;
 import com.yunbao.common.bean.WishModel;
 import com.yunbao.common.event.LiveNewWishListCloseEvent;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.DayWishItemViewHolder;
 import com.yunbao.common.views.LunarWishItemViewHolder;
 import com.yunbao.common.views.SeasonalWishItemViewHolder;
@@ -46,8 +48,20 @@ public class LiveNewWishAdapter extends RecyclerView.Adapter {
                 Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(true));
                 break;
         }
+        boolean isAdd = false;
+        for (int i = 0; i < wishList.size(); i++) {
+            if (wishList.get(i)!=null){
+                if (!TextUtils.isEmpty(wishList.get(i).getLid()) && !TextUtils.isEmpty(model.getLid())
+                        && TextUtils.equals(wishList.get(i).getLid(), model.getLid())) {
+                    ToastUtil.show(R.string.too_many_gifts);
+                    isAdd = true;
+                }
+            }
 
-        wishList.add(0, model);
+        }
+        if (!isAdd) {
+            wishList.add(0, model);
+        }
         notifyDataSetChanged();
     }
 
diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
index 32197b1d5..d2e73a5c7 100644
--- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
@@ -119,6 +119,7 @@ public class LiveNewWishListFragment extends BaseFragment {
         }
         if (wishList2.size() == 0) {
             Bus.get().post(new PopupViewDismissEvent());
+
         } else if (wishList2.size() == 1) {
             new XPopup.Builder(getContext())
                     .asCustom(new HintCustomPopup(getContext(),
@@ -146,20 +147,6 @@ public class LiveNewWishListFragment extends BaseFragment {
                                                     ToastUtil.show(R.string.net_error);
                                                 }
                                             });
-                                    switch (type) {
-                                        case 1:
-                                            Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
-                                            break;
-                                        case 2:
-                                            Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
-                                            break;
-                                        case 3:
-                                            Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
-                                            break;
-                                        case 4:
-                                            Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
-                                            break;
-                                    }
                                 }
 
                                 @Override
@@ -185,22 +172,22 @@ public class LiveNewWishListFragment extends BaseFragment {
                             ToastUtil.show(R.string.net_error);
                         }
                     });
-            switch (type) {
-                case 1:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
-                    break;
-                case 2:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
-                    break;
-                case 3:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
-                    break;
-                case 4:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
-                    break;
-            }
+
         }
 
-
+        switch (type) {
+            case 1:
+                Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
+                break;
+            case 2:
+                Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
+                break;
+            case 3:
+                Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
+                break;
+            case 4:
+                Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
+                break;
+        }
     }
 }
diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
index b6d8a88c6..b909dade7 100644
--- a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
@@ -167,6 +167,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
                 .setWishlistName(event.getModel().getName())
                 .setWishlistIcon(event.getModel().getImg())
                 .setWishlistNum("1")
+                .setLid(event.getModel().getId())
                 .setLuid("" + IMLoginManager.get(mContext).getUserInfo().getId())
                 .setWishlistProgress("0")
                 .setPrice(Integer.parseInt(event.getModel().getPrice()))
@@ -334,7 +335,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
                             setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                                 @Override
                                 public void onSuccess(String data) {
-                                    ToastUtil.show(data);
+                                    ToastUtil.show("修改成功");
                                 }
 
                                 @Override
diff --git a/common/src/main/res/layout/dialog_live_new_wish_list.xml b/common/src/main/res/layout/dialog_live_new_wish_list.xml
index 542dd57c5..f044c166a 100644
--- a/common/src/main/res/layout/dialog_live_new_wish_list.xml
+++ b/common/src/main/res/layout/dialog_live_new_wish_list.xml
@@ -39,7 +39,10 @@
         android:layout_width="117dp"
         android:layout_height="31dp"
         android:layout_alignParentEnd="true"
-        android:layout_margin="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@drawable/background_wish_replacement"
         android:gravity="center"
         android:text="@string/replacement_wish_day"
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index c0ec19604..26b8c1dff 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1311,6 +1311,7 @@ Limited ride And limited avatar frame</string>
     <string name="sett_rigger">"At least 2 types of gifts can be set to trigger the wish list special effect gift.     "</string>
     <string name="cancel_ca">cancel</string>
     <string name="settings_ser">settings</string>
+    <string name="too_many_gifts">Too many gifts</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 9724141a6..414e46817 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1307,4 +1307,5 @@
     <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
     <string name="cancel_ca">不再设置</string>
     <string name="settings_ser">去设置</string>
+    <string name="too_many_gifts">重複添加禮物</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 643b04889..e9de01ea7 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1306,4 +1306,5 @@
     <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
     <string name="cancel_ca">不再设置</string>
     <string name="settings_ser">去设置</string>
+    <string name="too_many_gifts">重複添加禮物</string>
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index bf87d8472..8ed844ab7 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1306,6 +1306,7 @@
     <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
     <string name="cancel_ca">不再设置</string>
     <string name="settings_ser">去设置</string>
+    <string name="too_many_gifts">重複添加禮物</string>
 
 
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index d6af03ba2..7c77c20d7 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1312,5 +1312,6 @@ Limited ride And limited avatar frame</string>
     <string name="sett_rigger">At least 2 types of gifts can be set to trigger the wish list special effect gift.     </string>
     <string name="cancel_ca">cancel</string>
     <string name="settings_ser">settings</string>
+    <string name="too_many_gifts">Too many gifts</string>
 
 </resources>

From 20c00e28962bf64a300e6b2fcb87467c9605fe5c Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 15:37:11 +0800
Subject: [PATCH 06/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/LiveNewWishListFragment.java     | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
index d2e73a5c7..fa77435bb 100644
--- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
@@ -117,9 +117,35 @@ public class LiveNewWishListFragment extends BaseFragment {
             }
 
         }
+        switch (type) {
+            case 1:
+                Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
+                break;
+            case 2:
+                Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
+                break;
+            case 3:
+                Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
+                break;
+            case 4:
+                Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
+                break;
+        }
         if (wishList2.size() == 0) {
             Bus.get().post(new PopupViewDismissEvent());
+            LiveNetManager.get(getContext()).
+                    setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
+                        @Override
+                        public void onSuccess(String data) {
+                            Bus.get().post(new PopupViewDismissEvent());
+                            ToastUtil.show("修改成功");
+                        }
 
+                        @Override
+                        public void onError(String error) {
+                            ToastUtil.show(R.string.net_error);
+                        }
+                    });
         } else if (wishList2.size() == 1) {
             new XPopup.Builder(getContext())
                     .asCustom(new HintCustomPopup(getContext(),
@@ -140,6 +166,7 @@ public class LiveNewWishListFragment extends BaseFragment {
                                                 @Override
                                                 public void onSuccess(String data) {
                                                     Bus.get().post(new PopupViewDismissEvent());
+                                                    ToastUtil.show("修改成功");
                                                 }
 
                                                 @Override
@@ -164,7 +191,8 @@ public class LiveNewWishListFragment extends BaseFragment {
                     setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                         @Override
                         public void onSuccess(String data) {
-
+                            Bus.get().post(new PopupViewDismissEvent());
+                            ToastUtil.show("修改成功");
                         }
 
                         @Override
@@ -174,20 +202,5 @@ public class LiveNewWishListFragment extends BaseFragment {
                     });
 
         }
-
-        switch (type) {
-            case 1:
-                Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
-                break;
-            case 2:
-                Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
-                break;
-            case 3:
-                Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
-                break;
-            case 4:
-                Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
-                break;
-        }
     }
 }

From af17c85366497b0fbb4a5301a45da2e55c898856 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 16:08:43 +0800
Subject: [PATCH 07/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/LiveNewWishListFragment.java     | 23 ++++++++-----------
 .../common/views/LiveNewWishListPopup.java    | 12 ++++------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
index fa77435bb..c9d165012 100644
--- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
@@ -66,7 +66,7 @@ public class LiveNewWishListFragment extends BaseFragment {
         ViewClicksAntiShake.clicksAntiShake(tvDone, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                saveWish();
+                saveWish( );
 
             }
         });
@@ -106,7 +106,7 @@ public class LiveNewWishListFragment extends BaseFragment {
         liveNewWishAdapter.addData(wishList, type);
     }
 
-    public void saveWish() {
+    public void saveWish( ) {
         List<WishModel> wishList = liveNewWishAdapter.getWishList();
         List<WishModel2> wishList2 = new ArrayList<>();
         Gson gson = new Gson();
@@ -132,12 +132,10 @@ public class LiveNewWishListFragment extends BaseFragment {
                 break;
         }
         if (wishList2.size() == 0) {
-            Bus.get().post(new PopupViewDismissEvent());
             LiveNetManager.get(getContext()).
                     setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                         @Override
                         public void onSuccess(String data) {
-                            Bus.get().post(new PopupViewDismissEvent());
                             ToastUtil.show("修改成功");
                         }
 
@@ -151,12 +149,17 @@ public class LiveNewWishListFragment extends BaseFragment {
                     .asCustom(new HintCustomPopup(getContext(),
                             getContext().getString(R.string.dialog_tip),
                             getContext().getString(R.string.sett_rigger))
-                            .setLiveOpenOk(getContext().getString(R.string.cancel_ca))
-                            .setLiveOpenCancel(getContext().getString(R.string.settings_ser))
+                            .setLiveOpenOk(getContext().getString(R.string.settings_ser))
+                            .setLiveOpenCancel(getContext().getString(R.string.cancel_ca))
                             .setCallBack(new HintCustomPopup.HintCustomCallBack() {
                                 @Override
                                 public void onSure() {
 
+                                }
+
+                                @Override
+                                public void onCancel() {
+
                                     if (wishList2.size() > 10) {
                                         ToastUtil.show(R.string.must_hint);
                                         return;
@@ -165,7 +168,6 @@ public class LiveNewWishListFragment extends BaseFragment {
                                             setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                                                 @Override
                                                 public void onSuccess(String data) {
-                                                    Bus.get().post(new PopupViewDismissEvent());
                                                     ToastUtil.show("修改成功");
                                                 }
 
@@ -175,14 +177,8 @@ public class LiveNewWishListFragment extends BaseFragment {
                                                 }
                                             });
                                 }
-
-                                @Override
-                                public void onCancel() {
-
-                                }
                             })).show();
         } else {
-            Bus.get().post(new PopupViewDismissEvent());
             if (wishList2.size() > 10) {
                 ToastUtil.show(R.string.must_hint);
                 return;
@@ -191,7 +187,6 @@ public class LiveNewWishListFragment extends BaseFragment {
                     setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                         @Override
                         public void onSuccess(String data) {
-                            Bus.get().post(new PopupViewDismissEvent());
                             ToastUtil.show("修改成功");
                         }
 
diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
index b909dade7..6ef497509 100644
--- a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
@@ -110,17 +110,15 @@ public class LiveNewWishListPopup extends BottomPopupView {
                     public void onSure() {
                         hintCustomPopup = null;
                         if (dayWish) {
-                            dayWishFragment.saveWish();
+                            dayWishFragment.saveWish( );
                         } else if (zhouXin) {
-                            zhouXinFragment.saveWish();
+                            zhouXinFragment.saveWish( );
                         } else if (lunarWish) {
-                            lunarWishFragment.saveWish();
+                            lunarWishFragment.saveWish( );
                         } else if (seasonalWish) {
-                            seasonalWishFragment.saveWish();
-                        }
-                        if (isDismiss) {
-                            dismiss();
+                            seasonalWishFragment.saveWish( );
                         }
+
                     }
 
                     @Override

From 2162645da123e94a56163e7b6d3e90514b102f98 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 16:12:07 +0800
Subject: [PATCH 08/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/LiveNewWishListFragment.java     | 19 ++++++++++++++++---
 .../common/views/LiveNewWishListPopup.java    |  1 -
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
index c9d165012..bb7a963c1 100644
--- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
@@ -17,7 +17,6 @@ import com.yunbao.common.bean.WishListModel;
 import com.yunbao.common.bean.WishModel;
 import com.yunbao.common.bean.WishModel2;
 import com.yunbao.common.event.LiveNewWishListCloseEvent;
-import com.yunbao.common.event.PopupViewDismissEvent;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.Bus;
@@ -66,7 +65,7 @@ public class LiveNewWishListFragment extends BaseFragment {
         ViewClicksAntiShake.clicksAntiShake(tvDone, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                saveWish( );
+                saveWish();
 
             }
         });
@@ -106,7 +105,21 @@ public class LiveNewWishListFragment extends BaseFragment {
         liveNewWishAdapter.addData(wishList, type);
     }
 
-    public void saveWish( ) {
+    public int liveNewWishAdapterWishList() {
+        List<WishModel> wishList = liveNewWishAdapter.getWishList();
+        List<WishModel2> wishList2 = new ArrayList<>();
+        Gson gson = new Gson();
+        for (WishModel model : wishList) {
+            if (model != null) {
+                WishModel2 model2 = gson.fromJson(gson.toJson(model), WishModel2.class);
+                wishList2.add(model2);
+            }
+
+        }
+        return wishList2.size();
+    }
+
+    public void saveWish() {
         List<WishModel> wishList = liveNewWishAdapter.getWishList();
         List<WishModel2> wishList2 = new ArrayList<>();
         Gson gson = new Gson();
diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
index 6ef497509..4ca74750f 100644
--- a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
@@ -98,7 +98,6 @@ public class LiveNewWishListPopup extends BottomPopupView {
 
     private void saveWishDialog(boolean isDismiss) {
         if (hintCustomPopup != null) return;
-
         hintCustomPopup = new HintCustomPopup(
                 getContext(),
                 getContext().getString(R.string.replacement_reset_confirmed_cancel3),

From e32e6f95b0af5a26866adb94bdc2e54d310c5fbb Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 8 Aug 2023 17:09:35 +0800
Subject: [PATCH 09/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/views/DayWishItemViewHolder.java       |  9 ++++++---
 .../common/views/LunarWishItemViewHolder.java     |  9 ++++++---
 .../common/views/SeasonalWishItemViewHolder.java  |  9 ++++++---
 .../common/views/WeekWishItemViewHolder.java      |  9 ++++++---
 .../main/res/layout/dialog_live_gift_popup.xml    | 15 ++++++++++++---
 .../com/yunbao/live/views/LiveGiftViewHolder.java |  5 ++++-
 6 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
index 335b71651..677c2d632 100644
--- a/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
@@ -80,10 +80,13 @@ public class DayWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
index 756685745..01d3d65ea 100644
--- a/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class LunarWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
index b0578cc45..be93e658d 100644
--- a/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class SeasonalWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
index 422c2e304..63d1f533e 100644
--- a/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class WeekWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml
index e51c57a5d..66284053c 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup.xml
@@ -92,7 +92,7 @@
     <RelativeLayout
         android:id="@+id/gift_list"
         android:layout_width="match_parent"
-        android:layout_height="351dp"
+        android:layout_height="361dp"
         android:animateLayoutChanges="true"
         android:orientation="vertical">
 
@@ -157,14 +157,23 @@
                         android:progress="0"
                         android:progressDrawable="@drawable/progress_bg_user" />
 
-                    <TextView
+                    <com.yunbao.common.views.weight.MarqueeTextView
                         android:id="@+id/leave_hint"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginTop="2dp"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:gravity="center"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
                         android:text="@string/leveling_points"
                         android:textColor="#BBBBBB"
                         android:textSize="9sp" />
+
                 </LinearLayout>
 
                 <ImageView
diff --git a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
index a36e27ca8..8d5168ed4 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
@@ -178,7 +178,10 @@ public class LiveGiftViewHolder extends AbsViewHolder {
             mGiftCount.setText(new LiveTextRender().renderGiftCount(mLianCount));
         }
         mLastGiftKey = bean.getKey();
-        if (!TextUtils.equals(bean.getNamingLiveuid(), "0") && !TextUtils.equals(bean.getNamingUid(), "0")) {
+        if (!TextUtils.isEmpty(bean.getNamingLiveuid()) &&
+                !TextUtils.isEmpty(bean.getNamingUid()) &&
+                !TextUtils.equals(bean.getNamingLiveuid(), "0") &&
+                !TextUtils.equals(bean.getNamingUid(), "0")) {
             root_back.setBackgroundResource(R.drawable.background_naming);
             findViewById(R.id.naming_icon).setVisibility(View.VISIBLE);
         } else {

From 3cc9b901512e244bbe665da3a96b04f8e3813564 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 9 Aug 2023 10:24:13 +0800
Subject: [PATCH 10/13] =?UTF-8?q?update=20=E7=AE=80=E7=B9=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/shayu/phonelive/AppContext.java  |   6 -
 common/src/main/res/values-zh-rHK/strings.xml |  10 +-
 common/src/main/res/values-zh-rTW/strings.xml |  10 +-
 common/src/main/res/values-zh/strings.xml     | 188 +++++++++---------
 4 files changed, 104 insertions(+), 110 deletions(-)

diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java
index 6dea8b7ed..98dc3348a 100644
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/app/src/main/java/com/shayu/phonelive/AppContext.java
@@ -135,12 +135,6 @@ public class AppContext extends CommonAppContext {
         if (!isMainProcess()) {
             return;
         }
-        AppManager.runDebugCode(new Runnable() {
-            @Override
-            public void run() {
-                ToastUtil.show("Debug代码");
-            }
-        });
         CrashSaveBean.getInstance().setStartTime(System.currentTimeMillis());
         //注册全局异常捕获
         registerError();
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index 414e46817..c4f091157 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1300,12 +1300,12 @@
     <string name="title_anchor">冠名主播：</string>
     <string name="the_title_financier">冠名金主：</string>
     <string name="the_title_financier2">冠名</string>
-    <string name="the_title_financier3">请输入自定义数量</string>
-    <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
+    <string name="the_title_financier3">請輸入自定義數量</string>
+    <string name="the__gifts_in_the_studio">請在直播間內進行送禮</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
-    <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
-    <string name="cancel_ca">不再设置</string>
-    <string name="settings_ser">去设置</string>
+    <string name="sett_rigger">最低設置2種類型禮物才能觸發心愿單特效禮物。</string>
+    <string name="cancel_ca">不再設置</string>
+    <string name="settings_ser">去設置</string>
     <string name="too_many_gifts">重複添加禮物</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 e9de01ea7..abbd53187 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1299,12 +1299,12 @@
     <string name="title_anchor">冠名主播：</string>
     <string name="the_title_financier">冠名金主：</string>
     <string name="the_title_financier2">冠名</string>
-    <string name="the_title_financier3">请输入自定义数量</string>
-    <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
+    <string name="the_title_financier3">請輸入自定義數量</string>
+    <string name="the__gifts_in_the_studio">請在直播間內進行送禮</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
-    <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
-    <string name="cancel_ca">不再设置</string>
-    <string name="settings_ser">去设置</string>
+    <string name="sett_rigger">最低設置2種類型禮物才能觸發心愿單特效禮物。</string>
+    <string name="cancel_ca">不再設置</string>
+    <string name="settings_ser">去設置</string>
     <string name="too_many_gifts">重複添加禮物</string>
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 8ed844ab7..74039fbf7 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -20,7 +20,7 @@
     <string name="bonus_sign">立即簽到</string>
     <string name="bonus_sign_1">已連續簽到</string>
     <string name="bonus_day">天</string>
-    <string name="beauty_init_error">美顏初始化异常，無法使用</string>
+    <string name="beauty_init_error">美顏初始化異常，無法使用</string>
     <string name="cash">提現帳戶</string>
     <string name="cash_account_empty">您當前還沒設定提現帳戶</string>
     <string name="cash_add_account">添加提現帳戶</string>
@@ -34,7 +34,7 @@
     <string name="cash_type_ali">支付寶</string>
     <string name="cash_type_wx">微信</string>
     <string name="cash_type_bank">銀行卡</string>
-    <string name="cash_delete">是否要删除該帳戶？</string>
+    <string name="cash_delete">是否要刪除該帳戶？</string>
     <string name="cash_record">提現記錄</string>
     <string name="coin_give">贈送</string>
     <string name="coin_balance">帳戶餘額</string>
@@ -58,17 +58,17 @@
     <string name="task1">任務1</string>
     <string name="task2">任務2</string>
     <string name="task3">任務3</string>
-    <string name="give_a_free_gift">赠送一个\n免费礼物</string>
+    <string name="give_a_free_gift">贈送一個\n免費禮物</string>
     <string name="incomplete">未完成</string>
     <string name="complete">完成</string>
     <string name="follow_anchor">任意關注\n一名主播</string>
     <string name="light_up_room">雙擊點亮\n    直播間</string>
     <string name="completing_mission">恭喜你完成任務</string>
-    <string name="get">获得</string>
+    <string name="get">獲得</string>
     <string name="only_one">這個禮物只能送一個哦~</string>
     <string name="edit_profile_birthday">生日</string>
     <string name="edit_profile_sex">性別</string>
-    <string name="apply_for_lianmai">申请連麥</string>
+    <string name="apply_for_lianmai">申請連麥</string>
     <string name="cancel_application">取消申請</string>
     <string name="close_mic">關閉連麥</string>
     <string name="quit_mic">退出連麥</string>
@@ -125,7 +125,7 @@
     <string name="guard_my">我的</string>
     <string name="diamond">鑽石</string>
 
-    <string name="guard_guard">主播守护</string>
+    <string name="guard_guard">主播守護</string>
     <string name="guard_week_con">本周貢獻</string>
     <string name="guard_no_data">主播正在等待您的守護！</string>
     <string name="guard_tip_0">快去為喜歡的主播開通守護吧</string>
@@ -193,12 +193,12 @@
     <string name="login_tip_1">登入即代表同意</string>
     <string name="login_tip_2">服務和隱私條款</string>
     <string name="login_other_type">其他登入管道</string>
-    <string name="login_tip_3">注册登入後體驗更精彩！</string>
+    <string name="login_tip_3">註冊登入後體驗更精彩！</string>
     <string name="login_input_phone">請輸入手機號碼</string>
     <string name="login_input_pwd">請輸入密碼</string>
     <string name="login_immediately_login">立即登入</string>
     <string name="login_ing">登入中</string>
-    <string name="login_immediately_register">立即注册</string>
+    <string name="login_immediately_register">立即註冊</string>
     <string name="login_forget_pwd">忘記密碼</string>
     <string name="login_phone_error">請輸入正確的手機號碼</string>
     <string name="login_auth_ing">正在授權登入</string>
@@ -219,7 +219,7 @@
     <string name="live_class">選擇頻道</string>
     <string name="live_class_choose">選擇直播頻道</string>
     <string name="live_class_tip_title">注意選擇適合自己的頻道。</string>
-    <string name="live_class_tip">直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情况，會調整您的直播頻道。</string>
+    <string name="live_class_tip">直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情況，會調整您的直播頻道。</string>
     <string name="live_set_pwd">請設定房間密碼</string>
     <string name="live_set_fee">請設定收費金額\n（收益以直播結束顯示為准）</string>
     <string name="live_set_pwd_empty">請設定房間密碼</string>
@@ -424,17 +424,17 @@
     <string name="profit_tip_2">可提現%1$s數</string>
     <string name="profit_tip_3">輸入要選取的%1$s數</string>
     <string name="profit_cash">立即提現</string>
-    <string name="reg_register">注册</string>
+    <string name="reg_register">註冊</string>
     <string name="reg_input_phone">請輸入您的手機號</string>
     <string name="reg_input_code">請輸入驗證碼</string>
     <string name="reg_input_pwd_1">請填寫密碼</string>
     <string name="reg_input_pwd_2">請確認密碼</string>
     <string name="reg_input_pwd_3">填寫邀請碼（非必填）</string>
-    <string name="reg_register_and_login">注册並登入</string>
+    <string name="reg_register_and_login">註冊並登入</string>
     <string name="reg_get_code">獲取驗證碼</string>
     <string name="reg_get_code_again">重新獲取</string>
     <string name="reg_pwd_error">密碼不一致</string>
-    <string name="reg_register_ing">注册中</string>
+    <string name="reg_register_ing">註冊中</string>
     <string name="red_pack_1">直播間紅包</string>
     <string name="red_pack_2">給當前直播間觀眾發紅包</string>
     <string name="red_pack_3">拼手氣紅包</string>
@@ -516,7 +516,7 @@
     <string name="video_process_failed">視頻預處理失敗</string>
     <string name="video_process_cancel">視頻預處理取消</string>
     <string name="video_processing">處理中</string>
-    <string name="video_edit_status_error">狀態异常，停止編輯</string>
+    <string name="video_edit_status_error">狀態異常，停止編輯</string>
     <string name="video_choose_music">選擇音樂</string>
     <string name="video_search_music">蒐索歌曲名稱</string>
     <string name="video_music_hot">熱門歌曲</string>
@@ -533,7 +533,7 @@
     <string name="video_process_2">視頻生成中</string>
     <string name="video_generate_success">生成視頻成功</string>
     <string name="video_generate_failed">生成視頻失敗</string>
-    <string name="video_give_up_pub">是否放弃發佈此條視頻</string>
+    <string name="video_give_up_pub">是否放棄發佈此條視頻</string>
     <string name="video_no_local">未找到本地視頻</string>
     <string name="video_local">本地視頻</string>
     <string name="video_duration_error">視頻時長不符合要求</string>
@@ -559,12 +559,12 @@
     <string name="video_report_tip_3">請選擇舉報理由</string>
     <string name="video_report_tip_4">舉報成功</string>
     <string name="video_scroll_top">已經到頂了哦</string>
-    <string name="video_record_delete_last">確定删除上一段視頻？</string>
+    <string name="video_record_delete_last">確定刪除上一段視頻？</string>
     <string name="video_edit_exit">是否退出視頻編輯</string>
     <string name="add">添加</string>
     <string name="accept">接受</string>
     <string name="all">全部</string>
-    <string name="alumb">相册</string>
+    <string name="alumb">相冊</string>
     <string name="cancel">取消</string>
     <string name="camera">相機</string>
     <string name="pic_choose_look">圖片選取/預覽</string>
@@ -577,18 +577,18 @@
     <string name="cannot_follow_self">無法關注自己哦~</string>
     <string name="dialog_tip">提示</string>
     <string name="download">下載</string>
-    <string name="delete">删除</string>
+    <string name="delete">刪除</string>
     <string name="end">結束</string>
     <string name="hot">熱門</string>
     <string name="day_rank">日榜</string>
     <string name="week_rank">周榜</string>
     <string name="live_audience">觀衆</string>
-    <string name="rosy">红润</string>
+    <string name="rosy">紅潤</string>
     <string name="skin">美白</string>
     <string name="smooth">磨皮</string>
     <string name="big_eyes">大眼</string>
-    <string name="slim_face">瘦脸</string>
-    <string name="thin_face">削脸</string>
+    <string name="slim_face">瘦臉</string>
+    <string name="thin_face">削臉</string>
     <string name="chin">下巴</string>
     <string name="nose">鼻子</string>
     <string name="lips">嘴唇</string>
@@ -596,24 +596,24 @@
     <string name="teeth">白牙</string>
     <string name="light">自然</string>
     <string name="white">白皙</string>
-    <string name="white1">净白</string>
+    <string name="white1">凈白</string>
     <string name="jp">日系</string>
     <string name="bw">黑白</string>
     <string name="soft">柔和</string>
     <string name="warmth">暖光</string>
-    <string name="retro">复古</string>
+    <string name="retro">復古</string>
     <string name="flower">花香</string>
-    <string name="easy">轻氧</string>
-    <string name="vitality">元气</string>
-    <string name="warm">鲜明</string>
+    <string name="easy">輕氧</string>
+    <string name="vitality">元氣</string>
+    <string name="warm">鮮明</string>
     <string name="bright">明亮</string>
     <string name="deep">深海</string>
-    <string name="sunset">夕阳</string>
-    <string name="cure">治愈</string>
-    <string name="filter">滤镜</string>
+    <string name="sunset">夕陽</string>
+    <string name="cure">治癒</string>
+    <string name="filter">濾鏡</string>
     <string name="preset">美型</string>
-    <string name="beauty">美颜</string>
-    <string name="cute">可爱</string>
+    <string name="beauty">美顏</string>
+    <string name="cute">可愛</string>
     <string name="goddess">女神</string>
     <string name="gxzb">個性裝扮</string>
     <string name="glamour_list">魅力榜</string>
@@ -680,7 +680,7 @@
     <string name="live_level_chat_limit">發言，需要到達%1$s級</string>
     <string name="live_location_close">開定位</string>
     <string name="live_location_close_2">堅決關閉</string>
-    <string name="live_location_close_3">關閉定位，直播不會被附近的人看到，直播間人數可能會减少，確認關閉嗎？</string>
+    <string name="live_location_close_3">關閉定位，直播不會被附近的人看到，直播間人數可能會減少，確認關閉嗎？</string>
     <string name="mars">火星</string>
     <string name="shop">商城</string>
     <string name="detail">明細</string>
@@ -698,7 +698,7 @@
     <string name="wallet_tip_5">未選中支付方式</string>
     <string name="wallet_coin_name">我的%1$s</string>
     <string name="charge">充值</string>
-    <string name="receive">领取</string>
+    <string name="receive">領取</string>
     <string name="mesg">消息中心</string>
     <string name="owning_guild">所屬公會</string>
     <string name="live_ktgz">開通貴族</string>
@@ -715,7 +715,7 @@
     <string name="chat_charge_pay">立即支付</string>
     <string name="live_user_level">使用者等級</string>
     <string name="live_user_level_anchor">主播等級</string>
-    <string name="live_user_card_level">用户等級</string>
+    <string name="live_user_card_level">用戶等級</string>
     <string name="live_noble_level_anchor">貴族等級</string>
     <string name="live_noble_fens_anchor">粉絲團</string>
     <string name="live_honor_number_anchor">榮譽墻</string>
@@ -728,7 +728,7 @@
     <string name="live_send_buy_zuoji_1">購買了座騎</string>
     <string name="live_send_buy_liang_name_1">購買了靚號</string>
     <string name="live_send_buy_vip_1">VIP</string>
-    <string name="live_random">随机PK</string>
+    <string name="live_random">隨機PK</string>
     <string name="live_wishlist">心願單</string>
     <string name="live_zg">娛樂整蠱</string>
     <string name="live_dr">多人PK</string>
@@ -745,7 +745,7 @@
     <string name="guard_tip_day3">您是當前主播的年守護</string>
     <string name="guardiandate">守護日期截止到：%s</string>
 
-    <string name="favoriteanchor">快为您喜欢的主播开通守护吧</string>
+    <string name="favoriteanchor">快為您喜歡的主播開通守護吧</string>
     <string name="theguardianof">成爲%s的守護</string>
 
 
@@ -765,7 +765,7 @@
     <string name="register_tip_3">隱私政策</string>
     <string name="live_medal_des2">每日禮包</string>
     <string name="live_medal_des3">貴賓座席</string>
-    <string name="live_medal_des5">真爱排行</string>
+    <string name="live_medal_des5">真愛排行</string>
     <string name="live_medal_des4">送禮獲得粉絲微章</string>
     <string name="wishlist_title3">當日設置的心願，會在當天24:00失效</string>
     <string name="live_item_add_gift">添加禮物和數量</string>
@@ -777,7 +777,7 @@
     <string name="lives_state">直播中</string>
     <string name="rest_state">休息中</string>
 
-    <string name="live_close_follow">拜托拜托，可以關注一下我嗎？</string>
+    <string name="live_close_follow">拜託拜託，可以關注一下我嗎？</string>
     <string name="live_close_follow_exit">關注並退出</string>
     <string name="live_close_exit">直接退出</string>
     <string name="user">用戶</string>
@@ -816,10 +816,10 @@
 
     <string name="now_noble">當前貴族： </string>
     <string name="now_noble_time">到期時間： </string>
-    <string name="black_succer">已加入黑名单</string>
-    <string name="black_error">加入黑名单失败</string>
-    <string name="black_succer_more">移除黑名单成功</string>
-    <string name="black_error_more">移除黑名单失败</string>
+    <string name="black_succer">已加入黑名單</string>
+    <string name="black_error">加入黑名單失敗</string>
+    <string name="black_succer_more">移除黑名單成功</string>
+    <string name="black_error_more">移除黑名單失敗</string>
 
     <string name="reply">回復</string>
     <string name="input_content">回復評論</string>
@@ -844,9 +844,9 @@
     <string name="user_task_text3">解鎖直播間發言功能</string>
     <string name="user_task_but">前置任務</string>
 
-    <string name="user_login_facebook">使用Facebook登录</string>
-    <string name="user_login_twitter">使用Twitter登录</string>
-    <string name="user_login_google">使用Google登录</string>
+    <string name="user_login_facebook">使用Facebook登錄</string>
+    <string name="user_login_twitter">使用Twitter登錄</string>
+    <string name="user_login_google">使用Google登錄</string>
 
     <string name="user_login_outtime">請求超時，請稍後再試。</string>
 
@@ -893,12 +893,12 @@
     <string name="floating_screen">飄屏彈幕</string>
     <string name="whole_station_horn">全站喇叭</string>
     <string name="whole_station_horn_hint">可用次數：%s  注：每月1日凌晨4點更新次數</string>
-    <string name="cannot_be_empty">内容不可为空</string>
+    <string name="cannot_be_empty">內容不可為空</string>
     <string name="site_wide_news">貴族專屬全站消息</string>
     <string name="site_wide_news_hint1">全站顯示消息並可跳轉到當前直播間</string>
-    <string name="site_wide_news_hint2">开通贵族国王、皇帝、超级皇帝免费获得</string>
+    <string name="site_wide_news_hint2">開通貴族國王、皇帝、超級皇帝免費獲得</string>
     <string name="back">返回</string>
-    <string name="go_nobility">前往贵族</string>
+    <string name="go_nobility">前往貴族</string>
     <string name="use_successfully">使用成功</string>
     <string name="use_live">前往直播間</string>
     <string name="search_history">搜索歷史</string>
@@ -907,7 +907,7 @@
     <string name="anchor_more">更多</string>
     <string name="wonderful_live">精彩直播</string>
     <string name="recommended_for_you">為您推薦</string>
-    <string name="fun_games">趣味游戏</string>
+    <string name="fun_games">趣味遊戲</string>
     <string name="value_added_benefits">增值權益</string>
     <string name="fan_club">粉絲團</string>
     <string name="activity_center">活動中心</string>
@@ -931,7 +931,7 @@
     <string name="viscount">子爵</string>
     <string name="marquis">侯爵</string>
     <string name="duke">公爵</string>
-    <string name="king">国王</string>
+    <string name="king">國王</string>
     <string name="emperor">皇帝</string>
     <string name="better_emperor">超皇</string>
     <string name="can_not_go">無法前往神秘人的個人主頁。</string>
@@ -942,21 +942,21 @@
     <string name="try_again_later">數據加載失敗，請稍後再試</string>
     <string name="open_noble2">開通了</string>
     <string name="enough_speakers">喇叭數量不足</string>
-    <string name="order_query">订单查询中</string>
-    <string name="order_query_success">订单无异常</string>
+    <string name="order_query">訂單查詢中</string>
+    <string name="order_query_success">訂單無異常</string>
     <string name="login_invalid">登錄失效，請重新登錄</string>
     <string name="login_wait">請稍後</string>
     <string name="slide_settings">滑動設置</string>
     <string name="up_slide_settings">上下滑動切換直播間</string>
-    <string name="live_say_something_a">\@用户昵称\t\t你好啊～</string>
-    <string name="oline_list">在线列表</string>
+    <string name="live_say_something_a">\@用戶昵稱\t\t你好啊～</string>
+    <string name="oline_list">在線列表</string>
     <string name="search_want">搜索想要@的人</string>
     <string name="online_audience">在線觀眾</string>
     <string name="audience">觀眾</string>
     <string name="cannot_yourself">無法@自己</string>
     <string name="total_star_value">總星值</string>
     <string name="number_of_people_assisted">助力人數</string>
-    <string name="star_change">%s星挑战</string>
+    <string name="star_change">%s星挑戰</string>
     <string name="star_success">恭喜 %s，完成了%s %s星 挑戰，快去一睹主播芳容吧！</string>
     <string name="star">星</string>
     <string name="small_window_settings">小窗播放設置</string>
@@ -966,13 +966,13 @@
     <string name="system_window">APP全應用小窗播放</string>
     <string name="system_window_hint">在其他應用上及所有界面显示小窗\n需打開懸浮窗權限。</string>
     <string name="to_open_the">前往打開</string>
-    <string name="do_you_like">不喜歡小窗播放吗？\n可以在「個人中心」-「設定」中關閉</string>
+    <string name="do_you_like">不喜歡小窗播放嗎？\n可以在「個人中心」-「設定」中關閉</string>
     <string name="to_set_up">去設置</string>
     <string name="know_the">知道了</string>
     <string name="individual_set">個人設定</string>
     <string name="reward">獎勵</string>
     <string name="change_the_password">修改密碼</string>
-    <string name="blacklist">黑名单</string>
+    <string name="blacklist">黑名單</string>
     <string name="alerts">消息通知</string>
     <string name="studio_gift_effects">屏蔽直播間禮物特效</string>
     <string name="studio_ride_effects">屏蔽直播間座駕特效</string>
@@ -988,7 +988,7 @@
     <string name="image_quality_selection">畫質選擇</string>
     <string name="more_settings">更多設置</string>
     <string name="moer">查看更多</string>
-    <string name="gift_way">礼物正在获取中...</string>
+    <string name="gift_way">禮物正在獲取中...</string>
     <string name="start_pk">開始PK</string>
     <string name="number_of_remaining_times">剩餘次數:%s</string>
     <string name="confirmed_to_proceed">是否確認進行多人PK（確認後扣除1點次數）當日剩餘次數: %s</string>
@@ -997,9 +997,9 @@
     <string name="pk_time">時間  %s</string>
 
     <string name="random_pk_dialog_apply">接受</string>
-    <string name="random_pk_dialog_refuse">拒绝</string>
-    <string name="random_pk_dialog_refuse_again">坚持拒绝</string>
-    <string name="random_pk_dialog_title">随机PK提示</string>
+    <string name="random_pk_dialog_refuse">拒絕</string>
+    <string name="random_pk_dialog_refuse_again">堅持拒絕</string>
+    <string name="random_pk_dialog_title">隨機PK提示</string>
 
     <string name="speech_robot_setup">自動發言機器人設置</string>
     <string name="robot_switch">機器人開關</string>
@@ -1036,7 +1036,7 @@
     <string name="stick_to_choice">堅持選擇</string>
     <string name="net_hint">網絡提示</string>
     <string name="net_hint2">系統監測到您的網絡不穩定，設備內存不足將會影響到您的直播流暢度，因此建議您選擇流暢清晰度。</string>
-    <string name="check_the_new_version">检查新版本</string>
+    <string name="check_the_new_version">檢查新版本</string>
     <string name="discover_a_new_version">發現新版本，點此更新</string>
     <string name="latest_version">已是最新版本</string>
     <string name="updating">更新中</string>
@@ -1059,7 +1059,7 @@
     <string name="live_data_attention_rate">關注轉化率</string>
     <string name="live_data_fan_group">新增粉絲團</string>
     <string name="live_data_fan_group_rate">粉絲團轉化率</string>
-    <string name="live_data_loading">加载中…</string>
+    <string name="live_data_loading">加載中…</string>
     <string name="yoursystemisolder">由於您的系統較老，我們自動為您屏蔽了禮物及座駕特效，可在「設置中心」手動打開。</string>
     <string name="net_error">抱歉！出錯了！</string>
 
@@ -1068,19 +1068,19 @@
     <string name="more_day_to">再簽到1天即可獲得額外獎勵。</string>
     <string name="sign_in_to_the_center">「簽到中心」</string>
     <string name="go_to_the">快前往「簽到中心」獲得額外獎勵吧！</string>
-    <string name="sign_in_center">签到中心</string>
-    <string name="to_top">返回首页</string>
-    <string name="go_to_the_sign">前往签到中心</string>
+    <string name="sign_in_center">簽到中心</string>
+    <string name="to_top">返回首頁</string>
+    <string name="go_to_the_sign">前往簽到中心</string>
     <string name="confirm_pick_up">確認領取</string>
     <string name="customer_service2">無法登陸？點此聯繫客服</string>
     <string name="next_step_is_consent">進入下一步即代表同意</string>
-    <string name="user_protocol2">用户協議</string>
+    <string name="user_protocol2">用戶協議</string>
     <string name="and">和</string>
     <string name="privacy_terms">隱私條款</string>
     <string name="terms_and_policies">條款和政策</string>
     <string name="treat_and_protect">歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
     <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
-    <string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。  除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</string>
+    <string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。  除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]採集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</string>
     <string name="agreement">同意</string>
     <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
     <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
@@ -1091,7 +1091,7 @@
     <string name="layout_live_anchor_say_ready_title">女神說</string>
 
     <string name="say_something3">說點什麽吧...</string>
-    <string name="come_hint">%s 来了</string>
+    <string name="come_hint">%s 來了</string>
     <string name="day_wish">日心願</string>
     <string name="zhou_xin">周心願</string>
     <string name="lunar_wish">月心願</string>
@@ -1107,8 +1107,8 @@
     <string name="replacement_reset_confirmed_hint">重置後將會清空當前心願單列表\n無論心願單是否完成</string>
     <string name="replacement_reset_confirmed_sure">確定重置</string>
     <string name="replacement_reset_confirmed_cancel">返回列表</string>
-    <string name="replacement_reset_confirmed_cancel2">是否保存当前心愿单</string>
-    <string name="replacement_reset_confirmed_cancel3">当前心愿单未保存</string>
+    <string name="replacement_reset_confirmed_cancel2">是否保存當前心愿單</string>
+    <string name="replacement_reset_confirmed_cancel3">當前心愿單未保存</string>
     <string name="replacement_reset_confirmed_cancel4">不保存</string>
 
     <string name="live_use_discount_content">您有一張%s，是否使用？使用後開通花費鉆石%s，返還金豆%s</string>
@@ -1119,10 +1119,10 @@
     <string name="live_language_setting">語言設定</string>
     <string name="traditional_chinese">繁體中文</string>
     <string name="add_gift2">添加禮物、貴族、守護心願</string>
-    <string name="heat_add">热度加成</string>
-    <string name="must_hint">最多只能设置10条</string>
+    <string name="heat_add">熱度加成</string>
+    <string name="must_hint">最多只能設置10條</string>
     <string name="live_room_chat_fount_size_low">小</string>
-    <string name="live_room_chat_fount_size_def">默认</string>
+    <string name="live_room_chat_fount_size_def">默認</string>
     <string name="live_room_chat_fount_size_high">大</string>
     <string name="dialog_live_fount_title">選擇字號大小</string>
     <string name="dialog_fount_submit">確認</string>
@@ -1139,9 +1139,9 @@
     <string name="chat_prompt9">新活動、系統消息</string>
     <string name="chat_prompt10">開播通知</string>
     <string name="chat_prompt11">開啟後獲得直播通知</string>
-    <string name="PK_Ladder_Race">PK天梯赛</string>
+    <string name="PK_Ladder_Race">PK天梯賽</string>
     <string name="party_studio">是否確認前往對方直播間？</string>
-    <string name="not_received">充值未到账？</string>
+    <string name="not_received">充值未到賬？</string>
     <string name="delete_account1">是否刪除賬號</string>
     <string name="delete_account2">點擊刪除後即刻生效，且不可恢復，您確認要繼續嗎？</string>
     <string name="delete_account3">確認刪除</string>
@@ -1173,22 +1173,22 @@
     <string name="complete_information_hint3">離開會讓您失去獎勵，您確認離開嗎？</string>
     <string name="complete_information_hint2">愛你，愛你</string>
     <string name="you_guide_me">指導下我好嗎</string>
-    <string name="resend_win">再送%s个必得%s</string>
-    <string name="have_already_win">已将%s发送至您的个性装扮</string>
+    <string name="resend_win">再送%s個必得%s</string>
+    <string name="have_already_win">已將%s發送至您的個性裝扮</string>
     <string name="mini_blind_box">迷你盲盒</string>
     <string name="collection_blind_box">典藏盲盒</string>
     <string name="pd_blind_box">PD盲盒</string>
     <string name="live_vote_create_error">投票創建失敗</string>
-    <string name="individual_dressing">个性装扮</string>
-    <string name="random_availability">可随机获得，%s</string>
-    <string name="random_availability2">已获得，%s，%s</string>
-    <string name="random_availability3">已获得，%s</string>
+    <string name="individual_dressing">個性裝扮</string>
+    <string name="random_availability">可隨機獲得，%s</string>
+    <string name="random_availability2">已獲得，%s，%s</string>
+    <string name="random_availability3">已獲得，%s</string>
     <string name="get_it_done">完成必得</string>
     <string name="blind_box_list">盲盒榜</string>
     <string name="participate_in">參與</string>
     <string name="extract_to">%s在%s中抽取到了</string>
-    <string name="extract_to2">%S送给了%s</string>
-    <string name="rebot_config_auto_say_max">超过最大值</string>
+    <string name="extract_to2">%S送給了%s</string>
+    <string name="rebot_config_auto_say_max">超過最大值</string>
     <string name="insufficient_balance">餘額不足，繼續充值</string>
     <string name="live_setting_gap_3">期限禁言</string>
     <string name="red_packet_list_title">紅包記錄</string>
@@ -1208,7 +1208,7 @@
     <string name="red_packet_user_tips2">攢人氣紅包</string>
     <string name="main_tabs_red_packet">紅包專區</string>
     <string name="save_popular_red_packets">攢人氣紅包</string>
-    <string name="red_packet_value">价值</string>
+    <string name="red_packet_value">價值</string>
     <string name="top_up_now">去充值></string>
     <string name="total_consumption_of_drill">共計消耗%s鑚</string>
     <string name="red_envelope_rill">紅包%s鑚/個</string>
@@ -1217,7 +1217,7 @@
     <string name="conditions">條件</string>
     <string name="drill">鑚</string>
     <string name="amount">金額</string>
-    <string name="range_range_is">范围区间为[%s]</string>
+    <string name="range_range_is">範圍區間為[%s]</string>
     <string name="red_packet_open">開</string>
     <string name="randomly_available">隨機可得</string>
     <string name="build_up_popularity">攢人氣</string>
@@ -1242,8 +1242,8 @@
     <string name="red_too_bad2">與紅包擦肩而過</string>
     <string name="check_out_your_luck">查看大家手氣</string>
     <string name="lucky_red_envelope">" %s 在 好運紅包 中抽到了 %s"</string>
-    <string name="lucky_red_envelope_amount">数量</string>
-    <string name="red_envelope_released_successfully">红包发布成功</string>
+    <string name="lucky_red_envelope_amount">數量</string>
+    <string name="red_envelope_released_successfully">紅包發布成功</string>
     <string name="me_edit_avatar_system">選擇系統頭像</string>
     <string name="me_edit_avatar_system_tip">該功能需升至Lv.5后使用，請努力升級吧~</string>
     <string name="main_anchor_live_notify_info">無論你在哪裏，我都在直播間等你~</string>
@@ -1259,7 +1259,7 @@
     <string name="unlit_icon">未點亮</string>
     <string name="all_service_champion">全服冠名</string>
     <string name="unlit_icon_hint">愛\“禮\”伊始，\“墻\”勢點亮  暫無點亮</string>
-    <string name="lit_icon_hint">暂无未点亮礼物哦</string>
+    <string name="lit_icon_hint">暫無未點亮禮物哦</string>
     <string name="instant_light">立即點亮</string>
     <string name="honorary_achievement">榮譽成就</string>
     <string name="lit_icon">已點亮</string>
@@ -1282,7 +1282,7 @@
     <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、100K、1M時，分別點亮對應的成就；</string>
     <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string>
     <string name="regular_bubble">規則</string>
-    <string name="unlit_icon_hint2">当前活动暂未送出任何礼物哦</string>
+    <string name="unlit_icon_hint2">當前活動暫未送出任何禮物哦</string>
     <string name="rule_introduction">規則介紹</string>
     <string name="gift_details_hint">禮物詳情</string>
     <string name="vacant_position_awaits">虛位以待</string>
@@ -1299,13 +1299,13 @@
     <string name="title_anchor">冠名主播：</string>
     <string name="the_title_financier">冠名金主：</string>
     <string name="the_title_financier2">冠名</string>
-    <string name="the_title_financier3">请输入自定义数量</string>
-    <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
+    <string name="the_title_financier3">請輸入自定義數量</string>
+    <string name="the__gifts_in_the_studio">請在直播間內進行送禮</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
-    <string name="sett_rigger">最低设置2种类型礼物才能触发心愿单特效礼物。</string>
-    <string name="cancel_ca">不再设置</string>
-    <string name="settings_ser">去设置</string>
+    <string name="sett_rigger">最低設置2種類型禮物才能觸發心愿單特效禮物。</string>
+    <string name="cancel_ca">不再設置</string>
+    <string name="settings_ser">去設置</string>
     <string name="too_many_gifts">重複添加禮物</string>
 
 

From bad2b3689acb21801c7d37b038474e5fa798bdad Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 9 Aug 2023 11:01:28 +0800
Subject: [PATCH 11/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/dialog_live_gift_popup.xml   |   1 +
 .../icon_live_gift_gift_itle_en.png              | Bin 0 -> 2454 bytes
 common/src/main/res/values-en-rUS/string.xml     |   2 +-
 common/src/main/res/values/strings.xml           |   2 +-
 .../com/yunbao/live/dialog/LiveGiftPopup.java    |   9 ++++++++-
 .../main/res/layout/dialog_new_guard_list.xml    |   4 ++--
 .../src/main/res/layout/dialog_new_live_user.xml |   2 +-
 7 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png

diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml
index 66284053c..a489f4994 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup.xml
@@ -53,6 +53,7 @@
                 android:gravity="center_vertical">
 
                 <ImageView
+                    android:id="@+id/gift_itle"
                     android:layout_width="54dp"
                     android:layout_height="13dp"
                     android:layout_marginStart="13dp"
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png b/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png
new file mode 100644
index 0000000000000000000000000000000000000000..83ea01880b3cb0483510bc27aa660bdd93121f71
GIT binary patch
literal 2454
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
U@ul#i_5c6?07*qoM6N<$f+IY{I{*Lx

literal 0
HcmV?d00001

diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 26b8c1dff..15df89771 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -176,7 +176,7 @@
     <string name="guard_guard">Guard</string>
     <string name="guard_week_con">Contribution this week</string>
     <string name="guard_no_data">anchor are waiting at your guard!</string>
-    <string name="guard_tip_0">Let\'s open up a guard for our favorite anchor</string>
+    <string name="guard_tip_0">Turn on the guard for your favorite anchor!</string>
     <string name="guard_tip_1">You are the current anchor\'s monthly guard \ n the guard date expires</string>
     <string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
     <string name="guard_gift_tip">Special gift for annual guard</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 7c77c20d7..8f022b06e 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -176,7 +176,7 @@
     <string name="guard_guard">Guard</string>
     <string name="guard_week_con">Contribution this week</string>
     <string name="guard_no_data">anchor are waiting at your guard!</string>
-    <string name="guard_tip_0">Let\'s open up a guard for our favorite anchor</string>
+    <string name="guard_tip_0">Turn on the guard for your favorite anchor!</string>
     <string name="guard_tip_1">You are the current anchor\'s monthly guard \ n the guard date expires</string>
     <string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
     <string name="guard_gift_tip">Special gift for annual guard</string>
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 d3c6bcdf3..f071d7058 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -89,12 +89,13 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * 直播间新送礼弹窗
  */
 public class LiveGiftPopup extends AbsDialogFragment {
-    private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar;
+    private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar, giftItle;
     private JSONArray liveGiftList;
     private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber;
     private RecyclerView giftTitle;
@@ -163,6 +164,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
         vipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc);
         vipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle);
         giftNumber = mRootView.findViewById(R.id.gift_number);
+        giftItle = mRootView.findViewById(R.id.gift_itle);
         liveGiftSend = mRootView.findViewById(R.id.live_gift_send);
         giftNumberLayout = mRootView.findViewById(R.id.gift_number_layout);
         mLianText = mRootView.findViewById(R.id.lian_text);
@@ -317,6 +319,11 @@ public class LiveGiftPopup extends AbsDialogFragment {
                 fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
             }
         });
+        if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+            ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle, giftItle);
+        } else {
+            ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle_en, giftItle);
+        }
     }
 
     private void initDate() {
diff --git a/live/src/main/res/layout/dialog_new_guard_list.xml b/live/src/main/res/layout/dialog_new_guard_list.xml
index 981a39668..75ca884bc 100644
--- a/live/src/main/res/layout/dialog_new_guard_list.xml
+++ b/live/src/main/res/layout/dialog_new_guard_list.xml
@@ -133,7 +133,7 @@
                         android:scrollHorizontally="true"
                         android:singleLine="true"
                         android:textColor="#A281FD"
-                        android:textSize="14sp" />
+                        android:textSize="11sp" />
 
                     <com.yunbao.common.views.weight.MarqueeTextView
                         android:id="@+id/guard_tip2"
@@ -151,7 +151,7 @@
                         android:scrollHorizontally="true"
                         android:singleLine="true"
                         android:textColor="#A281FD"
-                        android:textSize="14sp"
+                        android:textSize="11sp"
                         android:visibility="gone" />
                 </LinearLayout>
 
diff --git a/live/src/main/res/layout/dialog_new_live_user.xml b/live/src/main/res/layout/dialog_new_live_user.xml
index 505984def..62162d177 100644
--- a/live/src/main/res/layout/dialog_new_live_user.xml
+++ b/live/src/main/res/layout/dialog_new_live_user.xml
@@ -71,7 +71,7 @@
                 android:layout_marginStart="1dp"
                 android:text="@string/user_card_guard"
                 android:textColor="#FFFFFF"
-                android:textSize="12sp" />
+                android:textSize="10sp" />
 
             <ImageView
                 android:id="@+id/imageView4"

From 7bca817633989dd377dbaeef3372afb01341289f Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 9 Aug 2023 13:31:31 +0800
Subject: [PATCH 12/13] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/activity/LiveRyAnchorActivity.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
index 5ac18d0af..da661857c 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
@@ -79,6 +79,7 @@ import com.yunbao.live.bean.LiveGuardInfo;
 import com.yunbao.live.bean.LiveKsyConfigBean;
 import com.yunbao.live.bean.LiveReceiveGiftBean;
 import com.yunbao.live.dialog.FreePkDialogFragment;
+import com.yunbao.live.dialog.LiveInputDialogFragment;
 import com.yunbao.live.dialog.LiveNewFunctionDialogFragment;
 import com.yunbao.live.dialog.LivePrankDialogFragment;
 import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
@@ -1661,6 +1662,22 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                     mLiveRoomViewHolder.showGiftWall(event.getUid(),event.isVoicePress(),event.getUname(),event.getAvatar());
                 }
                 break;
+            case INPUT_DIALOG:
+                LiveInputDialogFragment liveInputDialogFragment = new LiveInputDialogFragment();
+                Bundle liveInputBundle = new Bundle();
+                liveInputBundle.putString(Constants.LIVE_DANMU_PRICE, mDanmuPrice);
+                liveInputBundle.putString(Constants.COIN_NAME, mCoinName);
+                liveInputBundle.putString(Constants.LIVE_UID, mLiveUid);
+                liveInputBundle.putString(Constants.LIVE_STREAM, mStream);
+                liveInputBundle.putString(Constants.LIVE_UID, mLiveUid);
+                if (event.getOlineUserlistModel() == null) {
+                    liveInputBundle.putString("TagUser", "");
+                } else {
+                    liveInputBundle.putString("TagUser", GsonUtils.toJson(event.getOlineUserlistModel()));
+                }
+                liveInputDialogFragment.setArguments(liveInputBundle);
+                liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
+                break;
         }
     }
     @Subscribe(threadMode = ThreadMode.MAIN)

From d07439efcfadf6c51a635db0068b8d83dec4064d Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 9 Aug 2023 13:53:16 +0800
Subject: [PATCH 13/13] =?UTF-8?q?update=20=E4=B8=BB=E6=92=AD=E7=AB=AF?=
 =?UTF-8?q?=E7=82=B9=E7=A4=BC=E7=89=A9=E5=A2=99=E6=8C=89=E9=92=AE=E7=BD=AE?=
 =?UTF-8?q?=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../background_skip_unselect_button.png         | Bin 0 -> 15028 bytes
 .../yunbao/live/dialog/GiftWallItemPopup.java   |  11 +++++++++++
 .../live/views/GiftAlreadyWallFragment.java     |   7 +++++++
 3 files changed, 18 insertions(+)
 create mode 100644 common/src/main/res/drawable/background_skip_unselect_button.png

diff --git a/common/src/main/res/drawable/background_skip_unselect_button.png b/common/src/main/res/drawable/background_skip_unselect_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b0bb68b78852fd8aaa4cd6a134d2ffaa8faf8f6
GIT binary patch
literal 15028
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%0AT7vD|>33R#f$MKu<
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
IE3?r51D`2+2mk;8

literal 0
HcmV?d00001

diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
index e0c8e79dd..e07a3d1a3 100644
--- a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
@@ -2,6 +2,7 @@ package com.yunbao.live.dialog;
 
 
 import android.content.Context;
+import android.graphics.Color;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -9,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 
 import com.lxj.xpopup.core.CenterPopupView;
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallModel;
@@ -28,6 +30,7 @@ public class GiftWallItemPopup extends CenterPopupView {
     private GiftWallModel giftWallModel;
     private boolean unlit;
     private String mLiveUid, mStream;
+    private boolean isAnchor = false;
 
     public GiftWallItemPopup(@NonNull Context context, GiftWallModel giftWallModel,
                              boolean unlit, String mLiveUid, String mStream) {
@@ -36,6 +39,9 @@ public class GiftWallItemPopup extends CenterPopupView {
         this.unlit = unlit;
         this.mLiveUid = mLiveUid;
         this.mStream = mStream;
+        if (this.mLiveUid.equals(CommonAppConfig.getInstance().getUid())) {
+            isAnchor = true;
+        }
     }
 
     @Override
@@ -60,6 +66,11 @@ public class GiftWallItemPopup extends CenterPopupView {
         } else {
             giftDetailsBtn.setText(getContext().getText(R.string.instant_light));
         }
+        if(isAnchor){
+            giftDetailsBtn.setBackgroundResource(R.drawable.background_skip_unselect_button);
+            giftDetailsBtn.setEnabled(false);
+            giftDetailsBtn.setTextColor(Color.parseColor("#F2F2F2"));
+        }
         ImgLoader.display(getContext(), giftWallModel.getGifticon(), giftImg);
         giftDetails.setText(giftWallModel.getGiftname());
         price.setText(giftWallModel.getNeedcoin());
diff --git a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
index 0eb6d30d1..060ab069a 100644
--- a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
+++ b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
@@ -1,5 +1,6 @@
 package com.yunbao.live.views;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -11,6 +12,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.adapter.GiftAlreadyWallAdapter;
 import com.yunbao.common.bean.GiftAlreadyWallModel;
@@ -60,6 +62,11 @@ public class GiftAlreadyWallFragment extends BaseFragment {
         alreadyWallAdapter = new GiftAlreadyWallAdapter();
         alreadyList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false));
         alreadyList.setAdapter(alreadyWallAdapter);
+        if(mLiveUid.equals(CommonAppConfig.getInstance().getUid())){
+            instantLight.setBackgroundResource(R.drawable.background_skip_unselect_button);
+            instantLight.setEnabled(false);
+            instantLight.setTextColor(Color.parseColor("#F2F2F2"));
+        }
         if (isAnchor) {
             unlitIconHint.setText(getContext().getString(R.string.unlit_icon_hint));
         } else {