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

调整测试反馈内容：【从用户的个人信息界面进入全站展馆本期角逐页面，查看周星礼物应该调用 Gift.liveGiftHallDetail】

Browse Source 
调整测试反馈内容：【从banner进周星榜 退出 一直显示加载中怎么回事】
调整测试反馈内容：【包裹冠名礼物送出id丢失】
This commit is contained in:
zlzw 2024-08-06 10:40:39 +08:00
parent 3349b2d7df
commit abc37aa486
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
View File

@ -277,7 +277,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
void initData() { void initData() {
adapter.setList_type(list_type); adapter.setList_type(list_type);
if (isAnchor) { if (isAnchor || (isTab2Enter && isStar)) {
if (isStar) { if (isStar) {
gift_hall_type = 2; gift_hall_type = 2;
} else { } else {

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

@ -839,6 +839,8 @@ public class LiveGiftPopup extends AbsDialogFragment {
boolean isPageGift = liveGiftModel.isPageGift(); boolean isPageGift = liveGiftModel.isPageGift();
liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class); liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class);
liveGiftModel.setPageGift(isPageGift); liveGiftModel.setPageGift(isPageGift);
liveGiftModel.setGift_id(giftId);
liveGiftModel.setId(giftId);
if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) && if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) &&
!TextUtils.isEmpty(liveGiftModel.getNamingUid()) && !TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
!TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") && !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&

5
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@ -470,8 +470,11 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
} else if ("home_page_banner_battle".equals(link)) { } else if ("home_page_banner_battle".equals(link)) {
RouteUtil.forwardBattlePass(); RouteUtil.forwardBattlePass();
} else if ("home_page_banner_giftwall".equals(link)) { } else if ("home_page_banner_giftwall".equals(link)) {
if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing()) {
mShowLoadingDialog.dismiss();
}
new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "", new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null
, false).setFullWindows(true).setTab2(true).showDialog(); , false).setFullWindows(true).setTab2(true).showDialog();
} else { } else {
gotoLive(link); gotoLive(link);