1.修改游戏结算分数逻辑

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

@@ -443,20 +443,24 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                     Log.e("wpp", "-----------" + it)
                     val gameDataBean = GsonUtil.GsonToBean(it, GameDataBean::class.java)
                     if (gameDataBean != null) {
-                        val isPass = gameDataBean.isPass
-                        if (TextUtils.equals("4", gameDataBean.isPass) || TextUtils.equals(
-                                "2",
-                                gameDataBean.isPass
-                            )
-                        ) {
-                            gameDataBean.isPass = "1"
-                        } else if (TextUtils.equals("3", gameDataBean.isPass)) {
-                            gameDataBean.isPass = "0"
+                        when (gameDataBean.isPass) {
+                            "0" -> {
+                                val score: Int =
+                                    gameTotalScore.toInt() + gameDataBean.curLevelScore.toInt()
+                                gameTotalScore = score.toString()
+                            }
+                            "2", "4" -> {
+                                gameDataBean.isPass = "1"
+                            }
+                            "3" -> {
+                                gameDataBean.isPass = "0"
+                            }
+
                         }
                         if (TextUtils.equals("D", playClass).not()) {
                             saveData(gameDataBean)
                         }
-                        parsingData(gameDataBean, isPass)
+                        parsingData(gameDataBean, gameDataBean.isPass)
                     }
                 }
             }, 100)
@@ -596,16 +600,12 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     private fun parsingData(gameDataBean: GameDataBean, isPass: String) {
         runOnUiThread {
             if (TextUtils.equals("A", playClass) || TextUtils.equals("D", playClass)) {
-                val score: Int = gameTotalScore.toInt() + gameDataBean.curLevelScore.toInt()
-                gameTotalScore = score.toString()
                 showCompletionTrainingDialog(gameDataBean)
             } else {
                 if (TextUtils.equals("2", isPass)) {
                     LiveEventBusUtil.send(RxBusCodes.QUITGAME, "")
                     finish()
                 } else if (TextUtils.equals("3", isPass)) {
-                    val score: Int = gameTotalScore.toInt() + gameDataBean.curLevelScore.toInt()
-                    gameTotalScore = score.toString()
                     //游戏通关
                     ARouter.getInstance().build(RouterUrlCommon.gameSettlement)
                         .withString("gameCode", gameCode)
@@ -614,8 +614,6 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                         .withTransition(R.anim.leftin, R.anim.leftout)
                         .navigation(mContext)
                 } else {
-                    val score: Int = gameTotalScore.toInt() + gameDataBean.curLevelScore.toInt()
-                    gameTotalScore = score.toString()
                     //游戏成功/失败
                     gameResultDialog = GameResultDialog()
                     gameResultDialog?.setData(

game/src/main/res/layout/dialog_completion_training.xml

@@ -41,7 +41,7 @@
                     android:fontFamily="@font/lcb"
                     android:gravity="center"
                     android:includeFontPadding="false"
-                    android:text="@string/cumulative_score"
+                    android:text="@string/train_score"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_32px" />
 

game/src/main/res/layout/dialog_game_result.xml

@@ -86,7 +86,7 @@
                     android:fontFamily="@font/lcb"
                     android:gravity="center"
                     android:includeFontPadding="false"
-                    android:text="@string/cumulative_score"
+                    android:text="@string/train_score"
                     android:textColor="@color/color_FF5F3100"
                     android:textSize="@dimen/divider_32px" />
 

game/src/main/res/values/strings.xml

@@ -23,4 +23,5 @@
     <string name="this_level_score" tools:ignore="ResourceName">本关得分：</string>
     <string name="current_level" tools:ignore="ResourceName">当前关卡：第</string>
     <string name="level" tools:ignore="ResourceName">关</string>
+    <string name="train_score" tools:ignore="ResourceName">训练得分：</string>
 </resources>