1.添加游戏超时或失败记录只保存一次

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

@@ -46,6 +46,7 @@
                 android:layout_height="@dimen/divider_93px"
                 android:layout_marginTop="@dimen/divider_21px"
                 android:background="@mipmap/icon_game_title"
+                android:fontFamily="@font/lcb"
                 android:gravity="center"
                 android:text="@{data.gameName}"
                 android:textColor="@color/color_FFFFA413"
@@ -59,6 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_50px"
                 android:layout_marginEnd="@dimen/divider_50px"
+                android:fontFamily="@font/lcb"
                 android:gravity="center"
                 android:text='@{"最佳纪录 "+data.gameMaxScore}'
                 android:textColor="@android:color/white"
@@ -139,6 +141,7 @@
                                     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:text="@string/game_introduction"
                                     android:textColor="@color/color_FFA54A0B"
@@ -155,6 +158,7 @@
                                     android:layout_marginStart="@dimen/divider_53px"
                                     android:layout_marginTop="@dimen/divider_18px"
                                     android:layout_marginEnd="@dimen/divider_30px"
+                                    android:fontFamily="@font/lcb"
                                     android:text="@{data.desn}"
                                     android:textColor="@color/color_FFA54A0B"
                                     android:textSize="@dimen/divider_20px"
@@ -169,6 +173,7 @@
                                     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"
@@ -184,6 +189,7 @@
                                     android:layout_height="@dimen/divider_46px"
                                     android:layout_marginBottom="@dimen/divider_52px"
                                     android:background="@drawable/bg_game_type"
+                                    android:fontFamily="@font/lcb"
                                     android:gravity="center"
                                     android:text="@{data.gameType}"
                                     android:textColor="@color/color_FFA54A0B"
@@ -204,6 +210,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_114px"
                     android:layout_marginBottom="@dimen/divider_71px"
+                    android:fontFamily="@font/lcb"
                     android:text='@{"游戏难度： "+data.gameDifficultyInfo()}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_28px"
@@ -255,6 +262,7 @@
                     android:layout_marginEnd="@dimen/divider_152px"
                     android:layout_marginBottom="@dimen/divider_48px"
                     android:background="@drawable/bg_start_game"
+                    android:fontFamily="@font/lcb"
                     android:gravity="center"
                     android:text="@string/started_training"
                     android:textColor="@android:color/white"

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

@@ -69,73 +69,82 @@
 
         </FrameLayout>
 
-        <com.google.android.material.card.MaterialCardView
+        <FrameLayout
             android:id="@+id/gamelayout"
             android:layout_width="@dimen/divider_665px"
-            android:layout_height="@dimen/divider_451px"
-            android:layout_marginStart="@dimen/divider_112px"
-            android:layout_marginTop="@dimen/divider_71px"
-            android:theme="@style/Theme.MaterialComponents.NoActionBar"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardCornerRadius="@dimen/divider_28px"
+            android:layout_height="@dimen/divider_467px"
+            android:layout_marginStart="@dimen/divider_110px"
+            android:layout_marginTop="@dimen/divider_136px"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/backLayout">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/gameImage"
-                    android:layout_width="@dimen/divider_106px"
-                    android:layout_height="@dimen/divider_106px"
-                    android:layout_marginStart="@dimen/divider_26px"
-                    android:layout_marginTop="@dimen/divider_32px"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:loadHeadImg="@{data.gameCoverImage}" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvGameName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_26px"
-                    android:layout_marginTop="@dimen/divider_45px"
-                    android:text="@{data.gameName}"
-                    android:textColor="@color/color_FFFF6F6F"
-                    android:textSize="@dimen/divider_28px"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toEndOf="@+id/gameImage"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="抓小羊" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvGameLevel"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="@dimen/divider_665px"
+                android:layout_height="@dimen/divider_451px"
+                android:theme="@style/Theme.MaterialComponents.NoActionBar"
+                app:cardBackgroundColor="@android:color/white"
+                app:cardCornerRadius="@dimen/divider_28px"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/backLayout">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="@dimen/divider_26px"
-                    android:layout_marginTop="@dimen/divider_20px"
-                    android:layout_marginEnd="@dimen/divider_28px"
-                    android:layout_marginBottom="@dimen/divider_36px"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/gameImage" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </com.google.android.material.card.MaterialCardView>
+                    android:layout_height="match_parent">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/gameImage"
+                        android:layout_width="@dimen/divider_106px"
+                        android:layout_height="@dimen/divider_106px"
+                        android:layout_marginStart="@dimen/divider_26px"
+                        android:layout_marginTop="@dimen/divider_32px"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:loadHeadImg="@{data.gameCoverImage}" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvGameName"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_26px"
+                        android:layout_marginTop="@dimen/divider_45px"
+                        android:text="@{data.gameName}"
+                        android:textColor="@color/color_FFFF6F6F"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toEndOf="@+id/gameImage"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="抓小羊" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvGameLevel"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/divider_26px"
+                        android:layout_marginTop="@dimen/divider_20px"
+                        android:layout_marginEnd="@dimen/divider_28px"
+                        android:layout_marginBottom="@dimen/divider_36px"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/gameImage" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
+        </FrameLayout>
 
