1.替换游戏页面UI

.idea/misc.xml

@@ -511,12 +511,12 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_type.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_scientific_principle.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_start_game.xml" value="0.151" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.3410794602698651" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.4" />
         <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_main.xml" value="0.23697916666666666" />
         <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.536" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_count_down.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_exit_game.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_loading.xml" value="0.23697916666666666" />

game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -81,7 +81,7 @@ class GameIntroductionActivity :
         super.onNewIntent(intent)
         isEnterGame = true
         binding.playTxCloudView.onResume()
-        binding.btnStartGame.text = "继续游戏"
+//        binding.btnStartGame.text = "继续游戏"
     }
 
     override fun onResume() {

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

@@ -42,241 +42,206 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvTitle"
-                android:layout_width="@dimen/divider_274px"
-                android:layout_height="@dimen/divider_93px"
-                android:layout_marginTop="@dimen/divider_21px"
+                android:layout_width="@dimen/divider_291px"
+                android:layout_height="@dimen/divider_99px"
+                android:layout_marginTop="@dimen/divider_8px"
                 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:textColor="@android:color/white"
                 android:textSize="@dimen/divider_34px"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvGameMaxScore"
-                android:layout_width="wrap_content"
-                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:includeFontPadding="false"
-                android:text='@{"最佳纪录 "+data.gameMaxScore}'
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/gameCardLayout"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/divider_29px"
-                android:layout_marginTop="@dimen/divider_15px"
-                android:layout_marginEnd="@dimen/divider_29px"
-                android:layout_marginBottom="@dimen/divider_32px"
-                android:background="@drawable/bg_game_introductiont"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/divider_66px"
+                android:layout_marginTop="@dimen/divider_26px"
+                android:layout_marginEnd="@dimen/divider_47px"
+                android:background="@mipmap/icon_new_game_difficulty"
+                android:paddingStart="@dimen/divider_17px"
+                android:paddingEnd="@dimen/divider_17px"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvTitle">
-
-                <LinearLayout
-                    android:id="@+id/introduceLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toTopOf="@+id/btnStartGame"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/videoLayout"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/divider_30px"
-                        android:layout_marginTop="@dimen/divider_41px"
-                        android:layout_marginEnd="@dimen/divider_15px"
-                        android:layout_weight="1"
-                        app:cardBackgroundColor="@android:color/white"
-                        app:cardCornerRadius="@dimen/divider_26px"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <com.tencent.liteav.demo.superplayer.SuperPlayerView
-                            android:id="@+id/play_tx_cloud_view"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent" />
-
-                    </androidx.cardview.widget.CardView>
-
-                    <com.google.android.material.card.MaterialCardView
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/divider_15px"
-                        android:layout_marginTop="@dimen/divider_41px"
-                        android:layout_marginEnd="@dimen/divider_31px"
-                        android:layout_weight="1"
-                        android:theme="@style/Theme.MaterialComponents.NoActionBar"
-                        app:cardBackgroundColor="@android:color/white"
-                        app:cardCornerRadius="@dimen/divider_26px"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent">
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/tvScientificPrinciple"
-                                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"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/tvScientificPrincipleInfo"
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_marginStart="@dimen/divider_53px"
-                                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"
-                                android:textSize="@dimen/divider_22px"
-                                app:layout_constraintBottom_toTopOf="@+id/tvTrainingSkill"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tvScientificPrinciple" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/tvTrainingSkill"
-                                android:layout_width="@dimen/divider_180px"
-                                android:layout_height="@dimen/divider_53px"
-                                android:layout_marginTop="@dimen/divider_10px"
-                                android:layout_marginBottom="@dimen/divider_16px"
-                                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"
-                                app:layout_constraintBottom_toTopOf="@+id/tvGameType"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tvScientificPrincipleInfo" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/tvGameType"
-                                android:layout_width="@dimen/divider_146px"
-                                android:layout_height="@dimen/divider_46px"
-                                android:layout_marginBottom="@dimen/divider_16px"
-                                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"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent" />
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </com.google.android.material.card.MaterialCardView>
-                </LinearLayout>
+                app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvGameDifficulty"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    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:textColor="@color/color_FF591D28"
                     android:textSize="@dimen/divider_28px"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/introduceLayout" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/imageDifficultyOne"
-                    android:layout_width="@dimen/divider_48px"
-                    android:layout_height="@dimen/divider_47px"
-                    android:layout_marginStart="@dimen/divider_20px"
-                    android:layout_marginBottom="@dimen/divider_75px"
+                    android:layout_width="@dimen/divider_37px"
+                    android:layout_height="@dimen/divider_36px"
+                    android:layout_marginStart="@dimen/divider_6px"
                     android:background="@mipmap/icon_game_difficulty"
                     android:scaleType="centerInside"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/tvGameDifficulty"
-                    app:layout_constraintTop_toBottomOf="@+id/introduceLayout" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/imageDifficultyTwo"
-                    android:layout_width="@dimen/divider_48px"
-                    android:layout_height="@dimen/divider_47px"
-                    android:layout_marginStart="@dimen/divider_13px"
-                    android:layout_marginBottom="@dimen/divider_75px"
+                    android:layout_width="@dimen/divider_37px"
+                    android:layout_height="@dimen/divider_36px"
                     android:background="@mipmap/icon_game_difficulty"
                     android:scaleType="centerInside"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/imageDifficultyOne"
-                    app:layout_constraintTop_toBottomOf="@+id/introduceLayout" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/imageDifficultyThree"
-                    android:layout_width="@dimen/divider_48px"
-                    android:layout_height="@dimen/divider_47px"
-                    android:layout_marginStart="@dimen/divider_13px"
-                    android:layout_marginBottom="@dimen/divider_75px"
+                    android:layout_width="@dimen/divider_37px"
+                    android:layout_height="@dimen/divider_36px"
                     android:background="@mipmap/icon_game_difficulty"
                     android:scaleType="centerInside"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/imageDifficultyTwo"
-                    app:layout_constraintTop_toBottomOf="@+id/introduceLayout" />
-
-                <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/btnStartGame"
-                    android:layout_width="@dimen/divider_274px"
-                    android:layout_height="@dimen/divider_96px"
-                    android:layout_marginTop="@dimen/divider_16px"
-                    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:includeFontPadding="false"
-                    android:text="@string/started_training"
-                    android:textColor="@android:color/white"
-                    android:textSize="@dimen/divider_28px"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/introduceLayout" />
+                    app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <FrameLayout
+                android:id="@+id/gameCardLayout"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginStart="@dimen/divider_29px"
+                android:layout_marginTop="@dimen/divider_15px"
+                android:layout_marginEnd="@dimen/divider_29px"
+                android:layout_marginBottom="@dimen/divider_23px"
+                app:layout_constraintBottom_toTopOf="@+id/btnStartGame"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+
+                <com.tencent.liteav.demo.superplayer.SuperPlayerView
+                    android:id="@+id/play_tx_cloud_view"
+                    android:layout_width="@dimen/divider_432px"
+                    android:layout_height="@dimen/divider_348px"
+                    android:layout_marginStart="@dimen/divider_99px"
+                    android:layout_marginTop="@dimen/divider_108px" />
 
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@mipmap/icon_game_video"
+                    android:scaleType="centerInside" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="end"
+                    android:visibility="gone">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvScientificPrinciple"
+                        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"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvScientificPrincipleInfo"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/divider_53px"
+                        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"
+                        android:textSize="@dimen/divider_22px"
+                        app:layout_constraintBottom_toTopOf="@+id/tvTrainingSkill"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvScientificPrinciple" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvTrainingSkill"
+                        android:layout_width="@dimen/divider_180px"
+                        android:layout_height="@dimen/divider_53px"
+                        android:layout_marginTop="@dimen/divider_10px"
+                        android:layout_marginBottom="@dimen/divider_16px"
+                        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"
+                        app:layout_constraintBottom_toTopOf="@+id/tvGameType"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvScientificPrincipleInfo" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvGameType"
+                        android:layout_width="@dimen/divider_146px"
+                        android:layout_height="@dimen/divider_46px"
+                        android:layout_marginBottom="@dimen/divider_16px"
+                        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"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </FrameLayout>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/btnStartGame"
+                android:layout_width="@dimen/divider_286px"
+                android:layout_height="@dimen/divider_107px"
+                android:layout_marginBottom="@dimen/divider_36px"
+                android:background="@mipmap/icon_staret_game_bg"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvGameMaxScore"
+                android:layout_width="@dimen/divider_274px"
+                android:layout_height="@dimen/divider_66px"
+                android:layout_marginEnd="@dimen/divider_80px"
+                android:layout_marginBottom="@dimen/divider_59px"
+                android:background="@mipmap/icon_new_game_difficulty"
+                android:fontFamily="@font/lcb"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:paddingStart="@dimen/divider_21px"
+                android:paddingEnd="@dimen/divider_20px"
+                android:text='@{"最佳纪录 "+data.gameMaxScore}'
+                android:textColor="@color/color_FF591D28"
+                android:textSize="@dimen/divider_28px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 </layout>

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

@@ -46,4 +46,5 @@
     <color name="color_FFAA5413" tools:ignore="ResourceName">#FFAA5413</color>
     <color name="color_FFFBD641" tools:ignore="ResourceName">#FFFBD641</color>
     <color name="color_FFEBEDF0" tools:ignore="ResourceName">#FFEBEDF0</color>
+    <color name="color_FF591D28" tools:ignore="ResourceName">#FF591D28</color>
 </resources>

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

@@ -90,11 +90,14 @@
     <dimen name="divider_320px" tools:ignore="ResourceName">320px</dimen>
     <dimen name="divider_313px" tools:ignore="ResourceName">313px</dimen>
     <dimen name="divider_307px" tools:ignore="ResourceName">307px</dimen>
+    <dimen name="divider_300px" tools:ignore="ResourceName">300px</dimen>
     <dimen name="divider_299px" tools:ignore="ResourceName">299px</dimen>
     <dimen name="divider_296px" tools:ignore="ResourceName">296px</dimen>
     <dimen name="divider_294px" tools:ignore="ResourceName">294px</dimen>
+    <dimen name="divider_291px" tools:ignore="ResourceName">291px</dimen>
     <dimen name="divider_290px" tools:ignore="ResourceName">290px</dimen>
     <dimen name="divider_289px" tools:ignore="ResourceName">289px</dimen>
+    <dimen name="divider_286px" tools:ignore="ResourceName">286px</dimen>
     <dimen name="divider_285px" tools:ignore="ResourceName">285px</dimen>
     <dimen name="divider_284px" tools:ignore="ResourceName">284px</dimen>
     <dimen name="divider_274px" tools:ignore="ResourceName">274px</dimen>
@@ -189,9 +192,11 @@
     <dimen name="divider_102px" tools:ignore="ResourceName">102px</dimen>
     <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
+    <dimen name="divider_99px" tools:ignore="ResourceName">99px</dimen>
     <dimen name="divider_97px" tools:ignore="ResourceName">97px</dimen>
     <dimen name="divider_96px" tools:ignore="ResourceName">96px</dimen>
     <dimen name="divider_95px" tools:ignore="ResourceName">95px</dimen>
+    <dimen name="divider_94px" tools:ignore="ResourceName">94px</dimen>
     <dimen name="divider_93px" tools:ignore="ResourceName">93px</dimen>
     <dimen name="divider_90px" tools:ignore="ResourceName">90px</dimen>
     <dimen name="divider_89px" tools:ignore="ResourceName">89px</dimen>