1.修改倒计时崩溃bug

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

@@ -92,6 +92,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT
                     )
+                    binding.gameLayout.radius = 0F
                     binding.gameLayout.layoutParams = params
                     binding.gameFullLayout.show(true)
                 }

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

@@ -3,8 +3,5 @@
     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

@@ -48,6 +48,7 @@
                 android:background="@mipmap/icon_game_title"
                 android:fontFamily="@font/lcb"
                 android:gravity="center"
+                android:includeFontPadding="false"
                 android:text="@{data.gameName}"
                 android:textColor="@color/color_FFFFA413"
                 android:textSize="@dimen/divider_34px"
@@ -62,6 +63,7 @@
                 android:layout_marginEnd="@dimen/divider_50px"
                 android:fontFamily="@font/lcb"
                 android:gravity="center"
+                android:includeFontPadding="false"
                 android:text='@{"最佳纪录 "+data.gameMaxScore}'
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_28px"
@@ -137,12 +139,13 @@
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/tvScientificPrinciple"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
+                                    android:layout_width="@dimen/divider_180px"
+                                    android:layout_height="@dimen/divider_53px"
                                     android:layout_marginTop="@dimen/divider_29px"
                                     android:background="@drawable/bg_scientific_principle"
                                     android:fontFamily="@font/lcb"
                                     android:gravity="center"
+                                    android:includeFontPadding="false"
                                     android:text="@string/game_introduction"
                                     android:textColor="@color/color_FFA54A0B"
                                     android:textSize="@dimen/divider_26px"
@@ -158,6 +161,7 @@
                                     android:layout_marginTop="@dimen/divider_18px"
                                     android:layout_marginEnd="@dimen/divider_30px"
                                     android:fontFamily="@font/lcb"
+                                    android:includeFontPadding="false"
                                     android:scrollbars="vertical"
                                     android:text="@{data.desn}"
                                     android:textColor="@color/color_FFA54A0B"
@@ -169,12 +173,14 @@
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/tvTrainingSkill"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
+                                    android:layout_width="@dimen/divider_180px"
+                                    android:layout_height="@dimen/divider_53px"
                                     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:includeFontPadding="false"
                                     android:text="@string/training_skill"
                                     android:textColor="@color/color_FFA54A0B"
                                     android:textSize="@dimen/divider_26px"
@@ -185,11 +191,13 @@
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/tvGameType"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
+                                    android:layout_width="@dimen/divider_146px"
+                                    android:layout_height="@dimen/divider_46px"
                                     android:layout_marginBottom="@dimen/divider_39px"
                                     android:background="@drawable/bg_game_type"
                                     android:fontFamily="@font/lcb"
+                                    android:gravity="center"
+                                    android:includeFontPadding="false"
                                     android:text="@{data.gameType}"
                                     android:textColor="@color/color_FFA54A0B"
                                     android:textSize="@dimen/divider_22px"
@@ -209,6 +217,7 @@
                     android:layout_marginStart="@dimen/divider_114px"
                     android:layout_marginBottom="@dimen/divider_71px"
                     android:fontFamily="@font/lcb"
+                    android:includeFontPadding="false"
                     android:text='@{"游戏难度： "+data.gameDifficultyInfo()}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_28px"
@@ -262,6 +271,7 @@
                     android:background="@drawable/bg_start_game"
                     android:fontFamily="@font/lcb"
                     android:gravity="center"
+                    android:includeFontPadding="false"
                     android:text="@string/started_training"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_28px"

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

@@ -37,6 +37,7 @@
                 android:layout_marginTop="@dimen/divider_32px"
                 android:background="@drawable/bg_game_pause"
                 android:fontFamily="@font/lcb"
+                android:includeFontPadding="false"
                 android:text="@string/pause_help"
                 android:textColor="@color/color_FFFFA916"
                 android:textSize="@dimen/divider_28px"
@@ -51,6 +52,7 @@
                 android:layout_marginEnd="@dimen/divider_32px"
                 android:background="@drawable/bg_game_pause"
                 android:fontFamily="@font/lcb"
+                android:includeFontPadding="false"
                 android:text="全屏"
                 android:textColor="@color/color_FFFFA916"
                 android:textSize="@dimen/divider_28px"
@@ -80,6 +82,7 @@
                     android:layout_marginTop="@dimen/divider_28px"
                     android:layout_marginEnd="@dimen/divider_31px"
                     android:fontFamily="@font/lcb"
+                    android:includeFontPadding="false"
                     android:textColor="@color/color_FFA94A09"
                     android:textSize="@dimen/divider_25px" />
             </FrameLayout>
@@ -102,6 +105,7 @@
                 android:background="@drawable/bg_game_play"
                 android:fontFamily="@font/lcb"
                 android:gravity="center_horizontal"
+                android:includeFontPadding="false"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_32px"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -153,6 +157,7 @@
                             android:layout_marginTop="@dimen/divider_32px"
                             android:background="@drawable/bg_game_pause"
                             android:fontFamily="@font/lcb"
+                            android:includeFontPadding="false"
                             android:text="@string/pause_help"
                             android:textColor="@color/color_FFFFA916"
                             android:textSize="@dimen/divider_28px"
@@ -167,6 +172,7 @@
                             android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
+                            android:includeFontPadding="false"
                             android:text="@string/zero"
                             android:textColor="@android:color/white"
                             android:textSize="@dimen/divider_32px"
@@ -181,6 +187,7 @@
                             android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
+                            android:includeFontPadding="false"
                             android:textColor="@android:color/white"
                             android:textSize="@dimen/divider_32px"
                             app:layout_constraintStart_toEndOf="@+id/tvScores"
@@ -194,6 +201,7 @@
                             android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
+                            android:includeFontPadding="false"
                             android:textColor="@android:color/white"
                             android:textSize="@dimen/divider_32px"
                             app:layout_constraintStart_toEndOf="@+id/tvTimes"
@@ -221,6 +229,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_76px"
                     android:fontFamily="@font/lcb"
+                    android:includeFontPadding="false"
                     android:text="@string/score"
                     android:textColor="@color/color_FFA94A09"
                     android:textSize="@dimen/divider_32px" />
@@ -230,6 +239,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/lcb"
+                    android:includeFontPadding="false"
                     android:text="@string/zero"
                     android:textColor="@color/color_FFA94A09"
                     android:textSize="@dimen/divider_32px" />
@@ -245,6 +255,7 @@
                 android:background="@drawable/bg_game_score"
                 android:fontFamily="@font/lcb"
                 android:gravity="center_horizontal"
+                android:includeFontPadding="false"
                 android:textColor="@color/color_FFA94A09"
                 android:textSize="@dimen/divider_48px"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -261,6 +272,7 @@
                 android:background="@drawable/bg_game_score"
                 android:fontFamily="@font/lcb"
                 android:gravity="center_horizontal"
+                android:includeFontPadding="false"
                 android:textColor="@color/color_FFA94A09"
                 android:textSize="@dimen/divider_48px"
                 app:layout_constraintEnd_toEndOf="parent"