1.修改游戏记录上报时机

baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -30,10 +30,10 @@ object RxBusCodes {
     const val EVALUATE_ORDER = 9007
 
     //退出游戏
-    const val CALLQUITGAME = 9008
+    const val CALLQUITGAME = "callQuitGame"
 
     //退出游戏
-    const val QUITGAME = 9009
+    const val QUITGAME = "quitGame"
 
     /**
      * 游戏计时

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

@@ -29,9 +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 gorden.rxbus2.RxBus
-import gorden.rxbus2.Subscribe
-import gorden.rxbus2.ThreadMode
 
 
 /**
@@ -170,7 +167,7 @@ class GameIntroductionActivity :
                         if (isEnterGame) {
                             val exitGameDialog = ExitGameDialog()
                             exitGameDialog.onDialogClickListener = {
-                                RxBus.get().send(RxBusCodes.CALLQUITGAME)
+                                LiveEventBusUtil.send(RxBusCodes.CALLQUITGAME, "")
                             }
                             exitGameDialog.show(supportFragmentManager, "exitGameDialog")
                         } else {
@@ -209,11 +206,6 @@ class GameIntroductionActivity :
         return true
     }
 
-    @Subscribe(code = RxBusCodes.QUITGAME, threadMode = ThreadMode.MAIN)
-    fun quitGame() {
-        finish()
-    }
-
     /**
      * 语音合成
      */
@@ -276,6 +268,12 @@ class GameIntroductionActivity :
                 finish()
             }
         }
+        //退出游戏
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.QUITGAME) {
+            runOnUiThread {
+                finish()
+            }
+        }
     }
 
     /**

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

@@ -36,9 +36,6 @@ import com.yingyangfly.game.dialog.CompletionTrainingDialog
 import com.yingyangfly.game.dialog.CountdownDialog
 import com.yingyangfly.game.dialog.GameResultDialog
 import com.yingyangfly.game.utils.AndroidToJs
-import gorden.rxbus2.RxBus
-import gorden.rxbus2.Subscribe
-import gorden.rxbus2.ThreadMode
 
 
 /**
@@ -283,17 +280,6 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         }
     }
 
-    @Subscribe(code = RxBusCodes.CALLQUITGAME, threadMode = ThreadMode.MAIN)
-    fun callQuitGame() {
-        runOnUiThread {
-            binding.webView.evaluateJavascript(
-                "javascript:CallQuitGame()"
-            ) {
-
-            }
-        }
-    }
-
     override fun onPause() {
         super.onPause()
         if (voicePlayer != null) {
@@ -389,6 +375,15 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         LiveEventBusUtil.observer<String>(this, RxBusCodes.GAMEOVERTIME) {
             finish()
         }
+        //返回首页结束游戏
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.CALLQUITGAME) {
+            runOnUiThread {
+                binding.webView.evaluateJavascript(
+                    "javascript:CallQuitGame()"
+                ) {
+                }
+            }
+        }
     }
 
     /**
@@ -468,7 +463,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         runOnUiThread {
             runOnUiThread {
                 if (TextUtils.equals("2", isPass)) {
-                    RxBus.get().send(RxBusCodes.QUITGAME)
+                    LiveEventBusUtil.send(RxBusCodes.QUITGAME, "")
                     finish()
                 } else if (TextUtils.equals("3", isPass)) {
                     val score: Int = gameTotalScore.toInt() + gameDataBean.curLevelScore.toInt()