Procházet zdrojové kódy

1.修改倒计时崩溃bug

王鹏鹏 před 2 roky
rodič
revize
c23cb0b5a3

+ 0 - 4
game/src/main/res/drawable/bg_full_game_text.xml

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

+ 0 - 3
game/src/main/res/drawable/bg_game_pause.xml

@@ -7,7 +7,4 @@
         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>

+ 31 - 23
game/src/main/res/layout/activity_play_game.xml

@@ -31,12 +31,13 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvPause"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/divider_169px"
+                android:layout_height="@dimen/divider_65px"
                 android:layout_marginStart="@dimen/divider_32px"
                 android:layout_marginTop="@dimen/divider_32px"
                 android:background="@drawable/bg_game_pause"
                 android:fontFamily="@font/lcb"
+                android:gravity="center"
                 android:includeFontPadding="false"
                 android:text="@string/pause_help"
                 android:textColor="@color/color_FFFFA916"
@@ -46,14 +47,15 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvFullScreen"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/divider_169px"
+                android:layout_height="@dimen/divider_65px"
                 android:layout_marginTop="@dimen/divider_32px"
                 android:layout_marginEnd="@dimen/divider_32px"
                 android:background="@drawable/bg_game_pause"
                 android:fontFamily="@font/lcb"
+                android:gravity="center"
                 android:includeFontPadding="false"
-                android:text="全屏"
+                android:text="@string/full_screen"
                 android:textColor="@color/color_FFFFA916"
                 android:textSize="@dimen/divider_28px"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -99,12 +101,12 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvPlay"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/divider_588px"
+                android:layout_height="@dimen/divider_65px"
                 android:layout_marginTop="@dimen/divider_32px"
                 android:background="@drawable/bg_game_play"
                 android:fontFamily="@font/lcb"
-                android:gravity="center_horizontal"
+                android:gravity="center"
                 android:includeFontPadding="false"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_32px"
@@ -151,12 +153,13 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvPauses"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="@dimen/divider_169px"
+                            android:layout_height="@dimen/divider_65px"
                             android:layout_marginStart="@dimen/divider_32px"
                             android:layout_marginTop="@dimen/divider_32px"
                             android:background="@drawable/bg_game_pause"
                             android:fontFamily="@font/lcb"
+                            android:gravity="center"
                             android:includeFontPadding="false"
                             android:text="@string/pause_help"
                             android:textColor="@color/color_FFFFA916"
@@ -166,12 +169,13 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvScores"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="@dimen/divider_272px"
+                            android:layout_height="@dimen/divider_74px"
                             android:layout_marginStart="@dimen/divider_58px"
                             android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
+                            android:gravity="center"
                             android:includeFontPadding="false"
                             android:text="@string/zero"
                             android:textColor="@android:color/white"
@@ -181,26 +185,28 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvTimes"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="@dimen/divider_195px"
+                            android:layout_height="@dimen/divider_74px"
                             android:layout_marginStart="@dimen/divider_21px"
                             android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
+                            android:gravity="center"
                             android:includeFontPadding="false"
                             android:textColor="@android:color/white"
-                            android:textSize="@dimen/divider_32px"
+                            android:textSize="@dimen/divider_38px"
                             app:layout_constraintStart_toEndOf="@+id/tvScores"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvGameLevels"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_width="@dimen/divider_254px"
+                            android:layout_height="@dimen/divider_74px"
                             android:layout_marginStart="@dimen/divider_17px"
                             android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
+                            android:gravity="center"
                             android:includeFontPadding="false"
                             android:textColor="@android:color/white"
                             android:textSize="@dimen/divider_32px"
@@ -213,7 +219,7 @@
             <LinearLayout
                 android:id="@+id/scoreLayout"
                 android:layout_width="@dimen/divider_153px"
-                android:layout_height="@dimen/divider_265px"
+                android:layout_height="@dimen/divider_158px"
                 android:layout_marginStart="@dimen/divider_26px"
                 android:layout_marginTop="@dimen/divider_130px"
                 android:layout_marginEnd="@dimen/divider_28px"
@@ -225,10 +231,11 @@
                 app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/divider_76px"
+                    android:layout_marginTop="@dimen/divider_54px"
                     android:fontFamily="@font/lcb"
+                    android:gravity="center_horizontal"
                     android:includeFontPadding="false"
                     android:text="@string/score"
                     android:textColor="@color/color_FFA94A09"
@@ -236,9 +243,10 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvScore"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/lcb"
+                    android:gravity="center_horizontal"
                     android:includeFontPadding="false"
                     android:text="@string/zero"
                     android:textColor="@color/color_FFA94A09"
@@ -254,7 +262,7 @@
                 android:layout_marginEnd="@dimen/divider_28px"
                 android:background="@drawable/bg_game_score"
                 android:fontFamily="@font/lcb"
-                android:gravity="center_horizontal"
+                android:gravity="center"
                 android:includeFontPadding="false"
                 android:textColor="@color/color_FFA94A09"
                 android:textSize="@dimen/divider_48px"
@@ -271,7 +279,7 @@
                 android:layout_marginEnd="@dimen/divider_28px"
                 android:background="@drawable/bg_game_score"
                 android:fontFamily="@font/lcb"
-                android:gravity="center_horizontal"
+                android:gravity="center"
                 android:includeFontPadding="false"
                 android:textColor="@color/color_FFA94A09"
                 android:textSize="@dimen/divider_48px"

+ 2 - 0
game/src/main/res/values/dimens.xml

@@ -77,12 +77,14 @@
     <dimen name="divider_289px" tools:ignore="ResourceName">289px</dimen>
     <dimen name="divider_285px" tools:ignore="ResourceName">285px</dimen>
     <dimen name="divider_274px" tools:ignore="ResourceName">274px</dimen>
+    <dimen name="divider_272px" tools:ignore="ResourceName">272px</dimen>
     <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
     <dimen name="divider_266px" tools:ignore="ResourceName">266px</dimen>
     <dimen name="divider_265px" tools:ignore="ResourceName">265px</dimen>
     <dimen name="divider_264px" tools:ignore="ResourceName">264px</dimen>
     <dimen name="divider_260px" tools:ignore="ResourceName">260px</dimen>
     <dimen name="divider_255px" tools:ignore="ResourceName">255px</dimen>
+    <dimen name="divider_254px" tools:ignore="ResourceName">254px</dimen>
     <dimen name="divider_253px" tools:ignore="ResourceName">253px</dimen>
     <dimen name="divider_250px" tools:ignore="ResourceName">250px</dimen>
     <dimen name="divider_249px" tools:ignore="ResourceName">249px</dimen>

+ 1 - 0
game/src/main/res/values/strings.xml

@@ -14,4 +14,5 @@
     <string name="zero" tools:ignore="ResourceName">0</string>
     <string name="keep_going_try_to_surpass_yourself" tools:ignore="ResourceName">继续加油,努力超越自己!\n坚持训练下去,你的注意力分配能力会得到很大的提升</string>
     <string name="training_completion" tools:ignore="ResourceName">训练完成</string>
+    <string name="full_screen" tools:ignore="ResourceName">全屏</string>
 </resources>