yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复在直播间内跳转自己的直播间问题

Browse Source
This commit is contained in:
18401019693 2023-09-11 10:29:16 +08:00
parent 406c67bf3a
commit 7ca8694aed
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.gradle
View File

@ -9,9 +9,9 @@ ext {
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
serverHost : "https://napi.yaoulive.com", // serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
// serverHost : " https://ceshi.yaoulive.com", serverHost : " https://ceshi.yaoulive.com",
@ -22,9 +22,9 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false // true表示谷歌支付 false
isGooglePlay : true, isGooglePlay : false,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,
//是否打包成插件包模式 //是否打包成插件包模式
isPluginModel : false, ] isPluginModel : true, ]
} }

11
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@ -2,6 +2,7 @@ package com.yunbao.live.dialog;
import static com.yunbao.common.CommonAppConfig.isGetNewWrap; import static com.yunbao.common.CommonAppConfig.isGetNewWrap;
import static com.yunbao.common.utils.RouteUtil.PATH_COIN; import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
import static com.yunbao.live.views.LiveRoomViewHolder.bean1;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Dialog; import android.app.Dialog;
@ -447,6 +448,16 @@ public class LiveGiftPopup extends AbsDialogFragment {
GiftTopBean giftTopBean = new GiftTopBean(); GiftTopBean giftTopBean = new GiftTopBean();
giftTopBean.setName(data.getString("name")); giftTopBean.setName(data.getString("name"));
name.add(giftTopBean); 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); giftTitleAdapter.addAllData(name);
if (!TextUtils.isEmpty(mWishGiftId) && liveGiftList.size() > 0) { if (!TextUtils.isEmpty(mWishGiftId) && liveGiftList.size() > 0) {