1.替换游戏页面UI

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

@@ -74,7 +74,7 @@ class GameResultDialog : DialogFragment() {
             navigationBarColor(R.color.transparent)
         }
         val rootView = ViewTool.inflateFragmentPixels(
-            activity, R.layout.dialog_game_result, container, 1194, 834
+            activity, R.layout.dialog_game_result, container, 2388, 1668
         )
         findId(rootView)
         initData()

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

@@ -29,6 +29,7 @@ import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseGameMVVMActivity
+import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.player.VoicePlayer
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.GsonUtil
@@ -47,7 +48,7 @@ import com.yingyangfly.game.utils.AndroidToJs
  * 玩游戏页面
  */
 @Route(path = RouterUrlCommon.playGame)
-class PlayGameActivity : BaseGameMVVMActivity<ActivityPlayGameBinding, PlayGameViewModel>(),
+class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewModel>(),
     View.OnTouchListener {
 
     /**

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

@@ -32,34 +32,34 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/imagePause"
-                android:layout_width="@dimen/divider_540px"
-                android:layout_height="@dimen/divider_568px"
-                android:layout_marginTop="@dimen/divider_8px"
+                android:layout_width="@dimen/divider_270px"
+                android:layout_height="@dimen/divider_284px"
+                android:layout_marginTop="@dimen/divider_4px"
                 android:background="@mipmap/bg_game_pause"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvFullScreen"
-                android:layout_width="@dimen/divider_339px"
-                android:layout_height="@dimen/divider_130px"
-                android:layout_marginTop="@dimen/divider_64px"
-                android:layout_marginEnd="@dimen/divider_64px"
+                android:layout_width="@dimen/divider_169px"
+                android:layout_height="@dimen/divider_75px"
+                android:layout_marginTop="@dimen/divider_32px"
+                android:layout_marginEnd="@dimen/divider_32px"
                 android:background="@drawable/bg_game_pause"
                 android:fontFamily="@font/lcb"
                 android:gravity="center"
                 android:includeFontPadding="false"
                 android:text="@string/full_screen"
                 android:textColor="@color/color_FFFFA916"
-                android:textSize="@dimen/divider_56px"
+                android:textSize="@dimen/divider_28px"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <FrameLayout
                 android:id="@+id/gameFrameLayout"
-                android:layout_width="@dimen/divider_379px"
+                android:layout_width="@dimen/divider_189px"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_28px"
+                android:layout_marginStart="@dimen/divider_14px"
                 android:background="@mipmap/icon_game_dialog"
                 android:minHeight="@dimen/divider_246px"
                 app:layout_constraintBottom_toTopOf="@+id/loadingImage"
@@ -72,49 +72,49 @@
                     android:layout_gravity="center_horizontal"
                     android:fontFamily="@font/lcb"
                     android:includeFontPadding="false"
-                    android:paddingStart="@dimen/divider_66px"
-                    android:paddingTop="@dimen/divider_56px"
-                    android:paddingEnd="@dimen/divider_62px"
-                    android:paddingBottom="@dimen/divider_160px"
+                    android:paddingStart="@dimen/divider_33px"
+                    android:paddingTop="@dimen/divider_28px"
+                    android:paddingEnd="@dimen/divider_31px"
+                    android:paddingBottom="@dimen/divider_80px"
                     android:textColor="@color/color_FFA94A09"
-                    android:textSize="@dimen/divider_50px" />
+                    android:textSize="@dimen/divider_25px" />
             </FrameLayout>
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/loadingImage"
-                android:layout_width="@dimen/divider_354px"
-                android:layout_height="@dimen/divider_568px"
-                android:layout_marginStart="@dimen/divider_42px"
-                android:layout_marginBottom="@dimen/divider_112px"
+                android:layout_width="@dimen/divider_176px"
+                android:layout_height="@dimen/divider_289px"
+                android:layout_marginStart="@dimen/divider_21px"
+                android:layout_marginBottom="@dimen/divider_56px"
                 android:scaleType="centerInside"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvPlay"
-                android:layout_width="@dimen/divider_1176px"
-                android:layout_height="@dimen/divider_130px"
-                android:layout_marginTop="@dimen/divider_64px"
+                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:fontFamily="@font/lcb"
                 android:gravity="center"
                 android:includeFontPadding="false"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_64px"
+                android:textSize="@dimen/divider_32px"
                 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="@dimen/divider_1162px"
-                android:layout_height="@dimen/divider_1011px"
-                android:layout_marginStart="@dimen/divider_62px"
-                android:layout_marginTop="@dimen/divider_208px"
-                android:layout_marginBottom="@dimen/divider_124px"
+                android:layout_width="@dimen/divider_767px"
+                android:layout_height="@dimen/divider_668px"
+                android:layout_marginStart="@dimen/divider_31px"
+                android:layout_marginTop="@dimen/divider_124px"
+                android:layout_marginBottom="@dimen/divider_42px"
                 android:theme="@style/Theme.MaterialComponents.NoActionBar"
                 app:cardBackgroundColor="@color/color_FFEBEDF0"
-                app:cardCornerRadius="@dimen/divider_98px"
+                app:cardCornerRadius="@dimen/divider_49px"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/tvTime"
                 app:layout_constraintStart_toEndOf="@+id/loadingImage"
@@ -148,72 +148,72 @@
 
                         <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/iamgePauses"
-                            android:layout_width="@dimen/divider_540px"
-                            android:layout_height="@dimen/divider_568px"
-                            android:layout_marginTop="@dimen/divider_8px"
+                            android:layout_width="@dimen/divider_270px"
+                            android:layout_height="@dimen/divider_284px"
+                            android:layout_marginTop="@dimen/divider_4px"
                             android:background="@mipmap/bg_game_pause"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvReduce"
-                            android:layout_width="@dimen/divider_338px"
-                            android:layout_height="@dimen/divider_130px"
-                            android:layout_marginStart="@dimen/divider_64px"
-                            android:layout_marginTop="@dimen/divider_64px"
-                            android:layout_marginEnd="@dimen/divider_64px"
+                            android:layout_width="@dimen/divider_169px"
+                            android:layout_height="@dimen/divider_65px"
+                            android:layout_marginStart="@dimen/divider_32px"
+                            android:layout_marginTop="@dimen/divider_32px"
+                            android:layout_marginEnd="@dimen/divider_32px"
                             android:background="@drawable/bg_game_pause"
                             android:fontFamily="@font/lcb"
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:text="@string/scale"
                             android:textColor="@color/color_FFFFA916"
-                            android:textSize="@dimen/divider_56px"
+                            android:textSize="@dimen/divider_28px"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvScores"
-                            android:layout_width="@dimen/divider_390px"
-                            android:layout_height="@dimen/divider_148px"
-                            android:layout_marginTop="@dimen/divider_46px"
+                            android:layout_width="@dimen/divider_195px"
+                            android:layout_height="@dimen/divider_74px"
+                            android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:text="@string/zero"
                             android:textColor="@android:color/white"
-                            android:textSize="@dimen/divider_64px"
+                            android:textSize="@dimen/divider_32px"
                             app:layout_constraintStart_toEndOf="@+id/iamgePauses"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvTimes"
-                            android:layout_width="@dimen/divider_390px"
-                            android:layout_height="@dimen/divider_148px"
-                            android:layout_marginStart="@dimen/divider_42px"
-                            android:layout_marginTop="@dimen/divider_46px"
+                            android:layout_width="@dimen/divider_195px"
+                            android:layout_height="@dimen/divider_74px"
+                            android:layout_marginStart="@dimen/divider_21px"
+                            android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:textColor="@android:color/white"
-                            android:textSize="@dimen/divider_76px"
+                            android:textSize="@dimen/divider_38px"
                             app:layout_constraintStart_toEndOf="@+id/tvScores"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvGameLevels"
-                            android:layout_width="@dimen/divider_390px"
-                            android:layout_height="@dimen/divider_148px"
-                            android:layout_marginStart="@dimen/divider_34px"
-                            android:layout_marginTop="@dimen/divider_46px"
+                            android:layout_width="@dimen/divider_195px"
+                            android:layout_height="@dimen/divider_74px"
+                            android:layout_marginStart="@dimen/divider_17px"
+                            android:layout_marginTop="@dimen/divider_23px"
                             android:background="@drawable/bg_full_game_text"
                             android:fontFamily="@font/lcb"
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:textColor="@android:color/white"
-                            android:textSize="@dimen/divider_64px"
+                            android:textSize="@dimen/divider_32px"
                             app:layout_constraintStart_toEndOf="@+id/tvTimes"
                             app:layout_constraintTop_toTopOf="parent" />
                     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -96,6 +96,7 @@
     <dimen name="divider_290px" tools:ignore="ResourceName">290px</dimen>
     <dimen name="divider_289px" tools:ignore="ResourceName">289px</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>
     <dimen name="divider_272px" tools:ignore="ResourceName">272px</dimen>
     <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
@@ -166,6 +167,7 @@
     <dimen name="divider_130px" tools:ignore="ResourceName">130px</dimen>
     <dimen name="divider_128px" tools:ignore="ResourceName">128px</dimen>
     <dimen name="divider_124px" tools:ignore="ResourceName">124px</dimen>
+    <dimen name="divider_123px" tools:ignore="ResourceName">123px</dimen>
     <dimen name="divider_120px" tools:ignore="ResourceName">120px</dimen>
     <dimen name="divider_119px" tools:ignore="ResourceName">119px</dimen>
     <dimen name="divider_118px" tools:ignore="ResourceName">118px</dimen>