1.替换游戏页面UI

.idea/misc.xml

@@ -701,7 +701,7 @@
   <component name="VisualizationToolProject">
     <option name="state">
       <ProjectState>
-        <option name="scale" value="0.42051756007393715" />
+        <option name="scale" value="0.264" />
       </ProjectState>
     </option>
   </component>

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

@@ -24,8 +24,11 @@ import com.bumptech.glide.Glide
 import com.yingyangfly.baselib.bean.GameDataBean
 import com.yingyangfly.baselib.bean.GetSaveGameRecordBean
 import com.yingyangfly.baselib.db.VoicePlayerBean
-import com.yingyangfly.baselib.ext.*
-import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
+import com.yingyangfly.baselib.ext.getEndAnimation
+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.player.VoicePlayer
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.GsonUtil
@@ -44,7 +47,7 @@ import com.yingyangfly.game.utils.AndroidToJs
  * 玩游戏页面
  */
 @Route(path = RouterUrlCommon.playGame)
-class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewModel>(),
+class PlayGameActivity : BaseGameMVVMActivity<ActivityPlayGameBinding, PlayGameViewModel>(),
     View.OnTouchListener {
 
     /**
@@ -105,7 +108,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     @SuppressLint("ClickableViewAccessibility")
     override fun initListener() {
         binding {
-            tvPause.setOnTouchListener(this@PlayGameActivity)
+            imagePause.setOnTouchListener(this@PlayGameActivity)
             tvPauses.setOnTouchListener(this@PlayGameActivity)
             tvFullScreen.setOnTouchListener(this@PlayGameActivity)
             tvReduce.setOnTouchListener(this@PlayGameActivity)
@@ -224,14 +227,14 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.tvPause || v.id == R.id.tvPauses || v.id == R.id.tvFullScreen || v.id == R.id.tvReduce) {
+                if (v.id == R.id.imagePause || v.id == R.id.tvPauses || v.id == R.id.tvFullScreen || v.id == R.id.tvReduce) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 when (v.id) {
-                    R.id.tvPause, R.id.tvPauses -> {
+                    R.id.imagePause, R.id.tvPauses -> {
                         runOnUiThread {
                             binding.webView.evaluateJavascript(
                                 "javascript:CallPauseGame()"
@@ -253,7 +256,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 }
             }
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.tvPause || v.id == R.id.tvPauses || v.id == R.id.tvFullScreen || v.id == R.id.tvReduce) {
+                if (v.id == R.id.imagePause || v.id == R.id.tvPauses || v.id == R.id.tvFullScreen || v.id == R.id.tvReduce) {
                     v.startAnimation(getEndAnimation())
                 }
             }

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

@@ -30,43 +30,36 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvPause"
-                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:background="@drawable/bg_game_pause"
-                android:fontFamily="@font/lcb"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="@string/pause_help"
-                android:textColor="@color/color_FFFFA916"
-                android:textSize="@dimen/divider_28px"
+            <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: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_169px"
-                android:layout_height="@dimen/divider_65px"
-                android:layout_marginTop="@dimen/divider_32px"
-                android:layout_marginEnd="@dimen/divider_32px"
+                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: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_28px"
+                android:textSize="@dimen/divider_56px"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <FrameLayout
                 android:id="@+id/gameFrameLayout"
-                android:layout_width="@dimen/divider_189px"
+                android:layout_width="@dimen/divider_379px"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_14px"
+                android:layout_marginStart="@dimen/divider_28px"
                 android:background="@mipmap/icon_game_dialog"
                 android:minHeight="@dimen/divider_246px"
                 app:layout_constraintBottom_toTopOf="@+id/loadingImage"
@@ -79,49 +72,49 @@
                     android:layout_gravity="center_horizontal"
                     android:fontFamily="@font/lcb"
                     android:includeFontPadding="false"
-                    android:paddingStart="@dimen/divider_33px"
-                    android:paddingTop="@dimen/divider_28px"
-                    android:paddingEnd="@dimen/divider_31px"
-                    android:paddingBottom="@dimen/divider_80px"
+                    android:paddingStart="@dimen/divider_66px"
+                    android:paddingTop="@dimen/divider_56px"
+                    android:paddingEnd="@dimen/divider_62px"
+                    android:paddingBottom="@dimen/divider_160px"
                     android:textColor="@color/color_FFA94A09"
-                    android:textSize="@dimen/divider_25px" />
+                    android:textSize="@dimen/divider_50px" />
             </FrameLayout>
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/loadingImage"
-                android:layout_width="@dimen/divider_176px"
-                android:layout_height="@dimen/divider_289px"
-                android:layout_marginStart="@dimen/divider_21px"
-                android:layout_marginBottom="@dimen/divider_61px"
+                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: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_588px"
-                android:layout_height="@dimen/divider_65px"
-                android:layout_marginTop="@dimen/divider_32px"
+                android:layout_width="@dimen/divider_1176px"
+                android:layout_height="@dimen/divider_130px"
+                android:layout_marginTop="@dimen/divider_64px"
                 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_32px"
+                android:textSize="@dimen/divider_64px"
                 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_767px"
-                android:layout_height="@dimen/divider_668px"
-                android:layout_marginStart="@dimen/divider_31px"
-                android:layout_marginTop="@dimen/divider_104px"
-                android:layout_marginBottom="@dimen/divider_62px"
+                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:theme="@style/Theme.MaterialComponents.NoActionBar"
-                app:cardBackgroundColor="@android:color/white"
-                app:cardCornerRadius="@dimen/divider_49px"
+                app:cardBackgroundColor="@color/color_FFEBEDF0"
+                app:cardCornerRadius="@dimen/divider_98px"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/tvTime"
                 app:layout_constraintStart_toEndOf="@+id/loadingImage"

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

@@ -14,8 +14,8 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/loadingImage"
-        android:layout_width="@dimen/divider_360px"
-        android:layout_height="@dimen/divider_416px"
+        android:layout_width="@dimen/divider_720px"
+        android:layout_height="@dimen/divider_832px"
         android:layout_gravity="bottom|start"
         android:layout_marginTop="@dimen/divider_243px" />
 
@@ -23,6 +23,7 @@
         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">
 
         <androidx.appcompat.widget.AppCompatImageView

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

@@ -45,4 +45,5 @@
     <color name="color_FF4F6548" tools:ignore="ResourceName">#FF4F6548</color>
     <color name="color_FFAA5413" tools:ignore="ResourceName">#FFAA5413</color>
     <color name="color_FFFBD641" tools:ignore="ResourceName">#FFFBD641</color>
+    <color name="color_FFEBEDF0" tools:ignore="ResourceName">#FFEBEDF0</color>
 </resources>

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

@@ -4,12 +4,17 @@
     <dimen name="divider_1813px" tools:ignore="ResourceName">1813px</dimen>
     <dimen name="divider_1184px" tools:ignore="ResourceName">1184px</dimen>
     <dimen name="divider_1179px" tools:ignore="ResourceName">1179px</dimen>
+    <dimen name="divider_1176px" tools:ignore="ResourceName">1176px</dimen>
+    <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_874px" tools:ignore="ResourceName">874px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
+    <dimen name="divider_832px" tools:ignore="ResourceName">832px</dimen>
     <dimen name="divider_767px" tools:ignore="ResourceName">767px</dimen>
     <dimen name="divider_763px" tools:ignore="ResourceName">763px</dimen>
     <dimen name="divider_747px" tools:ignore="ResourceName">747px</dimen>
+    <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_689px" tools:ignore="ResourceName">689px</dimen>
@@ -23,9 +28,12 @@
     <dimen name="divider_611px" tools:ignore="ResourceName">611px</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>
     <dimen name="divider_588px" tools:ignore="ResourceName">588px</dimen>
+    <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_540px" tools:ignore="ResourceName">540px</dimen>
     <dimen name="divider_536px" tools:ignore="ResourceName">536px</dimen>
     <dimen name="divider_535px" tools:ignore="ResourceName">535px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
@@ -115,6 +123,7 @@
     <dimen name="divider_214px" tools:ignore="ResourceName">214px</dimen>
     <dimen name="divider_213px" tools:ignore="ResourceName">213px</dimen>
     <dimen name="divider_212px" tools:ignore="ResourceName">212px</dimen>
+    <dimen name="divider_208px" tools:ignore="ResourceName">208px</dimen>
     <dimen name="divider_207px" tools:ignore="ResourceName">207px</dimen>
     <dimen name="divider_203px" tools:ignore="ResourceName">203px</dimen>
     <dimen name="divider_201px" tools:ignore="ResourceName">201px</dimen>

login/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.yingyang.login">
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 录音权限 -->
+
     <application>
         <activity
             android:name="com.yingyang.login.ui.login.LoginActivity"

login/src/main/manifest/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.yingyang.login">
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 录音权限 -->
+
     <application>
         <activity
             android:name="com.yingyang.login.ui.login.LoginActivity"