1.修改bug

.idea/codeStyles/Project.xml

@@ -1,5 +1,30 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="ENABLE_SECOND_REFORMAT" value="true" />
+    <DBN-PSQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

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

@@ -137,4 +137,14 @@ object RxBusCodes {
      * IM解除消息接收监听
      */
     const val IMLoginOut = "IMLoginOut"
+
+    /**
+     * 结束游戏介绍页面
+     */
+    const val FINISHGAMEINTRODUCTION = "finishGameIntroduction"
+
+    /**
+     * 结束游戏页面
+     */
+    const val FINISHPLAYGAME = "finishPlayGame"
 }

game/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
         <activity
             android:name="com.yingyangfly.game.introduction.GameIntroductionActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:screenOrientation="landscape"
             android:theme="@style/IntroduceFullActivity"
             android:windowSoftInputMode="adjustResize|adjustPan" />

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

@@ -5,6 +5,7 @@ import android.app.Activity
 import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import android.text.TextUtils
 import android.text.method.ScrollingMovementMethod
 import android.view.MotionEvent
@@ -57,14 +58,13 @@ class GameIntroductionActivity :
      */
     private var voicePlayer: VoicePlayer? = null
 
-    override fun initViews() {
+    override fun onCreate(savedInstanceState: Bundle?) {
         id = intent.getStringExtra("id") ?: ""
         desn = intent.getStringExtra("desn") ?: ""
         gameCode = intent.getStringExtra("gameCode") ?: ""
         playClass = intent.getStringExtra("playClass") ?: ""
         isPlayGameJump = intent.getBooleanExtra("isPlayGameJump", false)
-        voicePlayer = VoicePlayer.getInstance(mContext)
-        mVodPlayer = TXVodPlayer(mContext)
+        super.onCreate(savedInstanceState)
         if (isPlayGameJump.not()) {
             val gameLoadingDialog = GameLoadingDialog()
             gameLoadingDialog.onDialogClickListener = {
@@ -72,6 +72,11 @@ class GameIntroductionActivity :
             }
             gameLoadingDialog.show(supportFragmentManager, "gameLoadingDialog")
         }
+    }
+
+    override fun initViews() {
+        voicePlayer = VoicePlayer.getInstance(mContext)
+        mVodPlayer = TXVodPlayer(mContext)
         if (User.isUpdateSaveGameSound()) {
             User.saveSaveGameSoundDate(User.getNowDay())
             getGameSound()
@@ -217,9 +222,7 @@ class GameIntroductionActivity :
                                             LiveEventBusUtil.send(RxBusCodes.CALLQUITGAME, "")
                                             finish()
                                         } else {
-                                            ActivityManagers.instance.finishActivity(
-                                                PlayGameActivity::class.java
-                                            )
+                                            LiveEventBusUtil.send(RxBusCodes.FINISHPLAYGAME, "")
                                             finish()
                                         }
                                     }
@@ -255,6 +258,7 @@ class GameIntroductionActivity :
                                     .withString("gameName", gameBean!!.gameName)
                                     .withTransition(R.anim.leftin, R.anim.leftout)
                                     .navigation(mContext)
+                                isPlayGameJump = true
                                 reportLog("进入游戏页面，游戏名称：" + gameBean!!.gameName + "游戏code： " + gameCode + " playClass:" + playClass + " gameId:" + id)
                             }
                         }
@@ -347,7 +351,12 @@ class GameIntroductionActivity :
                 finish()
             }
         }
-
+        //结束游戏
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.FINISHGAMEINTRODUCTION) {
+            runOnUiThread {
+                finish()
+            }
+        }
         //游戏加载完成
         LiveEventBusUtil.observer<String>(this, RxBusCodes.LOADINGOVER) {
             runOnUiThread {

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

@@ -283,7 +283,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                     R.id.imagePause -> {
                         runOnUiThread {
                             if (callQuitGame) {
-                                ActivityManagers.instance.finishActivity(GameIntroductionActivity::class.java)
+                                LiveEventBusUtil.send(RxBusCodes.FINISHGAMEINTRODUCTION, "")
                                 finish()
                             } else {
                                 if (TextUtils.equals("D", playClass)) {
@@ -535,6 +535,12 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 finish()
             }
         }
+        //结束游戏页面
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.FINISHPLAYGAME) {
+            runOnUiThread {
+                finish()
+            }
+        }
         //返回首页结束游戏
         LiveEventBusUtil.observer<String>(this, RxBusCodes.CALLQUITGAME) {
             runOnUiThread {

game/src/main/manifest/AndroidManifest.xml

@@ -19,7 +19,7 @@
         <activity
             android:name="com.yingyangfly.game.introduction.GameIntroductionActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:screenOrientation="landscape"
             android:theme="@style/IntroduceFullActivity"
             android:windowSoftInputMode="adjustResize|adjustPan" />