From 71a9a38739a8843c7d141431afa75058f8960b50 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Thu, 22 Dec 2022 11:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=92=AD=E5=8C=B9=E9=85=8D=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mango/moshen/avroom/dialog/RoomOperationDialog.java   | 3 +--
 .../com/mango/moshen/avroom/fragment/SingleRoomFragment.kt    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java
index 901899769..2ff2d07b8 100644
--- a/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java
+++ b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java
@@ -41,7 +41,6 @@ import com.mango.moshen.avroom.activity.CreatePKActivity;
 import com.mango.moshen.avroom.activity.RoomSettingActivity;
 import com.mango.moshen.avroom.anotherroompk.RoomPKCreateActivity;
 import com.mango.moshen.avroom.giftvalue.GiftValueDialogUiHelper;
-import com.mango.moshen.avroom.singleroompk.SingleRoomPKCreateActivity;
 import com.mango.moshen.avroom.singleroompk.SingleRoomPkSelectTypeDialog;
 import com.mango.moshen.avroom.wishlist.WishListCreateActivity;
 import com.mango.moshen.common.widget.dialog.DialogManager;
@@ -312,7 +311,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
                             .doOnSuccess(s -> {
                                 EventBus.getDefault().post(new ShowPkMatchEvent(0));
                                 AvRoomDataManager.get().setPkMatchStartTime(0);
-                                SingleRoomPKCreateActivity.start(getContext());
+                                SingleRoomPkSelectTypeDialog.newInstance().show(getContext());
                             })
                             .doOnError(throwable -> SingleToastUtil.showToast(throwable.getMessage()))
                             .subscribe();
diff --git a/app/src/main/java/com/mango/moshen/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/SingleRoomFragment.kt
index a5fe76c59..1e94b2e43 100644
--- a/app/src/main/java/com/mango/moshen/avroom/fragment/SingleRoomFragment.kt
+++ b/app/src/main/java/com/mango/moshen/avroom/fragment/SingleRoomFragment.kt
@@ -294,9 +294,9 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                     .observeOn(AndroidSchedulers.mainThread())
                     .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
                     .subscribe { aLong: Long ->
-                        gameBinding.tvRoomPkOrderTime.text = TimeUtils.getFormatTimeString(
+                        gameBinding.tvRoomPkOrderTime.text = TimeUtils.ms2MS(
                             aLong * 1000,
-                            "min:sec"
+                            true
                         )
                     }
         } else {