Browse Source

1.替换游戏页面UI

王鹏鹏 2 years ago
parent
commit
813c84be58

+ 1 - 1
.idea/misc.xml

@@ -517,7 +517,7 @@
         <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.3953084274543875" />
         <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_count_down.xml" value="0.5676056338028169" />
         <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.4" />

+ 7 - 1
game/src/main/java/com/yingyangfly/game/dialog/CountdownDialog.kt

@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
 import androidx.fragment.app.DialogFragment
 import com.bumptech.glide.Glide
 import com.gyf.immersionbar.BarHide
@@ -26,10 +27,12 @@ class CountdownDialog : DialogFragment() {
 
     private lateinit var rxTimer: RxTimer
     private var url = ""
+    private var title: String = ""
     private var gameImage: AppCompatImageView? = null
     private var imageCountdown: AppCompatImageView? = null
     var onDialogClickListener: ((bean: String) -> Unit)? = null
     private var loadingImage: AppCompatImageView? = null
+    private var tvTitle: AppCompatTextView? = null
     private var countdown = false
     private var loadingOver = false
 
@@ -39,8 +42,9 @@ class CountdownDialog : DialogFragment() {
         dialog?.setCanceledOnTouchOutside(true)
     }
 
-    fun setContentBackground(url: String) {
+    fun setContentBackground(url: String, title: String) {
         this.url = url
+        this.title = title
     }
 
     override fun onStart() {
@@ -72,6 +76,8 @@ class CountdownDialog : DialogFragment() {
     }
 
     private fun findId(rootView: View) {
+        tvTitle = rootView.findViewById(R.id.tvTitle)
+        tvTitle?.text = title
         gameImage = rootView.findViewById(R.id.gameImage)
         ImgUtil.loadGameBackground(requireActivity(), url, gameImage!!)
         imageCountdown = rootView.findViewById(R.id.imageCountdown)

+ 1 - 1
game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -270,7 +270,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         if (newStartGame) {
             newStartGame = false
             val countdownDialog = CountdownDialog()
-            countdownDialog.setContentBackground(gameInbetweenImage)
+            countdownDialog.setContentBackground(gameInbetweenImage, gameShortDesn)
             countdownDialog.onDialogClickListener = {
                 if (loadingOver) {
                     callStartGame()

+ 25 - 9
game/src/main/res/layout/dialog_count_down.xml

@@ -19,24 +19,40 @@
         android:layout_gravity="bottom|start"
         android:layout_marginTop="@dimen/divider_243px" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <FrameLayout
         android:layout_width="@dimen/divider_1184px"
         android:layout_height="@dimen/divider_1179px"
         android:layout_gravity="center"
-        android:layout_marginStart="@dimen/divider_240px"
-        android:background="@mipmap/icon_bg_exit_game">
+        android:layout_marginStart="@dimen/divider_240px">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@mipmap/icon_bg_exit_game"
+            android:scaleType="centerInside" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageCountdown"
             android:layout_width="@dimen/divider_360px"
             android:layout_height="@dimen/divider_527px"
-            android:scaleType="centerInside"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/divider_200px"
+            android:scaleType="centerInside" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="@dimen/divider_679px"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|start"
+            android:layout_marginStart="@dimen/divider_130px"
+            android:layout_marginBottom="@dimen/divider_70px"
+            android:fontFamily="@font/lcb"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:textColor="@color/color_FFC02F21"
+            android:textSize="@dimen/divider_72px" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
 
 
 </FrameLayout>

BIN
game/src/main/res/mipmap-xxhdpi/icon_bg_exit_game.png


+ 1 - 0
game/src/main/res/values/colors.xml

@@ -47,4 +47,5 @@
     <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>
+    <color name="color_FFC02F21" tools:ignore="ResourceName">#FFC02F21</color>
 </resources>