diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt index 8e744757b..bd1b1a735 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt @@ -464,65 +464,6 @@ open class BaseRoomFragment?> : } } - fun initRoomAct( - rollPagerView: RollPagerView, - dialogInfo: List, - bottomDp: Float = 0f - ) { - if (!ListUtils.isListEmpty(dialogInfo)) { - rollPagerView.visibility = View.VISIBLE - // 只有一個圖標，隱藏底部指示器 - val show = dialogInfo.size > 1 - rollPagerView.setHintView(object : ColorPointHintView( - mContext, Color.WHITE, ContextCompat.getColor( - mContext, - R.color.color_66FFFFFF - ) - ) { - override fun makeFocusDrawable(): Drawable? { - val dotFocus = GradientDrawable() - dotFocus.setColor(Color.WHITE) - dotFocus.cornerRadius = Util.dip2px( - context, 2f - ).toFloat() - dotFocus.setSize( - Util.dip2px(context, 9f), Util.dip2px( - context, 4f - ) - ) - return if (show) dotFocus else null - } - - override fun makeNormalDrawable(): Drawable? { - val dotNormal = GradientDrawable() - dotNormal.setColor(ContextCompat.getColor(mContext, R.color.color_66FFFFFF)) - dotNormal.cornerRadius = Util.dip2px( - context, 2f - ).toFloat() - dotNormal.setSize( - Util.dip2px(context, 4f), Util.dip2px( - context, 4f - ) - ) - return if (show) dotNormal else null - } - }) - val bannerAdapter = RoomActAdapter(mContext, dialogInfo) - rollPagerView.adapter = bannerAdapter - rollPagerView.setPlayDelay(3000) - //設置透明度 - rollPagerView.setAnimationDurtion(500) - bannerAdapter.notifyDataSetChanged() - - // 模擬指示器在viewpager底部效果 - val viewPager = rollPagerView.viewPager - viewPager.offscreenPageLimit = dialogInfo.size - val layoutParams = viewPager.layoutParams as RelativeLayout.LayoutParams - layoutParams.setMargins(0, 0, 0, UIUtil.dip2px(mContext, bottomDp.toDouble())) - viewPager.layoutParams = layoutParams - } - } - private fun releaseView() { roomFreeGiftDialog?.dismiss() messageView.release() diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt index 61687ff8b..5c030aaa7 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt @@ -78,7 +78,6 @@ class GameRoomFragment : BaseRoomFragment(), //游戏模式暂时不需要这个 PlayerModel.get().stop() gameBinding.roomInfo = AvRoomDataManager.get().mCurrentRoomInfo - mvpPresenter?.getBannerList() gameBinding.tvShowMiniMic.setOnClickListener { showMiniMic() } gameBinding.ivShowMic.setOnClickListener { showMic() } } @@ -150,10 +149,6 @@ class GameRoomFragment : BaseRoomFragment(), } } - override fun onShowBanner(dialogInfos: List) { - initRoomAct(gameBinding.activityImg, dialogInfos) - } - @Subscribe(threadMode = ThreadMode.MAIN) fun onFinishAvRoomEvent(event: FinishAvRoomEvent) { gameDelegate.exitGame() diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java index ae1afb036..9306047e0 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java @@ -8,7 +8,6 @@ import android.view.View; import androidx.databinding.DataBindingUtil; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.netease.nim.uikit.support.glide.GlideApp; import com.trello.rxlifecycle3.android.FragmentEvent; import com.chwl.app.R; import com.chwl.app.avroom.activity.AVRoomActivity; @@ -32,9 +31,7 @@ import com.chwl.app.avroom.widget.PKBoardView; import com.chwl.app.base.BaseMvpActivity; import com.chwl.app.common.widget.dialog.DialogManager; import com.chwl.app.databinding.FragmentAvRoomGameBinding; -import com.chwl.app.treasure_box.widget.GoldBoxHelper; import com.chwl.app.ui.webview.DatingRuleWebViewActivity; -import com.chwl.app.ui.webview.DialogWebViewActivity; import com.chwl.app.utils.UserUtils; import com.chwl.core.Constants; import com.chwl.core.UriProvider; @@ -67,7 +64,6 @@ import com.chwl.library.utils.ResUtil; import com.chwl.library.utils.SingleToastUtil; import com.chwl.library.utils.TimeUtils; import com.chwl.library.utils.UIUtils; -import com.chwl.library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -151,17 +147,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment { -// if (userInfo.isFirstCharge()) { -// gameBinding.ivFirstChargeEnter.setVisibility(View.VISIBLE); -// } -// }); -// } - } @Override @@ -966,12 +951,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment bannerInfos) { - initRoomAct(gameBinding.activityImg, bannerInfos, 11f); - } - - @Subscribe(threadMode = ThreadMode.MAIN) public void onFirstRechargeEvent(FirstChargeEvent event) { gameBinding.ivFirstChargeEnter.setVisibility(View.GONE); diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt index cc9f84581..85ca5db3a 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt @@ -25,14 +25,11 @@ import com.chwl.app.databinding.FragmentSingleRoomBinding import com.chwl.app.fansteam.FansTeamJoinActivity import com.chwl.app.fansteam.FansTeamJoinedActivity import com.chwl.app.fansteam.FansTeamViewModel -import com.chwl.app.treasure_box.widget.GoldBoxHelper -import com.chwl.app.ui.utils.load import com.chwl.app.ui.webview.CommonWebViewActivity import com.chwl.app.ui.webview.DialogWebViewActivity import com.chwl.core.UriProvider import com.chwl.core.auth.AuthModel import com.chwl.core.fansteam.FansTeamInitInfo -import com.chwl.core.home.bean.BannerInfo import com.chwl.core.im.custom.bean.FansTeamMsgAttachment import com.chwl.core.im.custom.bean.RequestUpmicAttachment import com.chwl.core.im.custom.bean.RoomPKAttachment @@ -83,24 +80,7 @@ class SingleRoomFragment : BaseRoomFragment) { - initRoomAct(gameBinding.activityImg, dialogInfos, 10f) - } - @Subscribe(threadMode = ThreadMode.MAIN) fun onFirstRechargeEvent(event: FirstChargeEvent) { gameBinding.ivFirstChargeEnter.visibility = View.GONE diff --git a/app/src/main/java/com/chwl/app/avroom/presenter/GameRoomPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/GameRoomPresenter.java index 1324339e8..a65eee0ea 100644 --- a/app/src/main/java/com/chwl/app/avroom/presenter/GameRoomPresenter.java +++ b/app/src/main/java/com/chwl/app/avroom/presenter/GameRoomPresenter.java @@ -1,15 +1,7 @@ package com.chwl.app.avroom.presenter; -import android.annotation.SuppressLint; import com.chwl.app.avroom.view.IGameRoomView; -import com.chwl.app.treasure_box.widget.GoldBoxHelper; -import com.chwl.app.utils.UserUtils; -import com.chwl.core.home.bean.BannerInfo; -import com.chwl.core.room.model.AvRoomModel; - -import java.util.ArrayList; -import java.util.List; /** @@ -19,39 +11,4 @@ import java.util.List; * @date 2017/12/8 */ public class GameRoomPresenter extends BaseRoomPresenter { - - @SuppressLint("CheckResult") - public void getBannerList() { - AvRoomModel.get().getRoomBanner() - .compose(bindToLifecycle()) - .subscribe(bannerInfos -> { - if (bannerInfos == null) bannerInfos = new ArrayList<>(); - final boolean firstCharge = UserUtils.getUserInfo().isFirstCharge(); - if (firstCharge) { - BannerInfo bannerInfo = new BannerInfo(); - bannerInfo.setFirstCharge(true); - bannerInfos.add(0, bannerInfo); - } -// if(GoldBoxHelper.isShowFairy()){ -// BannerInfo bannerInfo = new BannerInfo(); -// bannerInfo.setFairy(true); -// bannerInfos.add(firstCharge ? 1 : 0, bannerInfo); -// } - List finalBannerInfos = bannerInfos; - getMvpView().onShowBanner(finalBannerInfos); -// GoldBoxHelper.isHideBox() -// .subscribe(isHide -> { -// if (!isHide) { -// BannerInfo bannerInfo = new BannerInfo(); -// bannerInfo.setBox(true); -// int index = 0; -// if (firstCharge) index++; -// if (GoldBoxHelper.isShowFairy()) index++; -// finalBannerInfos.add(index, bannerInfo); -// } -// getMvpView().onShowBanner(finalBannerInfos); -// }, throwable -> getMvpView().onShowBanner(finalBannerInfos)); - }); - } - } 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..8123f1cc7 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 @@ -297,50 +297,4 @@ public class HomePartyPresenter extends BaseRoomPresenter { .subscribe(s -> SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_presenter_homepartypresenter_01)) , e -> SingleToastUtil.showToast(e.getMessage())); } - - @SuppressLint("CheckResult") - public void getBannerList() { - mAvRoomModel.getRoomBanner() - .compose(bindToLifecycle()) - .subscribe(bannerInfos -> { - 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); - } - getMvpView().onShowBanner(bannerInfos); -// GoldBoxHelper.isHideBox() -// .subscribe(isHide -> { -// if (!isHide) { -// BannerInfo bannerInfo = new BannerInfo(); -// bannerInfo.setBox(true); -// int index = 0; -// if (firstCharge) index++; -// if (GoldBoxHelper.isShowRadish()) index++; -// bannerInfos.add(index, bannerInfo); -// } -// getMvpView().onShowBanner(bannerInfos); -// }, throwable -> getMvpView().onShowBanner(bannerInfos)); - } else { -// if(GoldBoxHelper.isShowFairy()){ -// BannerInfo bannerInfo = new BannerInfo(); -// bannerInfo.setFairy(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 04da1282c..e6995ec81 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 @@ -1,11 +1,7 @@ package com.chwl.app.avroom.presenter; -import android.annotation.SuppressLint; import com.chwl.app.avroom.view.ISingleRoomView; -import com.chwl.app.treasure_box.widget.GoldBoxHelper; -import com.chwl.app.utils.UserUtils; -import com.chwl.core.home.bean.BannerInfo; /** *

@@ -15,50 +11,4 @@ import com.chwl.core.home.bean.BannerInfo; */ public class SingleRoomPresenter extends BaseRoomPresenter { - @SuppressLint("CheckResult") - public void getBannerList() { - mAvRoomModel.getRoomBanner() - .compose(bindToLifecycle()) - .subscribe(bannerInfos -> { - 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); - } - getMvpView().onShowBanner(bannerInfos); -// GoldBoxHelper.isHideBox() -// .subscribe(isHide -> { -// if (!isHide) { -// BannerInfo bannerInfo = new BannerInfo(); -// bannerInfo.setBox(true); -// int index = 0; -// if (firstCharge) index++; -// if (GoldBoxHelper.isShowRadish()) index++; -// bannerInfos.add(index, bannerInfo); -// } -// getMvpView().onShowBanner(bannerInfos); -// }, throwable -> getMvpView().onShowBanner(bannerInfos)); - } else { -// if(GoldBoxHelper.isShowFairy()){ -// BannerInfo bannerInfo = new BannerInfo(); -// bannerInfo.setFairy(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/view/IGameRoomView.java b/app/src/main/java/com/chwl/app/avroom/view/IGameRoomView.java index 15a8936e4..f5f1f642d 100644 --- a/app/src/main/java/com/chwl/app/avroom/view/IGameRoomView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IGameRoomView.java @@ -12,6 +12,6 @@ import java.util.List; */ public interface IGameRoomView extends IBaseRoomView { - void onShowBanner(List dialogInfos); +// void onShowBanner(List dialogInfos); } diff --git a/app/src/main/java/com/chwl/app/avroom/view/IHomePartyView.java b/app/src/main/java/com/chwl/app/avroom/view/IHomePartyView.java index 6d92197c5..0580c4352 100644 --- a/app/src/main/java/com/chwl/app/avroom/view/IHomePartyView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/IHomePartyView.java @@ -21,5 +21,4 @@ public interface IHomePartyView extends IBaseRoomView { */ void onGiftValueChangeMic(int micPosition, String uId, boolean isInviteUpMic, RoomInfo roomInfo); - void onShowBanner(List bannerInfos); } diff --git a/app/src/main/java/com/chwl/app/avroom/view/ISingleRoomView.java b/app/src/main/java/com/chwl/app/avroom/view/ISingleRoomView.java index f898dff23..b4f1e93e5 100644 --- a/app/src/main/java/com/chwl/app/avroom/view/ISingleRoomView.java +++ b/app/src/main/java/com/chwl/app/avroom/view/ISingleRoomView.java @@ -1,8 +1,5 @@ package com.chwl.app.avroom.view; -import com.chwl.core.home.bean.BannerInfo; - -import java.util.List; /** *

轰趴房View层

@@ -12,6 +9,4 @@ import java.util.List; */ public interface ISingleRoomView extends IBaseRoomView { - void onShowBanner(List dialogInfos); - } diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index 7cfba0b93..30e61cdb0 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -157,16 +157,6 @@ app:shaderMode="rightToLeft" app:shaderStartColor="#FA4771" /> - - - - - - -