1.替换游戏页面UI

.idea/misc.xml

@@ -520,7 +520,7 @@
         <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" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_result.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_game_result.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/item_game_result.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_request.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_doctor_details.xml" value="0.23697916666666666" />

game/src/main/java/com/yingyangfly/game/dialog/GameResultDialog.kt

@@ -2,11 +2,9 @@ package com.yingyangfly.game.dialog
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.fragment.app.DialogFragment
@@ -21,12 +19,13 @@ import com.yingyangfly.game.R
  */
 class GameResultDialog : DialogFragment() {
 
-    private var imageBackground: AppCompatImageView? = null
+    private var imageGameResult: AppCompatImageView? = null
     private var tvGameLevel: AppCompatTextView? = null
     private var tvTotalGameScore: AppCompatTextView? = null
     private var tvGameScore: AppCompatTextView? = null
-    private var btnHome: AppCompatButton? = null
-    private var btnContinueThisLevel: AppCompatButton? = null
+    private var btnHome: AppCompatImageView? = null
+    private var btnContinueThisLevel: AppCompatImageView? = null
+    private var imageType: AppCompatImageView? = null
     private var curLevel: String = ""
     private var curLevelScore: String = ""
     private var isPass: String = ""
@@ -48,6 +47,9 @@ class GameResultDialog : DialogFragment() {
         dialog?.setCanceledOnTouchOutside(true)
     }
 
+    /**
+     * @isPass 0成功 1失败 2退出 3通关结算 4超时失败
+     */
     fun setData(curLevel: String, totalScore: String, curLevelScore: String, isPass: String) {
         this.curLevel = curLevel
         this.totalScore = totalScore
@@ -74,7 +76,7 @@ class GameResultDialog : DialogFragment() {
             navigationBarColor(R.color.transparent)
         }
         val rootView = ViewTool.inflateFragmentPixels(
-            activity, R.layout.dialog_game_result, container, 2388, 1668
+            activity, R.layout.dialog_game_result, container, 1194, 834
         )
         findId(rootView)
         initData()
@@ -83,32 +85,42 @@ class GameResultDialog : DialogFragment() {
     }
 
     private fun findId(rootView: View) {
-        imageBackground = rootView.findViewById(R.id.imageBackground)
+        imageGameResult = rootView.findViewById(R.id.imageGameResult)
         tvGameLevel = rootView.findViewById(R.id.tvGameLevel)
         tvTotalGameScore = rootView.findViewById(R.id.tvTotalGameScore)
         tvGameScore = rootView.findViewById(R.id.tvGameScore)
         btnHome = rootView.findViewById(R.id.btnHome)
         btnContinueThisLevel = rootView.findViewById(R.id.btnContinueThisLevel)
+        imageType = rootView.findViewById(R.id.imageType)
     }
 
     @SuppressLint("SetTextI18n")
     private fun initData() {
-        if (TextUtils.equals("0", isPass)) {
-            imageBackground?.setBackgroundResource(R.mipmap.icon_game_success)
-        } else {
-            imageBackground?.setBackgroundResource(R.mipmap.icon_game_fail)
-        }
-        tvGameLevel?.text = if (TextUtils.equals("4", isPass)) {
-            "超时游戏失败"
-        } else {
-            "当前关卡：$curLevel"
-        }
+        tvGameLevel?.text = "当前关卡：$curLevel"
         tvTotalGameScore?.text = "累计得分：" + totalScore + "分"
         tvGameScore?.text = "本关得分：" + curLevelScore + "分"
-        btnContinueThisLevel!!.text = if (TextUtils.equals("0", isPass)) {
-            "下一关"
-        } else {
-            "继续本关"
+        when (isPass) {
+            // 0成功 1失败 2退出 3通关结算 4超时失败
+            "0" -> {
+                imageType!!.setBackgroundResource(R.mipmap.icon_game_result_success)
+                imageGameResult!!.setBackgroundResource(R.mipmap.icon_gasme_result_type_sueecee)
+                btnContinueThisLevel!!.setBackgroundResource(R.mipmap.icon_game_result_next)
+            }
+            "1" -> {
+                imageType!!.setBackgroundResource(R.mipmap.icon_gasme_result_type_failed)
+                imageGameResult!!.setBackgroundResource(R.mipmap.icon_game_result_failed)
+                btnContinueThisLevel!!.setBackgroundResource(R.mipmap.icon_game_result_continue)
+            }
+            "2" -> {
+
+            }
+            "3" -> {
+            }
+            "4" -> {
+                imageType!!.setBackgroundResource(R.mipmap.icon_timeout)
+                imageGameResult!!.setBackgroundResource(R.mipmap.icon_timer_out)
+                btnContinueThisLevel!!.setBackgroundResource(R.mipmap.icon_game_result_continue)
+            }
         }
     }
 

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

@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center"
     tools:ignore="ResourceName">
 
     <FrameLayout
-        android:id="@+id/gameLayout"
-        android:layout_width="@dimen/divider_656px"
-        android:layout_height="@dimen/divider_464px"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/imageBackground"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:id="@+id/imageGameResult"
+            android:layout_width="@dimen/divider_691px"
+            android:layout_height="@dimen/divider_610px"
+            android:layout_gravity="center_horizontal"
+            android:scaleType="centerInside" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_width="@dimen/divider_881px"
+            android:layout_height="@dimen/divider_546px"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/divider_306px"
+            android:background="@mipmap/icon_game_result_dialog">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvGameLevel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/divider_139px"
+                android:layout_marginTop="@dimen/divider_120px"
                 android:textColor="@color/color_FF5F3100"
                 android:textSize="@dimen/divider_42px"
                 android:textStyle="bold"
@@ -61,38 +62,32 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvGameLevel" />
 
-            <androidx.appcompat.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/btnHome"
-                android:layout_width="@dimen/divider_274px"
-                android:layout_height="@dimen/divider_96px"
-                android:layout_marginStart="@dimen/divider_44px"
-                android:layout_marginTop="@dimen/divider_39px"
-                android:background="@mipmap/icon_back_home"
-                android:gravity="center"
-                android:text="@string/homepage"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_38px"
-                android:textStyle="bold"
+                android:layout_width="@dimen/divider_396px"
+                android:layout_height="@dimen/divider_217px"
+                android:layout_marginStart="@dimen/divider_60px"
+                android:background="@mipmap/icon_game_result_back_home"
+                android:scaleType="centerInside"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvTotalGameScore" />
 
-            <androidx.appcompat.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/btnContinueThisLevel"
-                android:layout_width="@dimen/divider_274px"
-                android:layout_height="@dimen/divider_96px"
-                android:layout_marginStart="@dimen/divider_19px"
-                android:layout_marginTop="@dimen/divider_39px"
-                android:background="@mipmap/icon_continue_this_level"
-                android:gravity="center"
-                android:text="@string/continue_this_level"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_38px"
-                android:textStyle="bold"
+                android:layout_width="@dimen/divider_396px"
+                android:layout_height="@dimen/divider_217px"
+                android:scaleType="centerInside"
                 app:layout_constraintStart_toEndOf="@+id/btnHome"
                 app:layout_constraintTop_toBottomOf="@+id/tvTotalGameScore" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </FrameLayout>
-
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imageType"
+            android:layout_width="@dimen/divider_467px"
+            android:layout_height="@dimen/divider_151px"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/divider_254px"
+            android:scaleType="centerInside" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
+</LinearLayout>

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

@@ -8,6 +8,7 @@
     <dimen name="divider_1162px" tools:ignore="ResourceName">1162px</dimen>
     <dimen name="divider_1011px" tools:ignore="ResourceName">1011px</dimen>
     <dimen name="divider_968px" tools:ignore="ResourceName">968px</dimen>
+    <dimen name="divider_881px" tools:ignore="ResourceName">881px</dimen>
     <dimen name="divider_874px" tools:ignore="ResourceName">874px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_832px" tools:ignore="ResourceName">832px</dimen>
@@ -17,6 +18,7 @@
     <dimen name="divider_720px" tools:ignore="ResourceName">720px</dimen>
     <dimen name="divider_704px" tools:ignore="ResourceName">704px</dimen>
     <dimen name="divider_693px" tools:ignore="ResourceName">693px</dimen>
+    <dimen name="divider_691px" tools:ignore="ResourceName">691px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_684px" tools:ignore="ResourceName">684px</dimen>
     <dimen name="divider_668px" tools:ignore="ResourceName">668px</dimen>
@@ -26,6 +28,7 @@
     <dimen name="divider_645px" tools:ignore="ResourceName">645px</dimen>
     <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
     <dimen name="divider_611px" tools:ignore="ResourceName">611px</dimen>
+    <dimen name="divider_610px" tools:ignore="ResourceName">610px</dimen>
     <dimen name="divider_601px" tools:ignore="ResourceName">601px</dimen>
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_592px" tools:ignore="ResourceName">592px</dimen>
@@ -33,6 +36,7 @@
     <dimen name="divider_568px" tools:ignore="ResourceName">568px</dimen>
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_552px" tools:ignore="ResourceName">552px</dimen>
+    <dimen name="divider_546px" tools:ignore="ResourceName">546px</dimen>
     <dimen name="divider_544px" tools:ignore="ResourceName">544px</dimen>
     <dimen name="divider_540px" tools:ignore="ResourceName">540px</dimen>
     <dimen name="divider_536px" tools:ignore="ResourceName">536px</dimen>
@@ -63,6 +67,7 @@
     <dimen name="divider_413px" tools:ignore="ResourceName">413px</dimen>
     <dimen name="divider_409px" tools:ignore="ResourceName">409px</dimen>
     <dimen name="divider_404px" tools:ignore="ResourceName">404px</dimen>
+    <dimen name="divider_396px" tools:ignore="ResourceName">396px</dimen>
     <dimen name="divider_390px" tools:ignore="ResourceName">390px</dimen>
     <dimen name="divider_389px" tools:ignore="ResourceName">389px</dimen>
     <dimen name="divider_379px" tools:ignore="ResourceName">379px</dimen>
@@ -90,6 +95,7 @@
     <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_306px" tools:ignore="ResourceName">306px</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>