Pārlūkot izejas kodu

1.替换游戏页面UI

王鹏鹏 2 gadi atpakaļ
vecāks
revīzija
44a1977d7a

+ 1 - 1
.idea/misc.xml

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

+ 4 - 3
game/src/main/java/com/yingyangfly/game/dialog/ExitGameDialog.kt

@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatImageView
 import androidx.fragment.app.DialogFragment
 import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ktx.immersionBar
@@ -17,8 +18,8 @@ import com.yingyangfly.game.R
  */
 class ExitGameDialog : DialogFragment() {
 
-    private var btnHome: AppCompatButton? = null
-    private var btnContinueThisLevel: AppCompatButton? = null
+    private var btnHome: AppCompatImageView? = null
+    private var btnContinueThisLevel: AppCompatImageView? = null
 
     var onDialogClickListener: ((bean: String) -> Unit)? = null
 
@@ -47,7 +48,7 @@ class ExitGameDialog : DialogFragment() {
             navigationBarColor(R.color.transparent)
         }
         val rootView = ViewTool.inflateFragmentPixels(
-            activity, R.layout.dialog_exit_game, container, 1194, 834
+            activity, R.layout.dialog_exit_game, container, 2388, 1668
         )
         findId(rootView)
         initData()

+ 1 - 1
game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -37,7 +37,7 @@ import com.yingyangfly.game.entity.GameBean
  */
 @Route(path = RouterUrlCommon.gameIntroduction)
 class GameIntroductionActivity :
-    BaseGameMVVMActivity<ActivityGameIntroductionBinding, GameIntroductionViewModel>(),
+    BaseMVVMActivity<ActivityGameIntroductionBinding, GameIntroductionViewModel>(),
     View.OnTouchListener {
 
     private var desn = ""

+ 33 - 45
game/src/main/res/layout/dialog_exit_game.xml

@@ -7,60 +7,48 @@
     android:background="@mipmap/icon_exit_game"
     tools:ignore="ResourceName">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/divider_656px"
-        android:layout_height="@dimen/divider_379px"
-        android:background="@mipmap/icon_bg_exit_game"
+    <FrameLayout
+        android:layout_width="@dimen/divider_1813px"
+        android:layout_height="@dimen/divider_968px"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvTitle"
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_97px"
-            android:gravity="center"
-            android:text="@string/are_you_sure_to_exit_the_training"
-            android:textColor="@color/color_FF5F3100"
-            android:textSize="@dimen/divider_48px"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_height="match_parent"
+            android:background="@mipmap/icon_bg_exit_game_dialog"
+            android:scaleType="centerInside" />
 
-        <androidx.appcompat.widget.AppCompatButton
-            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/determine"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_38px"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/btnHome"
+                android:layout_width="@dimen/divider_453px"
+                android:layout_height="@dimen/divider_204px"
+                android:layout_marginStart="@dimen/divider_343px"
+                android:layout_marginBottom="@dimen/divider_244px"
+                android:background="@mipmap/icon_back_home"
+                android:scaleType="centerInside"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatButton
-            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/cancellation"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_38px"
-            android:textStyle="bold"
-            app:layout_constraintStart_toEndOf="@+id/btnHome"
-            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/btnContinueThisLevel"
+                android:layout_width="@dimen/divider_453px"
+                android:layout_height="@dimen/divider_204px"
+                android:layout_marginEnd="@dimen/divider_347px"
+                android:layout_marginBottom="@dimen/divider_244px"
+                android:background="@mipmap/icon_continue_this_level"
+                android:scaleType="centerInside"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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


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


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


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


+ 4 - 1
game/src/main/res/values/dimens.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
+    <dimen name="divider_1813px" tools:ignore="ResourceName">1813px</dimen>
+    <dimen name="divider_968px" tools:ignore="ResourceName">968px</dimen>
     <dimen name="divider_874px" tools:ignore="ResourceName">874px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_767px" tools:ignore="ResourceName">767px</dimen>
@@ -36,6 +37,7 @@
     <dimen name="divider_472px" tools:ignore="ResourceName">472px</dimen>
     <dimen name="divider_467px" tools:ignore="ResourceName">467px</dimen>
     <dimen name="divider_464px" tools:ignore="ResourceName">464px</dimen>
+    <dimen name="divider_453px" tools:ignore="ResourceName">453px</dimen>
     <dimen name="divider_451px" tools:ignore="ResourceName">451px</dimen>
     <dimen name="divider_445px" tools:ignore="ResourceName">445px</dimen>
     <dimen name="divider_443px" tools:ignore="ResourceName">443px</dimen>
@@ -57,6 +59,7 @@
     <dimen name="divider_360px" tools:ignore="ResourceName">360px</dimen>
     <dimen name="divider_354px" tools:ignore="ResourceName">354px</dimen>
     <dimen name="divider_348px" tools:ignore="ResourceName">348px</dimen>
+    <dimen name="divider_347px" tools:ignore="ResourceName">347px</dimen>
     <dimen name="divider_345px" tools:ignore="ResourceName">345px</dimen>
     <dimen name="divider_343px" tools:ignore="ResourceName">343px</dimen>
     <dimen name="divider_340px" tools:ignore="ResourceName">340px</dimen>