From 6dd7481a294f09ef42d9b8b488a334519e36f6b5 Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 14 Jul 2022 17:41:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B7=A8=E6=88=BFPK=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E6=8F=90=E7=A4=BA=E6=B0=94=E6=B3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/HomePartyRoomFragment.java | 33 ++++++++++++++--- .../avroom/presenter/AvRoomPresenter.java | 2 ++ .../res/drawable-xhdpi/bg_room_pk_order.png | Bin 0 -> 19598 bytes .../res/layout/fragment_av_room_game.xml | 34 +++++++++++++++++- .../manager/IMNetEaseManager.java | 5 +++ .../im/custom/bean/CustomAttachment.java | 1 + .../im/custom/bean/RoomPkBean.java | 5 +++ .../manager/AvRoomDataManager.java | 6 ++-- .../xchat_android_core/manager/RoomEvent.java | 2 ++ .../room/bean/RoomInfo.java | 3 ++ 10 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/bg_room_pk_order.png 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 2cca7f31b..eebed5a11 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 @@ -24,12 +24,9 @@ import com.yizhuan.erban.avroom.dialog.MicQueueDialog; import com.yizhuan.erban.avroom.dialog.PKMicQueueDialog; import com.yizhuan.erban.avroom.dialog.PKResultDialog; import com.yizhuan.erban.avroom.dialog.PKScoreBoardDialog; -import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog; import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog; import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper; import com.yizhuan.erban.avroom.ktv.KtvSongListActivity; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.xchat_android_core.helper.AtProxy; import com.yizhuan.erban.avroom.presenter.HomePartyPresenter; import com.yizhuan.erban.avroom.view.IHomePartyView; import com.yizhuan.erban.avroom.widget.PKBoardView; @@ -38,6 +35,7 @@ import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.FragmentAvRoomGameBinding; import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.yizhuan.erban.ui.webview.DatingRuleWebViewActivity; +import com.yizhuan.erban.ui.webview.DialogWebViewActivity; import com.yizhuan.erban.utils.UserUtils; import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.UriProvider; @@ -53,7 +51,6 @@ import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; import com.yizhuan.xchat_android_core.room.bean.RoomInfo; import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent; import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.event.RoomAtEvent; import com.yizhuan.xchat_android_core.room.face.FaceInfo; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; import com.yizhuan.xchat_android_core.room.model.MicQueueModel; @@ -66,8 +63,10 @@ import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicEmptyEven import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent; import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; import com.yizhuan.xchat_android_core.user.UserModel; +import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.yizhuan.xchat_android_library.utils.TimeUtils; import com.yizhuan.xchat_android_library.utils.UIUtils; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; @@ -75,11 +74,13 @@ import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; +import io.reactivex.Observable; import io.reactivex.Single; import io.reactivex.SingleObserver; +import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; /** @@ -101,6 +102,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment 0) { + gameBinding.llRoomPkOrder.setVisibility(View.VISIBLE); + roomPkOrderDisposable = Observable.intervalRange(0, residueSeconds, 1, 1, TimeUnit.SECONDS) + .observeOn(AndroidSchedulers.mainThread()) + .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) + .doOnComplete(() -> gameBinding.llRoomPkOrder.setVisibility(View.GONE)) + .subscribe(aLong -> gameBinding.tvRoomPkOrderTime.setText(TimeUtils.getFormatTimeString((residueSeconds - aLong) * 1000, "min:sec"))); + } else { + gameBinding.llRoomPkOrder.setVisibility(View.GONE); + } + } + /** * cp房自动上麦 */ diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java index c5181d48a..d348059a9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java @@ -127,6 +127,8 @@ public class AvRoomPresenter extends BaseMvpPresenter { AvRoomDataManager.get().isRoomFans = roomInfo.isRoomFans(); AvRoomDataManager.get().trtcSig = roomInfo.getTrtcSig(); AvRoomDataManager.get().clearScreenTime = roomInfo.getClearScreenTime(); + AvRoomDataManager.get().showPkBeginTime = roomInfo.isShowPkBeginTime(); + AvRoomDataManager.get().pkBeginTime = roomInfo.getPkBeginTime(); AvRoomDataManager.get().setRedEnvelopeOpen(roomInfo.isRedEnvelopeOpen()); StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_LIST_TYPE, "区分房间类型:" + roomInfo.getRoomTypeLable()); diff --git a/app/src/main/res/drawable-xhdpi/bg_room_pk_order.png b/app/src/main/res/drawable-xhdpi/bg_room_pk_order.png new file mode 100644 index 0000000000000000000000000000000000000000..7db3c1e53be937065d296eb400decbcbedc153f8 GIT binary patch literal 19598 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 JPDHLkV1jQ5if{k` literal 0 HcmV?d00001 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 772b8a595..659e477cb 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 @@ -78,19 +78,51 @@ + + + + + + + + 0:语音派对房 + private boolean showPkBeginTime; + private long pkBeginTime; + protected RoomInfo(Parcel in) { uid = in.readLong(); officeUser = in.readInt();