From 67aff3b8c4e0190264a5a2def3fa5ee941bd9f1f Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 22 Dec 2021 16:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A0=B8=E8=9B=8B=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/HomePartyRoomFragment.java | 23 +----------- .../erban/home/adapter/RoomActAdapter.java | 37 +------------------ .../treasure_box/widget/GoldBoxHelper.java | 37 ++++++++++++++++++- 3 files changed, 37 insertions(+), 60 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index 14ad234fa..20590eabb 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -1491,28 +1491,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment { - if (type == 0) {// 幸运许愿池（默认） - TreasureBoxActivity.start(getActivity()); - } else if (type == 1) {// 梦幻许愿池 - TreasureBoxHonourActivity.start(getActivity()); - } - if (AvRoomDataManager.get().isCpRoom()) { - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_CP_ROOM_SMASH_EGG_CLICK, "砸蛋入口"); - } else - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_MP_ROOM_SMASH_EGG_CLICK, "砸蛋入口"); - }); - chooseTreasureBoxDialogFragment.show(getFragmentManager(), "chooseTreasureBoxDialogFragment"); - } else { - TreasureBoxActivity.start(getActivity()); - } + GoldBoxHelper.handleBoxClick(mContext); } @SuppressLint("CheckResult") diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java index fdc7a263b..4d76957d5 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java @@ -7,24 +7,17 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import androidx.fragment.app.FragmentActivity; - import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog; -import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity; -import com.yizhuan.erban.treasure_box.activity.TreasureBoxHonourActivity; -import com.yizhuan.erban.treasure_box.fragment.ChooseTreasureBoxDialogFragment; import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter; import com.yizhuan.erban.utils.CommonJumpHelper; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.TimeUtils; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import java.util.List; @@ -63,7 +56,7 @@ public class RoomActAdapter extends StaticPagerAdapter { if (bannerInfo.isFirstCharge()) { FirstChargeDialog.start(mContext); } else if (bannerInfo.isBox()) { - onClickBox(); + GoldBoxHelper.handleBoxClick(mContext); } if (TextUtils.isEmpty(url)) return; @@ -107,34 +100,6 @@ public class RoomActAdapter extends StaticPagerAdapter { this.listener = listener; } - /** - * 房间许愿池 - */ - public void onClickBox() { - - String openTime = GoldBoxHelper.getBoxOpenTime(); - int startTime = Integer.parseInt(openTime.substring(0, openTime.indexOf("-")).replace(":", "")); - int endTime = Integer.parseInt(openTime.substring(openTime.indexOf("-") + 1).replace(":", "")); - - if (startTime != endTime && TimeUtils.getTimeLimit(startTime, endTime)) { - ChooseTreasureBoxDialogFragment chooseTreasureBoxDialogFragment = new ChooseTreasureBoxDialogFragment(GoldBoxHelper.getBoxOpenTime()); - chooseTreasureBoxDialogFragment.setOnTreasureBoxChooseListener(type -> { - if (type == 0) {// 幸运许愿池（默认） - TreasureBoxActivity.start(mContext); - } else if (type == 1) {// 梦幻许愿池 - TreasureBoxHonourActivity.start(mContext); - } - if (AvRoomDataManager.get().isCpRoom()) { - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_CP_ROOM_SMASH_EGG_CLICK, "砸蛋入口"); - } else - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_MP_ROOM_SMASH_EGG_CLICK, "砸蛋入口"); - }); - chooseTreasureBoxDialogFragment.show(((FragmentActivity) mContext).getSupportFragmentManager(), "chooseTreasureBoxDialogFragment"); - } else { - TreasureBoxActivity.start(mContext); - } - } - public interface RoomActClickListener { void onWebClick(String url); } diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java index 1b16479b8..c25ce5326 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java @@ -1,13 +1,22 @@ package com.yizhuan.erban.treasure_box.widget; +import android.content.Context; + +import androidx.fragment.app.FragmentActivity; + +import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity; +import com.yizhuan.erban.treasure_box.activity.TreasureBoxHonourActivity; +import com.yizhuan.erban.treasure_box.fragment.ChooseTreasureBoxDialogFragment; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.level.UserLevelVo; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; +import com.yizhuan.xchat_android_core.statistic.StatisticManager; +import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.yizhuan.xchat_android_library.utils.TimeUtils; import io.reactivex.Single; @@ -32,6 +41,30 @@ public class GoldBoxHelper { }); } + public static void handleBoxClick(Context context) { + String openTime = GoldBoxHelper.getBoxOpenTime(); + int startTime = Integer.parseInt(openTime.substring(0, openTime.indexOf("-")).replace(":", "")); + int endTime = Integer.parseInt(openTime.substring(openTime.indexOf("-") + 1).replace(":", "")); + + if (startTime != endTime && TimeUtils.getTimeLimit(startTime, endTime)) { + ChooseTreasureBoxDialogFragment chooseTreasureBoxDialogFragment = new ChooseTreasureBoxDialogFragment(GoldBoxHelper.getBoxOpenTime()); + chooseTreasureBoxDialogFragment.setOnTreasureBoxChooseListener(type -> { + if (type == 0) {// 幸运许愿池（默认） + TreasureBoxActivity.start(context); + } else if (type == 1) {// 梦幻许愿池 + TreasureBoxHonourActivity.start(context); + } + if (AvRoomDataManager.get().isCpRoom()) { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_CP_ROOM_SMASH_EGG_CLICK, "砸蛋入口"); + } else + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_MP_ROOM_SMASH_EGG_CLICK, "砸蛋入口"); + }); + chooseTreasureBoxDialogFragment.show(((FragmentActivity) context).getSupportFragmentManager(), "chooseTreasureBoxDialogFragment"); + } else { + TreasureBoxActivity.start(context); + } + } + public static boolean isShowDiamondBox() { return AvRoomDataManager.get().mBoxSwitchVo.isDiamondBoxSwitch(); } @@ -40,7 +73,7 @@ public class GoldBoxHelper { return AvRoomDataManager.get().mBoxSwitchVo.getOpenBoxIcon(); } - public static String getBoxOpenTime(){ + public static String getBoxOpenTime() { return AvRoomDataManager.get().mBoxSwitchVo.getDiamondBoxOpenTime(); }