1.修改累计得分错误问题

.idea/misc.xml

@@ -504,7 +504,7 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_type.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_scientific_principle.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_start_game.xml" value="0.151" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.4055258467023173" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.3410794602698651" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_loading.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />

game/src/main/java/com/yingyangfly/game/loading/GameLoadingActivity.kt

@@ -53,6 +53,7 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
         rxTimer.interval(m) {
             binding.progressBar.progress = it.toInt() + 1
             if (time == it) {
+                rxTimer.cancel()
                 ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
                     .withString("gameCode", gameCode)
                     .withString("playClass", playClass)
@@ -62,7 +63,6 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
                     .withString("desn", desn)
                     .withTransition(R.anim.leftin, R.anim.leftout)
                     .navigation(mContext)
-                rxTimer.cancel()
                 finish()
             }
         }

game/src/main/res/drawable/bg_game_type.xml

@@ -4,4 +4,7 @@
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_8px" />
     <solid android:color="@color/color_70FFD979" />
+    <padding
+        android:left="@dimen/divider_43px"
+        android:right="@dimen/divider_43px" />
 </shape>

game/src/main/res/drawable/bg_scientific_principle.xml

@@ -3,5 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_27px" />
+    <padding
+        android:left="@dimen/divider_43px"
+        android:right="@dimen/divider_43px" />
     <solid android:color="@color/color_70FFD979" />
 </shape>

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

@@ -137,16 +137,15 @@
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/tvScientificPrinciple"
-                                    android:layout_width="@dimen/divider_180px"
-                                    android:layout_height="@dimen/divider_53px"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
                                     android:layout_marginTop="@dimen/divider_29px"
                                     android:background="@drawable/bg_scientific_principle"
                                     android:fontFamily="@font/lcb"
                                     android:gravity="center"
                                     android:text="@string/game_introduction"
                                     android:textColor="@color/color_FFA54A0B"
-                                    android:textSize="@dimen/divider_28px"
-                                    android:textStyle="bold"
+                                    android:textSize="@dimen/divider_26px"
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toStartOf="parent"
                                     app:layout_constraintTop_toTopOf="parent" />
@@ -154,47 +153,46 @@
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/tvScientificPrincipleInfo"
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
+                                    android:layout_height="0dp"
                                     android:layout_marginStart="@dimen/divider_53px"
                                     android:layout_marginTop="@dimen/divider_18px"
                                     android:layout_marginEnd="@dimen/divider_30px"
                                     android:fontFamily="@font/lcb"
+                                    android:scrollbars="vertical"
                                     android:text="@{data.desn}"
                                     android:textColor="@color/color_FFA54A0B"
-                                    android:textSize="@dimen/divider_20px"
+                                    android:textSize="@dimen/divider_22px"
+                                    app:layout_constraintBottom_toTopOf="@+id/tvTrainingSkill"
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toStartOf="parent"
                                     app:layout_constraintTop_toBottomOf="@+id/tvScientificPrinciple" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/tvTrainingSkill"
-                                    android:layout_width="@dimen/divider_180px"
-                                    android:layout_height="@dimen/divider_53px"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
                                     android:layout_marginTop="@dimen/divider_18px"
                                     android:layout_marginBottom="@dimen/divider_29px"
                                     android:background="@drawable/bg_scientific_principle"
                                     android:fontFamily="@font/lcb"
-                                    android:gravity="center"
                                     android:text="@string/training_skill"
                                     android:textColor="@color/color_FFA54A0B"
-                                    android:textSize="@dimen/divider_28px"
-                                    android:textStyle="bold"
+                                    android:textSize="@dimen/divider_26px"
                                     app:layout_constraintBottom_toTopOf="@+id/tvGameType"
                                     app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="parent" />
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toBottomOf="@+id/tvScientificPrincipleInfo" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/tvGameType"
-                                    android:layout_width="@dimen/divider_146px"
-                                    android:layout_height="@dimen/divider_46px"
-                                    android:layout_marginBottom="@dimen/divider_52px"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginBottom="@dimen/divider_39px"
                                     android:background="@drawable/bg_game_type"
                                     android:fontFamily="@font/lcb"
-                                    android:gravity="center"
                                     android:text="@{data.gameType}"
                                     android:textColor="@color/color_FFA54A0B"
-                                    android:textSize="@dimen/divider_28px"
-                                    android:textStyle="bold"
+                                    android:textSize="@dimen/divider_22px"
                                     app:layout_constraintBottom_toBottomOf="parent"
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toStartOf="parent" />