From abc37aa48680610a452b84d127630dccb84d8550 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Tue, 6 Aug 2024 10:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=86=85=E5=AE=B9=EF=BC=9A=E3=80=90=E4=BB=8E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=BF=9B=E5=85=A5=E5=85=A8=E7=AB=99=E5=B1=95=E9=A6=86?= =?UTF-8?q?=E6=9C=AC=E6=9C=9F=E8=A7=92=E9=80=90=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=91=A8=E6=98=9F=E7=A4=BC=E7=89=A9=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E8=B0=83=E7=94=A8=20Gift.liveGiftHallDetail=E3=80=91?= =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=9A=E3=80=90=E4=BB=8Ebanner=E8=BF=9B?= =?UTF-8?q?=E5=91=A8=E6=98=9F=E6=A6=9C=20=E9=80=80=E5=87=BA=20=E4=B8=80?= =?UTF-8?q?=E7=9B=B4=E6=98=BE=E7=A4=BA=E5=8A=A0=E8=BD=BD=E4=B8=AD=E6=80=8E?= =?UTF-8?q?=E4=B9=88=E5=9B=9E=E4=BA=8B=E3=80=91=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=8D=E9=A6=88=E5=86=85=E5=AE=B9=EF=BC=9A?= =?UTF-8?q?=E3=80=90=E5=8C=85=E8=A3=B9=E5=86=A0=E5=90=8D=E7=A4=BC=E7=89=A9?= =?UTF-8?q?=E9=80=81=E5=87=BAid=E4=B8=A2=E5=A4=B1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/dialog/GiftWallGiftInfoDialog.java | 2 +- live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java | 2 ++ .../java/com/yunbao/main/views/MainHomeLiveViewHolder.java | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java index 6b554682f..3ca287050 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java @@ -277,7 +277,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow { void initData() { adapter.setList_type(list_type); - if (isAnchor) { + if (isAnchor || (isTab2Enter && isStar)) { if (isStar) { gift_hall_type = 2; } else { 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 f62688e2d..18642bc1d 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -839,6 +839,8 @@ public class LiveGiftPopup extends AbsDialogFragment { boolean isPageGift = liveGiftModel.isPageGift(); liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class); liveGiftModel.setPageGift(isPageGift); + liveGiftModel.setGift_id(giftId); + liveGiftModel.setId(giftId); if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) && !TextUtils.isEmpty(liveGiftModel.getNamingUid()) && !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") && diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java index 81304ff53..1fe92a305 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java @@ -470,8 +470,11 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement } else if ("home_page_banner_battle".equals(link)) { RouteUtil.forwardBattlePass(); } else if ("home_page_banner_giftwall".equals(link)) { + if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing()) { + mShowLoadingDialog.dismiss(); + } 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(); } else { gotoLive(link);