王鹏鹏 2 лет назад
Родитель
Сommit
0f64dc348e

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/utils/CommonParam.kt

@@ -8,7 +8,6 @@ object CommonParam {
     val ID = "id"
     val TASKDIALOG = "taskDialog"
     val FIRSTLOGIN = "firstLogin"
-    val SNCODE = "sncode"
     val USERSEX = "userSex"
     val USERAGE = "userAge"
     val ORGCODE = "orgCode"

+ 14 - 9
game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -21,7 +21,6 @@ import com.yingyangfly.baselib.ext.*
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.player.VoicePlayer
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.ActivityManagers
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.User
@@ -30,7 +29,6 @@ import com.yingyangfly.game.R
 import com.yingyangfly.game.databinding.ActivityGameIntroductionBinding
 import com.yingyangfly.game.dialog.ExitGameDialog
 import com.yingyangfly.game.entity.GameBean
-import com.yingyangfly.game.play.PlayGameActivity
 
 /**
  * 游戏介绍
@@ -65,13 +63,6 @@ class GameIntroductionActivity :
         playClass = intent.getStringExtra("playClass") ?: ""
         isPlayGameJump = intent.getBooleanExtra("isPlayGameJump", false)
         super.onCreate(savedInstanceState)
-        if (isPlayGameJump.not()) {
-            val gameLoadingDialog = GameLoadingDialog()
-            gameLoadingDialog.onDialogClickListener = {
-                speak()
-            }
-            gameLoadingDialog.show(supportFragmentManager, "gameLoadingDialog")
-        }
     }
 
     override fun initViews() {
@@ -115,6 +106,20 @@ class GameIntroductionActivity :
         reportLog("从游戏页面返回游戏介绍页面,gameCode: $gameCode playClass:$playClass gameId: $id")
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (isPlayGameJump.not()) {
+            val gameLoadingDialog = GameLoadingDialog()
+            gameLoadingDialog.onDialogClickListener = {
+                speak()
+            }
+            gameLoadingDialog.show(supportFragmentManager, "gameLoadingDialog")
+            binding.btnStartGame.setBackgroundResource(R.mipmap.icon_staret_game_bg)
+        } else {
+            binding.btnStartGame.setBackgroundResource(R.mipmap.icon_game_continue)
+        }
+    }
+
     /**
      * 获取游戏音效
      */