From 7ca8694aedf069a70b8919338b06e3c0863ec534 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Mon, 11 Sep 2023 10:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E9=97=B4=E5=86=85=E8=B7=B3=E8=BD=AC=E8=87=AA=E5=B7=B1=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                         | 10 +++++-----
 .../java/com/yunbao/live/dialog/LiveGiftPopup.java    | 11 +++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/config.gradle b/config.gradle
index 71e56fb63..3e1349d45 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-            serverHost       : "https://napi.yaoulive.com",
-//            测试
-//            serverHost       : " https://ceshi.yaoulive.com",
+//            serverHost       : "https://napi.yaoulive.com",
+//             测试
+            serverHost       : " https://ceshi.yaoulive.com",
 
 
 
@@ -22,9 +22,9 @@ ext {
 
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
-            isGooglePlay     :  true,
+            isGooglePlay     :  false,
             //是否上报异常日志
             isUploadLog      :  true,
             //是否打包成插件包模式
-            isPluginModel    :  false,    ]
+            isPluginModel    :  true,    ]
 }
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 403cbea4a..beaaf7759 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -2,6 +2,7 @@ package com.yunbao.live.dialog;
 
 import static com.yunbao.common.CommonAppConfig.isGetNewWrap;
 import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
+import static com.yunbao.live.views.LiveRoomViewHolder.bean1;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
@@ -447,6 +448,16 @@ public class LiveGiftPopup extends AbsDialogFragment {
             GiftTopBean giftTopBean = new GiftTopBean();
             giftTopBean.setName(data.getString("name"));
             name.add(giftTopBean);
+            if (bean1 != null && IMLoginManager.get(mContext).isNewUserGif() && (data.getString("name").equals("熱門") || data.getString("name").equals("Hot"))) {
+                String giftJson = data.getString("giftlist");
+                List<LiveGiftBean> liveGiftBeans = JSONArray.parseArray(giftJson, LiveGiftBean.class);
+                liveGiftBeans.add(0, bean1);
+                if (mWishGiftId == null) {
+                    mWishGiftId = "" + bean1.getId();
+                }
+                liveGiftList.getJSONObject(i).put("giftlist", JSONArray.toJSONString(liveGiftBeans));
+            }
+
         }
         giftTitleAdapter.addAllData(name);
         if (!TextUtils.isEmpty(mWishGiftId) && liveGiftList.size() > 0) {