From 132441225022841ea71121288418b9f142c7d12b Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 14 Dec 2023 10:20:47 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=9A=82=E4=B8=94=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=88=BF=E9=97=B4banner=E4=B8=AD=E7=9A=84=E9=A6=96?= =?UTF-8?q?=E5=85=85=E7=AD=89=E5=8E=9F=E7=94=9F=E5=85=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=B1=95=E7=A4=BAH5=E8=B5=84=E6=BA=90=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/presenter/HomePartyPresenter.java | 32 +++++++++---------- .../avroom/presenter/SingleRoomPresenter.java | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyPresenter.java index 00b3584a7..05f2231e7 100644 --- a/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/HomePartyPresenter.java @@ -303,18 +303,18 @@ public class HomePartyPresenter extends BaseRoomPresenter { mAvRoomModel.getRoomBanner() .compose(bindToLifecycle()) .subscribe(bannerInfos -> { - final boolean firstCharge = UserUtils.getUserInfo().isFirstCharge(); +// final boolean firstCharge = UserUtils.getUserInfo().isFirstCharge(); if (GoldBoxHelper.needIntegrateBoxEntrance()) { - if (firstCharge) { - BannerInfo bannerInfo = new BannerInfo(); - bannerInfo.setFirstCharge(true); - bannerInfos.add(0, bannerInfo); - } - if (GoldBoxHelper.isShowRadish()) { - BannerInfo bannerInfo = new BannerInfo(); - bannerInfo.setRadish(true); - bannerInfos.add(firstCharge ? 1 : 0, bannerInfo); - } +// if (firstCharge) { +// BannerInfo bannerInfo = new BannerInfo(); +// bannerInfo.setFirstCharge(true); +// bannerInfos.add(0, bannerInfo); +// } +// if (GoldBoxHelper.isShowRadish()) { +// BannerInfo bannerInfo = new BannerInfo(); +// bannerInfo.setRadish(true); +// bannerInfos.add(firstCharge ? 1 : 0, bannerInfo); +// } getMvpView().onShowBanner(bannerInfos); // GoldBoxHelper.isHideBox() // .subscribe(isHide -> { @@ -334,11 +334,11 @@ public class HomePartyPresenter extends BaseRoomPresenter { // bannerInfo.setFairy(true); // bannerInfos.add(0, bannerInfo); // } - if (firstCharge) { - BannerInfo bannerInfo = new BannerInfo(); - bannerInfo.setFirstCharge(true); - bannerInfos.add(0, bannerInfo); - } +// if (firstCharge) { +// BannerInfo bannerInfo = new BannerInfo(); +// bannerInfo.setFirstCharge(true); +// bannerInfos.add(0, bannerInfo); +// } getMvpView().onShowBanner(bannerInfos); } }); diff --git a/app/src/main/java/com/chwl/app/avroom/presenter/SingleRoomPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/SingleRoomPresenter.java index b9e26dbd8..856376240 100644 --- a/app/src/main/java/com/chwl/app/avroom/presenter/SingleRoomPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/SingleRoomPresenter.java @@ -21,18 +21,18 @@ public class SingleRoomPresenter extends BaseRoomPresenter { mAvRoomModel.getRoomBanner() .compose(bindToLifecycle()) .subscribe(bannerInfos -> { - final boolean firstCharge = UserUtils.getUserInfo().isFirstCharge(); +// final boolean firstCharge = UserUtils.getUserInfo().isFirstCharge(); if (GoldBoxHelper.needIntegrateBoxEntrance()) { - if (firstCharge) { - BannerInfo bannerInfo = new BannerInfo(); - bannerInfo.setFirstCharge(true); - bannerInfos.add(0, bannerInfo); - } - if (GoldBoxHelper.isShowRadish()) { - BannerInfo bannerInfo = new BannerInfo(); - bannerInfo.setRadish(true); - bannerInfos.add(firstCharge ? 1 : 0, bannerInfo); - } +// if (firstCharge) { +// BannerInfo bannerInfo = new BannerInfo(); +// bannerInfo.setFirstCharge(true); +// bannerInfos.add(0, bannerInfo); +// } +// if (GoldBoxHelper.isShowRadish()) { +// BannerInfo bannerInfo = new BannerInfo(); +// bannerInfo.setRadish(true); +// bannerInfos.add(firstCharge ? 1 : 0, bannerInfo); +// } getMvpView().onShowBanner(bannerInfos); // GoldBoxHelper.isHideBox() // .subscribe(isHide -> { @@ -52,11 +52,11 @@ public class SingleRoomPresenter extends BaseRoomPresenter { // bannerInfo.setFairy(true); // bannerInfos.add(0, bannerInfo); // } - if (firstCharge) { - BannerInfo bannerInfo = new BannerInfo(); - bannerInfo.setFirstCharge(true); - bannerInfos.add(0, bannerInfo); - } +// if (firstCharge) { +// BannerInfo bannerInfo = new BannerInfo(); +// bannerInfo.setFirstCharge(true); +// bannerInfos.add(0, bannerInfo); +// } getMvpView().onShowBanner(bannerInfos); } });