1.修改倒计时崩溃bug

.idea/misc.xml

@@ -487,6 +487,7 @@
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_game_loading.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_loading.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/rv_empty.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_full_game_text.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_back.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_countdown.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_introduction.xml" value="0.151" />

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

@@ -105,11 +105,6 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
             .asGif()
             .load(R.drawable.fish)
             .into(binding.loadingImage)
-
-        Glide.with(mContext)
-            .asGif()
-            .load(R.drawable.fish)
-            .into(binding.loadingImages)
         initLiveData()
     }
 
@@ -329,7 +324,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
             binding.tvScore.post {
                 if (TextUtils.isEmpty(it).not()) {
                     binding.tvScore.text = it
-                    binding.tvScores.text = it
+                    binding.tvScores.text = "得分 $it"
                 }
             }
         }
@@ -374,7 +369,6 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 val msg = it.split("voice:")
                 if (msg.isNullOrEmpty().not()) {
                     binding.tvIntroduce.text = msg[1]
-                    binding.tvIntroduces.text = msg[1]
                     speak(msg[1])
                 }
             }

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_6px"
+        android:color="@color/color_FFFFC00D" />
+    <corners android:radius="@dimen/divider_24px" />
+    <solid android:color="@color/color_FF4F6548" />
+
+    <padding
+        android:left="@dimen/divider_69px"
+        android:right="@dimen/divider_77px"/>
+</shape>

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

@@ -7,4 +7,7 @@
         android:width="@dimen/divider_4px"
         android:color="@color/color_FFFFA916" />
     <solid android:color="@android:color/white" />
+    <padding
+        android:left="@dimen/divider_22px"
+        android:right="@dimen/divider_21px" />
 </shape>

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

@@ -4,4 +4,7 @@
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_33px" />
     <solid android:color="@color/color_33000000" />
+    <size
+        android:width="@dimen/divider_588px"
+        android:height="@dimen/divider_65px" />
 </shape>

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

@@ -31,31 +31,29 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvPause"
-                android:layout_width="@dimen/divider_169px"
-                android:layout_height="@dimen/divider_65px"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/divider_32px"
                 android:layout_marginTop="@dimen/divider_32px"
                 android:background="@drawable/bg_game_pause"
-                android:gravity="center"
+                android:fontFamily="@font/lcb"
                 android:text="@string/pause_help"
                 android:textColor="@color/color_FFFFA916"
                 android:textSize="@dimen/divider_28px"
-                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvFullScreen"
-                android:layout_width="@dimen/divider_169px"
-                android:layout_height="@dimen/divider_65px"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_32px"
                 android:layout_marginEnd="@dimen/divider_32px"
                 android:background="@drawable/bg_game_pause"
-                android:gravity="center"
+                android:fontFamily="@font/lcb"
                 android:text="全屏"
                 android:textColor="@color/color_FFFFA916"
                 android:textSize="@dimen/divider_28px"
-                android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -75,14 +73,15 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvIntroduce"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
                     android:layout_marginStart="@dimen/divider_33px"
                     android:layout_marginTop="@dimen/divider_28px"
                     android:layout_marginEnd="@dimen/divider_31px"
+                    android:fontFamily="@font/lcb"
                     android:textColor="@color/color_FFA94A09"
-                    android:textSize="@dimen/divider_25px"
-                    android:textStyle="bold" />
+                    android:textSize="@dimen/divider_25px" />
             </FrameLayout>
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -97,14 +96,13 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvPlay"
-                android:layout_width="@dimen/divider_588px"
-                android:layout_height="@dimen/divider_65px"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_32px"
                 android:background="@drawable/bg_game_play"
-                android:gravity="center"
+                android:fontFamily="@font/lcb"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_32px"
-                android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -142,121 +140,63 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/gameFullLayout"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
                         android:visibility="gone">
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvPauses"
-                            android:layout_width="@dimen/divider_169px"
-                            android:layout_height="@dimen/divider_65px"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/divider_32px"
                             android:layout_marginTop="@dimen/divider_32px"
                             android:background="@drawable/bg_game_pause"
-                            android:gravity="center"
+                            android:fontFamily="@font/lcb"
                             android:text="@string/pause_help"
                             android:textColor="@color/color_FFFFA916"
                             android:textSize="@dimen/divider_28px"
