Browse Source

1.替换游戏页面UI

王鹏鹏 2 years ago
parent
commit
1e2a5a1cc6

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

@@ -109,7 +109,7 @@ class PlayGameActivity : BaseGameMVVMActivity<ActivityPlayGameBinding, PlayGameV
     override fun initListener() {
         binding {
             imagePause.setOnTouchListener(this@PlayGameActivity)
-            tvPauses.setOnTouchListener(this@PlayGameActivity)
+            iamgePauses.setOnTouchListener(this@PlayGameActivity)
             tvFullScreen.setOnTouchListener(this@PlayGameActivity)
             tvReduce.setOnTouchListener(this@PlayGameActivity)
         }
@@ -227,14 +227,14 @@ class PlayGameActivity : BaseGameMVVMActivity<ActivityPlayGameBinding, PlayGameV
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.imagePause || 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.iamgePauses || v.id == R.id.tvFullScreen || v.id == R.id.tvReduce) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 when (v.id) {
-                    R.id.imagePause, R.id.tvPauses -> {
+                    R.id.imagePause, R.id.iamgePauses -> {
                         runOnUiThread {
                             binding.webView.evaluateJavascript(
                                 "javascript:CallPauseGame()"
@@ -256,7 +256,7 @@ class PlayGameActivity : BaseGameMVVMActivity<ActivityPlayGameBinding, PlayGameV
                 }
             }
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.imagePause || 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.iamgePauses || v.id == R.id.tvFullScreen || v.id == R.id.tvReduce) {
                     v.startAnimation(getEndAnimation())
                 }
             }
@@ -602,7 +602,7 @@ class PlayGameActivity : BaseGameMVVMActivity<ActivityPlayGameBinding, PlayGameV
                 tvReduce.show(isReduce.not())
                 tvScores.show(isReduce.not())
                 tvTimes.show(isReduce.not())
-                tvPauses.show(isReduce.not())
+                iamgePauses.show(isReduce.not())
                 tvGameLevels.show(isReduce.not())
             }
             if (isReduce) {

+ 27 - 34
game/src/main/res/layout/activity_play_game.xml

@@ -146,81 +146,74 @@
                         android:layout_gravity="top"
                         android:visibility="gone">
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/tvPauses"
-                            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/iamgePauses"
+                            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/tvReduce"
-                            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_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: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_28px"
+                            android:textSize="@dimen/divider_56px"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvScores"
-                            android:layout_width="@dimen/divider_272px"
-                            android:layout_height="@dimen/divider_74px"
-                            android:layout_marginStart="@dimen/divider_58px"
-                            android:layout_marginTop="@dimen/divider_23px"
+                            android:layout_width="@dimen/divider_390px"
+                            android:layout_height="@dimen/divider_148px"
+                            android:layout_marginTop="@dimen/divider_46px"
                             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_32px"
-                            app:layout_constraintStart_toEndOf="@+id/tvPauses"
+                            android:textSize="@dimen/divider_64px"
+                            app:layout_constraintStart_toEndOf="@+id/iamgePauses"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvTimes"
-                            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:layout_width="@dimen/divider_390px"
+                            android:layout_height="@dimen/divider_148px"
+                            android:layout_marginStart="@dimen/divider_42px"
+                            android:layout_marginTop="@dimen/divider_46px"
                             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_38px"
+                            android:textSize="@dimen/divider_76px"
                             app:layout_constraintStart_toEndOf="@+id/tvScores"
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/tvGameLevels"
-                            android:layout_width="@dimen/divider_254px"
-                            android:layout_height="@dimen/divider_74px"
-                            android:layout_marginStart="@dimen/divider_17px"
-                            android:layout_marginTop="@dimen/divider_23px"
+                            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: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_32px"
+                            android:textSize="@dimen/divider_64px"
                             app:layout_constraintStart_toEndOf="@+id/tvTimes"
                             app:layout_constraintTop_toTopOf="parent" />
                     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -33,6 +33,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_544px" tools:ignore="ResourceName">544px</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>
@@ -41,6 +42,7 @@
     <dimen name="divider_525px" tools:ignore="ResourceName">525px</dimen>
     <dimen name="divider_522px" tools:ignore="ResourceName">522px</dimen>
     <dimen name="divider_512px" tools:ignore="ResourceName">512px</dimen>
+    <dimen name="divider_508px" tools:ignore="ResourceName">508px</dimen>
     <dimen name="divider_503px" tools:ignore="ResourceName">503px</dimen>
     <dimen name="divider_502px" tools:ignore="ResourceName">502px</dimen>
     <dimen name="divider_497px" tools:ignore="ResourceName">497px</dimen>
@@ -61,6 +63,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_390px" tools:ignore="ResourceName">390px</dimen>
     <dimen name="divider_389px" tools:ignore="ResourceName">389px</dimen>
     <dimen name="divider_379px" tools:ignore="ResourceName">379px</dimen>
     <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
@@ -75,6 +78,7 @@
     <dimen name="divider_343px" tools:ignore="ResourceName">343px</dimen>
     <dimen name="divider_340px" tools:ignore="ResourceName">340px</dimen>
     <dimen name="divider_339px" tools:ignore="ResourceName">339px</dimen>
+    <dimen name="divider_338px" tools:ignore="ResourceName">338px</dimen>
     <dimen name="divider_335px" tools:ignore="ResourceName">335px</dimen>
     <dimen name="divider_333px" tools:ignore="ResourceName">333px</dimen>
     <dimen name="divider_331px" tools:ignore="ResourceName">331px</dimen>