-        <com.google.android.material.card.MaterialCardView
+        <FrameLayout
             android:id="@+id/gameStatuslayout"
-            android:layout_width="@dimen/divider_294px"
-            android:layout_height="@dimen/divider_451px"
-            android:layout_marginStart="@dimen/divider_32px"
-            android:layout_marginTop="@dimen/divider_71px"
-            android:theme="@style/Theme.MaterialComponents.NoActionBar"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardCornerRadius="@dimen/divider_28px"
+            android:layout_width="@dimen/divider_365px"
+            android:layout_height="@dimen/divider_512px"
+            android:layout_marginTop="@dimen/divider_80px"
             app:layout_constraintStart_toEndOf="@+id/gamelayout"
-            app:layout_constraintTop_toBottomOf="@+id/backLayout">
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@mipmap/bg_game_settlement_content"
+                android:scaleType="centerInside" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -155,6 +164,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </com.google.android.material.card.MaterialCardView>
+        </FrameLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -26,11 +26,13 @@
     <dimen name="divider_527px" tools:ignore="ResourceName">527px</dimen>
     <dimen name="divider_525px" tools:ignore="ResourceName">525px</dimen>
     <dimen name="divider_522px" tools:ignore="ResourceName">522px</dimen>
+    <dimen name="divider_512px" tools:ignore="ResourceName">512px</dimen>
     <dimen name="divider_503px" tools:ignore="ResourceName">503px</dimen>
     <dimen name="divider_502px" tools:ignore="ResourceName">502px</dimen>
     <dimen name="divider_497px" tools:ignore="ResourceName">497px</dimen>
     <dimen name="divider_482px" tools:ignore="ResourceName">482px</dimen>
     <dimen name="divider_472px" tools:ignore="ResourceName">472px</dimen>
+    <dimen name="divider_467px" tools:ignore="ResourceName">467px</dimen>
     <dimen name="divider_464px" tools:ignore="ResourceName">464px</dimen>
     <dimen name="divider_451px" tools:ignore="ResourceName">451px</dimen>
     <dimen name="divider_445px" tools:ignore="ResourceName">445px</dimen>
@@ -48,6 +50,7 @@
     <dimen name="divider_379px" tools:ignore="ResourceName">379px</dimen>
     <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
     <dimen name="divider_371px" tools:ignore="ResourceName">371px</dimen>
+    <dimen name="divider_365px" tools:ignore="ResourceName">365px</dimen>
     <dimen name="divider_363px" tools:ignore="ResourceName">363px</dimen>
     <dimen name="divider_360px" tools:ignore="ResourceName">360px</dimen>
     <dimen name="divider_354px" tools:ignore="ResourceName">354px</dimen>