Просмотр исходного кода

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

王鹏鹏 2 лет назад
Родитель
Сommit
33efa73e7e

+ 1 - 1
.idea/misc.xml

@@ -508,7 +508,7 @@
         <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_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_game_settlement.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_play_game.xml" value="0.6" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_play_game.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_completion_training.xml" value="0.72" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_completion_training.xml" value="0.72" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_count_down.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_count_down.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_exit_game.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_exit_game.xml" value="0.22239583333333332" />

+ 0 - 15
game/src/main/res/layout/activity_game_settlement.xml

@@ -141,20 +141,6 @@
                 android:layout_width="match_parent"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 android:layout_height="match_parent">
 
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvGameStatus"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_26px"
-                    android:layout_marginTop="@dimen/divider_26px"
-                    android:text='@{"总时长"+data.gameTotalTime}'
-                    android:textColor="@color/color_FFFF6F6F"
-                    android:textSize="@dimen/divider_32px"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
                 <androidx.appcompat.widget.AppCompatTextView
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
@@ -166,7 +152,6 @@
                     android:textStyle="bold"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvGameStatus"
                     app:layout_constraintTop_toTopOf="parent" />
                     app:layout_constraintTop_toTopOf="parent" />
 
 
             </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>

+ 0 - 1
game/src/main/res/layout/activity_play_game.xml

@@ -103,7 +103,6 @@
                 android:layout_marginTop="@dimen/divider_104px"
                 android:layout_marginTop="@dimen/divider_104px"
                 android:layout_marginEnd="@dimen/divider_12px"
                 android:layout_marginEnd="@dimen/divider_12px"
                 android:layout_marginBottom="@dimen/divider_62px"
                 android:layout_marginBottom="@dimen/divider_62px"
-                android:layout_weight="1"
                 android:theme="@style/Theme.MaterialComponents.NoActionBar"
                 android:theme="@style/Theme.MaterialComponents.NoActionBar"
                 app:cardBackgroundColor="@android:color/white"
                 app:cardBackgroundColor="@android:color/white"
                 app:cardCornerRadius="@dimen/divider_49px"
                 app:cardCornerRadius="@dimen/divider_49px"

+ 2 - 1
game/src/main/res/layout/item_game_result.xml

@@ -29,12 +29,13 @@
             android:id="@+id/levelImage"
             android:id="@+id/levelImage"
             android:layout_width="0dp"
             android:layout_width="0dp"
             android:layout_height="@dimen/divider_32px"
             android:layout_height="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_14px"
             android:layout_weight="1" />
             android:layout_weight="1" />
 
 
         <androidx.appcompat.widget.AppCompatTextView
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_24px"
+            android:layout_marginStart="@dimen/divider_14px"
             android:layout_marginEnd="@dimen/divider_36px"
             android:layout_marginEnd="@dimen/divider_36px"
             android:layout_marginBottom="@dimen/divider_4px"
             android:layout_marginBottom="@dimen/divider_4px"
             android:text='@{data.gameScore}'
             android:text='@{data.gameScore}'

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 <resources xmlns:tools="http://schemas.android.com/tools">
     <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
     <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
+    <dimen name="divider_874px" tools:ignore="ResourceName">874px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
+    <dimen name="divider_767px" tools:ignore="ResourceName">767px</dimen>
     <dimen name="divider_763px" tools:ignore="ResourceName">763px</dimen>
     <dimen name="divider_763px" tools:ignore="ResourceName">763px</dimen>
     <dimen name="divider_747px" tools:ignore="ResourceName">747px</dimen>
     <dimen name="divider_747px" tools:ignore="ResourceName">747px</dimen>
+    <dimen name="divider_704px" tools:ignore="ResourceName">704px</dimen>
     <dimen name="divider_693px" tools:ignore="ResourceName">693px</dimen>
     <dimen name="divider_693px" tools:ignore="ResourceName">693px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_684px" tools:ignore="ResourceName">684px</dimen>
     <dimen name="divider_684px" tools:ignore="ResourceName">684px</dimen>
@@ -12,11 +15,13 @@
     <dimen name="divider_656px" tools:ignore="ResourceName">656px</dimen>
     <dimen name="divider_656px" tools:ignore="ResourceName">656px</dimen>
     <dimen name="divider_645px" tools:ignore="ResourceName">645px</dimen>
     <dimen name="divider_645px" tools:ignore="ResourceName">645px</dimen>
     <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
     <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
+    <dimen name="divider_611px" tools:ignore="ResourceName">611px</dimen>
     <dimen name="divider_601px" tools:ignore="ResourceName">601px</dimen>
     <dimen name="divider_601px" tools:ignore="ResourceName">601px</dimen>
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_588px" tools:ignore="ResourceName">588px</dimen>
     <dimen name="divider_588px" tools:ignore="ResourceName">588px</dimen>
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_552px" tools:ignore="ResourceName">552px</dimen>
     <dimen name="divider_552px" tools:ignore="ResourceName">552px</dimen>
+    <dimen name="divider_536px" tools:ignore="ResourceName">536px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
     <dimen name="divider_527px" tools:ignore="ResourceName">527px</dimen>
     <dimen name="divider_527px" tools:ignore="ResourceName">527px</dimen>
     <dimen name="divider_525px" tools:ignore="ResourceName">525px</dimen>
     <dimen name="divider_525px" tools:ignore="ResourceName">525px</dimen>