-                            android:textStyle="bold"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
-                        <FrameLayout
-                            android:layout_width="@dimen/divider_189px"
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvScores"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/divider_14px"
-                            android:minHeight="@dimen/divider_246px"
-                            app:layout_constraintBottom_toTopOf="@+id/loadingImages"
-                            app:layout_constraintStart_toStartOf="parent">
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:background="@mipmap/icon_game_dialog"
-                                android:scaleType="fitXY" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/tvIntroduces"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/divider_33px"
-                                android:layout_marginTop="@dimen/divider_28px"
-                                android:layout_marginEnd="@dimen/divider_31px"
-                                android:textColor="@color/color_FFA94A09"
-                                android:textSize="@dimen/divider_25px"
-                                android:textStyle="bold" />
-                        </FrameLayout>
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/loadingImages"
-                            android:layout_width="@dimen/divider_176px"
-                            android:layout_height="@dimen/divider_289px"
-                            android:layout_marginStart="@dimen/divider_21px"
-                            android:layout_marginBottom="@dimen/divider_61px"
-                            android:scaleType="centerInside"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                        <LinearLayout
-                            android:id="@+id/scoreLayouts"
-                            android:layout_width="@dimen/divider_153px"
-                            android:layout_height="@dimen/divider_158px"
-                            android:layout_marginStart="@dimen/divider_26px"
-                            android:layout_marginTop="@dimen/divider_130px"
-                            android:layout_marginEnd="@dimen/divider_28px"
-                            android:background="@mipmap/icon_play_score"
-                            android:gravity="center_horizontal"
-                            android:orientation="vertical"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/divider_54px"
-                                android:text="@string/score"
-                                android:textColor="@color/color_FFA94A09"
-                                android:textSize="@dimen/divider_32px"
-                                android:textStyle="bold" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/tvScores"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/zero"
-                                android:textColor="@color/color_FFA94A09"
-                                android:textSize="@dimen/divider_32px"
-                                android:textStyle="bold" />
-                        </LinearLayout>
+                            android:layout_marginStart="@dimen/divider_58px"
+                            android:layout_marginTop="@dimen/divider_23px"
+                            android:background="@drawable/bg_full_game_text"
+                            android:fontFamily="@font/lcb"
+                            android:text="@string/zero"
+                            android:textColor="@android:color/white"
+                            android:textSize="@dimen/divider_32px"
+                            app:layout_constraintStart_toEndOf="@+id/tvPauses"
+                            app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvTimes"
-                            android:layout_width="@dimen/divider_153px"
-                            android:layout_height="@dimen/divider_124px"
-                            android:layout_marginStart="@dimen/divider_26px"
-                            android:layout_marginTop="@dimen/divider_40px"
-                            android:layout_marginEnd="@dimen/divider_28px"
-                            android:background="@drawable/bg_game_score"
-                            android:gravity="center"
-                            android:textColor="@color/color_FFA94A09"
-                            android:textSize="@dimen/divider_48px"
-                            android:textStyle="bold"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/scoreLayouts" />
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_21px"
+                            android:layout_marginTop="@dimen/divider_23px"
+                            android:background="@drawable/bg_full_game_text"
+                            android:fontFamily="@font/lcb"
+                            android:textColor="@android:color/white"
+                            android:textSize="@dimen/divider_32px"
+                            app:layout_constraintStart_toEndOf="@+id/tvScores"
+                            app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvGameLevels"
-                            android:layout_width="@dimen/divider_153px"
-                            android:layout_height="@dimen/divider_124px"
-                            android:layout_marginStart="@dimen/divider_26px"
-                            android:layout_marginTop="@dimen/divider_53px"
-                            android:layout_marginEnd="@dimen/divider_28px"
-                            android:background="@drawable/bg_game_score"
-                            android:gravity="center"
-                            android:textColor="@color/color_FFA94A09"
-                            android:textSize="@dimen/divider_48px"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tvTimes" />
-
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_17px"
+                            android:layout_marginTop="@dimen/divider_23px"
+                            android:background="@drawable/bg_full_game_text"
+                            android:fontFamily="@font/lcb"
+                            android:textColor="@android:color/white"
+                            android:textSize="@dimen/divider_32px"
+                            app:layout_constraintStart_toEndOf="@+id/tvTimes"
+                            app:layout_constraintTop_toTopOf="parent" />
                     </androidx.constraintlayout.widget.ConstraintLayout>
                 </FrameLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -264,7 +204,7 @@
             <LinearLayout
                 android:id="@+id/scoreLayout"
                 android:layout_width="@dimen/divider_153px"
-                android:layout_height="@dimen/divider_158px"
+                android:layout_height="@dimen/divider_265px"
                 android:layout_marginStart="@dimen/divider_26px"
                 android:layout_marginTop="@dimen/divider_130px"
                 android:layout_marginEnd="@dimen/divider_28px"
@@ -278,20 +218,20 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/divider_54px"
+                    android:layout_marginTop="@dimen/divider_76px"
+                    android:fontFamily="@font/lcb"
                     android:text="@string/score"
                     android:textColor="@color/color_FFA94A09"
-                    android:textSize="@dimen/divider_32px"
-                    android:textStyle="bold" />
+                    android:textSize="@dimen/divider_32px" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvScore"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:fontFamily="@font/lcb"
                     android:text="@string/zero"
                     android:textColor="@color/color_FFA94A09"
-                    android:textSize="@dimen/divider_32px"
-                    android:textStyle="bold" />
+                    android:textSize="@dimen/divider_32px" />
             </LinearLayout>
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -302,10 +242,10 @@
                 android:layout_marginTop="@dimen/divider_40px"
                 android:layout_marginEnd="@dimen/divider_28px"
                 android:background="@drawable/bg_game_score"
-                android:gravity="center"
+                android:fontFamily="@font/lcb"
+                android:gravity="center_horizontal"
                 android:textColor="@color/color_FFA94A09"
                 android:textSize="@dimen/divider_48px"
-                android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/gameLayout"
                 app:layout_constraintTop_toBottomOf="@+id/scoreLayout" />
@@ -318,7 +258,8 @@
                 android:layout_marginTop="@dimen/divider_53px"
                 android:layout_marginEnd="@dimen/divider_28px"
                 android:background="@drawable/bg_game_score"
-                android:gravity="center"
+                android:fontFamily="@font/lcb"
+                android:gravity="center_horizontal"
                 android:textColor="@color/color_FFA94A09"
                 android:textSize="@dimen/divider_48px"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -42,4 +42,5 @@
     <color name="color_FFC63910" tools:ignore="ResourceName">#FFC63910</color>
     <color name="color_FFFF9E58" tools:ignore="ResourceName">#FFFF9E58</color>
     <color name="color_FFCD7E21" tools:ignore="ResourceName">#FFCD7E21</color>
+    <color name="color_FF4F6548" tools:ignore="ResourceName">#FF4F6548</color>
 </resources>