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() {