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 000000000..7db3c1e53 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_room_pk_order.png differ 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();