From 2b0e52ac202a494b7ac2b46048ad8dce620ed0c9 Mon Sep 17 00:00:00 2001 From: max Date: Fri, 31 May 2024 20:46:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=81=A2=E5=A4=8D=E6=B8=B8=E6=88=8Fdialog?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=A9=BA=E7=99=BD=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/chwl/app/MainActivity.java | 2 +- .../java/com/chwl/app/game/ui/game/GameViewModel.kt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/com/chwl/app/MainActivity.java b/app/src/main/java/com/chwl/app/MainActivity.java index 3968b291e..0533a1be4 100644 --- a/app/src/main/java/com/chwl/app/MainActivity.java +++ b/app/src/main/java/com/chwl/app/MainActivity.java @@ -293,7 +293,7 @@ public class MainActivity extends BaseMvpActivity if (resumeGameDialogManager == null) { resumeGameDialogManager = new DialogManager(this); } - resumeGameDialogManager.showOkCancelDialog(getString(R.string.resume_game_tips), getString(R.string.join_organization_ok), getString(R.string.join_organization_no), new DialogManager.OkCancelDialogListener() { + resumeGameDialogManager.showOkCancelDialog(getString(R.string.resume_game_tips), getString(R.string.join_organization_ok), getString(R.string.join_organization_no), false, new DialogManager.OkCancelDialogListener() { @Override public void onOk() { long gameId = JavaUtil.str2long(gameRoomInfo.getData().getMgId()); diff --git a/app/src/module_game/java/com/chwl/app/game/ui/game/GameViewModel.kt b/app/src/module_game/java/com/chwl/app/game/ui/game/GameViewModel.kt index 5ffcd264a..66983c747 100644 --- a/app/src/module_game/java/com/chwl/app/game/ui/game/GameViewModel.kt +++ b/app/src/module_game/java/com/chwl/app/game/ui/game/GameViewModel.kt @@ -1,13 +1,10 @@ package com.chwl.app.game.ui.game import androidx.lifecycle.MutableLiveData -import com.chwl.app.R import com.chwl.app.base.BaseViewModel import com.chwl.app.game.core.GameContext -import com.chwl.app.game.core.GameStateAbility import com.chwl.app.game.data.GameModel2 import com.chwl.core.bean.response.BeanResult -import com.chwl.library.utils.ResUtil import kotlinx.coroutines.flow.MutableSharedFlow class GameViewModel : BaseViewModel() {