1.添加游戏结算页面

game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -3,6 +3,7 @@ package com.yingyangfly.game.introduction
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -107,7 +108,8 @@ class GameIntroductionActivity :
                 } else if (v.id == R.id.btnStartGame) {
                     runOnUiThread {
                         isEnterGame = true
-                        val url = gameBean!!.gameUrl + "?startLv=" + gameBean!!.gameLevel + "&maxLv=" +
+                        val url =
+                            gameBean!!.gameUrl + "?startLv=" + gameBean!!.gameLevel + "&maxLv=" +
                                     gameBean!!.totalNum + "&gameSetTime=" + gameBean!!.gameDuration +
                                     "&difficultyRate=" + gameBean!!.gameDifficultyRate + "&totalTime=" +
                                     gameBean!!.gameTotalTime + "&totalScore=" + gameBean!!.gameTotalScore
@@ -115,6 +117,7 @@ class GameIntroductionActivity :
                             .withString("gameCode", gameCode)
                             .withString("playClass", playClass)
                             .withString("url", url)
+                            .withString("gameTotalScore", gameBean!!.gameTotalScore)
                             .withTransition(R.anim.leftin, R.anim.leftout)
                             .navigation(mContext)
                     }
@@ -133,4 +136,9 @@ class GameIntroductionActivity :
     fun quitGame() {
         finish()
     }
+
+    override fun finish() {
+        Log.e("wpp", "----------------------------1")
+        super.finish()
+    }
 }

game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -46,7 +46,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     private var gameCode: String = ""
     private var playClass: String = ""
     private var url: String = ""
-    private var gameBean: GameBean? = null
+    private var gameTotalScore: String = ""
     private lateinit var webSettings: WebSettings
     private var gameResultDialog: GameResultDialog? = null
 
@@ -54,6 +54,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         gameCode = intent.getStringExtra("gameCode") ?: ""
         playClass = intent.getStringExtra("playClass") ?: ""
         url = intent.getStringExtra("url") ?: ""
+        gameTotalScore = intent.getStringExtra("gameTotalScore") ?: ""
         super.onCreate(savedInstanceState)
     }
 
@@ -95,7 +96,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
      * 保存游戏进度
      */
     private fun saveData(gameDataBean: GameDataBean) {
-        viewModel.saveGameRecord(gameBean!!.gameCode, gameBean!!.playClass, gameDataBean, fail = {
+        viewModel.saveGameRecord(gameCode, playClass, gameDataBean, fail = {
             it.toast()
         }, success = {
             runOnUiThread {
@@ -105,8 +106,8 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 } else if (TextUtils.equals("3", gameDataBean.isPass)) {
                     //游戏通关
                     ARouter.getInstance().build(RouterUrlCommon.gameSettlement)
-                        .withString("gameCode", gameBean!!.gameCode)
-                        .withString("playClass", gameBean!!.playClass)
+                        .withString("gameCode", gameCode)
+                        .withString("playClass", playClass)
                         .withTransition(R.anim.leftin, R.anim.leftout)
                         .navigation(mContext)
                 } else {
@@ -114,7 +115,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                     gameResultDialog = GameResultDialog()
                     gameResultDialog?.setData(
                         gameDataBean.curLevel,
-                        gameBean!!.gameTotalScore,
+                        gameTotalScore,
                         gameDataBean.curLevelScore,
                         gameDataBean.isPass
                     )
@@ -202,8 +203,8 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                             "javascript:CallPauseGame()"
                         ) {
                             ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
-                                .withString("gameCode", gameBean!!.gameCode)
-                                .withString("playClass", gameBean!!.playClass)
+                                .withString("gameCode", gameCode)
+                                .withString("playClass", playClass)
                                 .withTransition(R.anim.leftin, R.anim.leftout)
                                 .navigation(mContext)
                         }
@@ -230,23 +231,9 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 }
             }
             countdownDialog.show(supportFragmentManager, "countdownDialog")
-            getGameDetailByCode()
         }
     }
 
-    /**
-     * 获取游戏数据
-     */
-    private fun getGameDetailByCode() {
-        viewModel.getGameDetailByCode(gameCode, playClass, fail = {
-
-        }, success = {
-            if (it != null) {
-                gameBean = it
-            }
-        })
-    }
-
     override fun onDestroy() {
         destoryWebView()
         super.onDestroy()
@@ -353,4 +340,9 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
             loadingOver = true
         }
     }
+
+    override fun finish() {
+        Log.e("wpp", "----------------------------2")
+        super.finish()
+    }
 }