1.添加游戏结算页面

.idea/misc.xml

@@ -494,6 +494,7 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_level_two.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_loading.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_pause.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_play.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_progressbar_selector.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_record.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_score.xml" value="0.151" />
@@ -505,7 +506,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_settlement.xml" value="0.4" />
         <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.536" />
+        <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/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_game_result.xml" value="0.536" />

game/src/main/java/com/yingyangfly/game/entity/GameBean.java

@@ -29,6 +29,7 @@ public class GameBean implements Serializable {
     private String playClass;
     private String totalNum;
     private String gameInbetweenImage;
+    private String gameShortDesn;
 
     public String getDesn() {
         return desn;
@@ -198,6 +199,14 @@ public class GameBean implements Serializable {
         this.gameInbetweenImage = gameInbetweenImage;
     }
 
+    public String getGameShortDesn() {
+        return gameShortDesn;
+    }
+
+    public void setGameShortDesn(String gameShortDesn) {
+        this.gameShortDesn = gameShortDesn;
+    }
+
     public String gameDifficultyInfo() {
         if (TextUtils.equals("A", gameDifficulty)) {
             return "简单";

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

@@ -192,6 +192,7 @@ class GameIntroductionActivity :
                             .withString("gameTotalScore", gameBean!!.gameTotalScore)
                             .withString("gameInbetweenImage", gameInbetweenImage)
                             .withString("gameBackgroundImage", gameBackgroundImage)
+                            .withString("gameShortDesn", gameBean!!.gameShortDesn)
                             .withTransition(R.anim.leftin, R.anim.leftout)
                             .navigation(mContext)
                     }

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

@@ -48,6 +48,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     private var gameTotalScore: String = ""
     private var gameInbetweenImage = ""
     private var gameBackgroundImage = ""
+    private var gameShortDesn = ""
     private lateinit var webSettings: WebSettings
     private var gameResultDialog: GameResultDialog? = null
 
@@ -58,6 +59,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         gameTotalScore = intent.getStringExtra("gameTotalScore") ?: ""
         gameInbetweenImage = intent.getStringExtra("gameInbetweenImage") ?: ""
         gameBackgroundImage = intent.getStringExtra("gameBackgroundImage") ?: ""
+        gameShortDesn = intent.getStringExtra("gameShortDesn") ?: ""
         super.onCreate(savedInstanceState)
     }
 
@@ -65,9 +67,12 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         if (TextUtils.isEmpty(url).not()) {
             initWebView(url)
         }
-        if(TextUtils.isEmpty(gameBackgroundImage).not()){
+        if (TextUtils.isEmpty(gameBackgroundImage).not()) {
             binding.image = gameBackgroundImage
         }
+        if (TextUtils.isEmpty(gameShortDesn).not()) {
+            binding.tvPlay.text = gameShortDesn
+        }
     }
 
     @SuppressLint("ClickableViewAccessibility")

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

@@ -0,0 +1,7 @@
+<?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">
+    <corners android:radius="@dimen/divider_33px" />
+    <solid android:color="@color/color_33000000" />
+</shape>

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

@@ -3,5 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_24px" />
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/color_FFFFF6CF" />
+    <stroke
+        android:width="@dimen/divider_8px"
+        android:color="@color/color_FFFFC00D" />
 </shape>

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

@@ -55,6 +55,20 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvPlay"
+                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:gravity="center"
+                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" />
+
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/gameLayout"
                 android:layout_width="0dp"
@@ -85,65 +99,69 @@
 
             </com.google.android.material.card.MaterialCardView>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvTime"
-                android:layout_width="@dimen/divider_153px"
-                android:layout_height="@dimen/divider_124px"
-                android:layout_marginStart="@dimen/divider_18px"
-                android:layout_marginTop="@dimen/divider_154px"
-                android:layout_marginEnd="@dimen/divider_51px"
-                android:background="@drawable/bg_game_score"
-                android:gravity="center"
-                android:textColor="@color/color_FFFFA413"
-                android:textSize="@dimen/divider_48px"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/gameLayout"
-                app:layout_constraintTop_toTopOf="parent" />
-
             <LinearLayout
                 android:id="@+id/scoreLayout"
                 android:layout_width="@dimen/divider_153px"
-                android:layout_height="@dimen/divider_124px"
-                android:layout_marginStart="@dimen/divider_18px"
-                android:layout_marginTop="@dimen/divider_79px"
-                android:layout_marginEnd="@dimen/divider_51px"
-                android:background="@drawable/bg_game_score"
+                android:layout_height="@dimen/divider_158px"
+                android:layout_marginStart="@dimen/divider_31px"
+                android:layout_marginTop="@dimen/divider_130px"
+                android:layout_marginEnd="@dimen/divider_38px"
+                android:background="@mipmap/icon_play_score"
                 android:gravity="center_horizontal"
                 android:orientation="vertical"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/gameLayout"
-                app:layout_constraintTop_toBottomOf="@+id/tvTime">
+                app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/divider_20px"
-                    android:text="得分"
-                    android:textColor="@color/color_FFFFA413"
-                    android:textSize="@dimen/divider_32px" />
+                    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/tvScore"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/color_FFFFA413"
-                    android:textSize="@dimen/divider_32px" />
+                    android:text="@string/zero"
+                    android:textColor="@color/color_FFA94A09"
+                    android:textSize="@dimen/divider_32px"
+                    android:textStyle="bold" />
             </LinearLayout>
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvGameLevel"
+                android:id="@+id/tvTime"
                 android:layout_width="@dimen/divider_153px"
                 android:layout_height="@dimen/divider_124px"
-                android:layout_marginStart="@dimen/divider_18px"
-                android:layout_marginTop="@dimen/divider_154px"
-                android:layout_marginEnd="@dimen/divider_51px"
+                android:layout_marginStart="@dimen/divider_31px"
+                android:layout_marginTop="@dimen/divider_40px"
+                android:layout_marginEnd="@dimen/divider_38px"
                 android:background="@drawable/bg_game_score"
                 android:gravity="center"
-                android:textColor="@color/color_FFFFA413"
+                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" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvGameLevel"
+                android:layout_width="@dimen/divider_153px"
+                android:layout_height="@dimen/divider_124px"
+                android:layout_marginStart="@dimen/divider_31px"
+                android:layout_marginTop="@dimen/divider_53px"
+                android:layout_marginEnd="@dimen/divider_38px"
+                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_constraintStart_toEndOf="@+id/gameLayout"
+                app:layout_constraintTop_toBottomOf="@+id/tvTime" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 </layout>

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

@@ -31,4 +31,8 @@
     <color name="color_FFA54A0B" tools:ignore="ResourceName">#FFA54A0B</color>
     <color name="color_966863FF" tools:ignore="ResourceName">#966863FF</color>
     <color name="color_DBFFFFFF" tools:ignore="ResourceName">#DBFFFFFF</color>
+    <color name="color_33000000" tools:ignore="ResourceName">#33000000</color>
+    <color name="color_FFFFF6CF" tools:ignore="ResourceName">#FFFFF6CF</color>
+    <color name="color_FFFFC00D" tools:ignore="ResourceName">#FFFFC00D</color>
+    <color name="color_FFA94A09" tools:ignore="ResourceName">#FFA94A09</color>
 </resources>

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

@@ -13,6 +13,7 @@
     <dimen name="divider_645px" tools:ignore="ResourceName">645px</dimen>
     <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
+    <dimen name="divider_588px" tools:ignore="ResourceName">588px</dimen>
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_552px" tools:ignore="ResourceName">552px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>

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

@@ -10,4 +10,6 @@
     <string name="scientific_principle" tools:ignore="ResourceName">科学原理</string>
     <string name="training_skill" tools:ignore="ResourceName">训练技能</string>
     <string name="game_introduction" tools:ignore="ResourceName">游戏简介</string>
+    <string name="score" tools:ignore="ResourceName">得分</string>
+    <string name="zero" tools:ignore="ResourceName">0</string>
 </resources>