王鹏鹏 2 лет назад
Родитель
Сommit
519dbe4276

+ 2 - 1
.idea/misc.xml

@@ -483,6 +483,7 @@
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_evaluate.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_loading.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/rv_empty.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_back.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_introduction.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_loading.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_pause.xml" value="0.151" />
@@ -493,7 +494,7 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_start_game.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_loading.xml" value="0.22239583333333332" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.22239583333333332" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.4" />
         <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.536" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_count_down.xml" value="0.23697916666666666" />

+ 38 - 2
game/src/main/java/com/yingyangfly/game/settlement/GameSettlementActivity.kt

@@ -1,8 +1,14 @@
 package com.yingyangfly.game.settlement
 
+import android.annotation.SuppressLint
+import android.view.MotionEvent
+import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyangfly.baselib.ext.getEndAnimation
+import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.game.R
 import com.yingyangfly.game.databinding.ActivityGameSettlementBinding
 
 /**
@@ -10,16 +16,46 @@ import com.yingyangfly.game.databinding.ActivityGameSettlementBinding
  */
 @Route(path = RouterUrlCommon.gameSettlement)
 class GameSettlementActivity :
-    BaseMVVMActivity<ActivityGameSettlementBinding, GameSettlementViewModel>() {
+    BaseMVVMActivity<ActivityGameSettlementBinding, GameSettlementViewModel>(),
+    View.OnTouchListener {
+
     override fun initViews() {
 
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun initListener() {
-
+        binding {
+            backLayout.setOnTouchListener(this@GameSettlementActivity)
+        }
     }
 
     override fun initData() {
 
     }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouch(v: View, event: MotionEvent): Boolean {
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                if (v.id == R.id.backLayout) {
+                    v.startAnimation(getScaleAnimation())
+                }
+            }
+            MotionEvent.ACTION_UP -> {
+                v.startAnimation(getEndAnimation())
+                if (v.id == R.id.backLayout) {
+                    runOnUiThread {
+                        finish()
+                    }
+                }
+            }
+            MotionEvent.ACTION_CANCEL -> {
+                if (v.id == R.id.backLayout) {
+                    v.startAnimation(getEndAnimation())
+                }
+            }
+        }
+        return true
+    }
 }

+ 10 - 0
game/src/main/res/drawable/bg_game_back.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_29px" />
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 99 - 1
game/src/main/res/layout/activity_game_settlement.xml

@@ -1,11 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_game_introduction">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/backLayout"
+            android:layout_width="@dimen/divider_148px"
+            android:layout_height="@dimen/divider_58px"
+            android:layout_marginStart="@dimen/divider_32px"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:background="@drawable/bg_game_back"
+            android:gravity="center"
+            android:text="@string/game_back"
+            android:textColor="@color/color_FF4A75FF"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            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_665px"
+            android:layout_height="@dimen/divider_451px"
+            android:layout_marginStart="@dimen/divider_112px"
+            android:layout_marginTop="@dimen/divider_71px"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_28px"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/backLayout">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/gameImage"
+                    android:layout_width="@dimen/divider_106px"
+                    android:layout_height="@dimen/divider_106px"
+                    android:layout_marginStart="@dimen/divider_26px"
+                    android:layout_marginTop="@dimen/divider_32px"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tvGameName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_26px"
+                    android:layout_marginTop="@dimen/divider_45px"
+                    android:textColor="@color/color_FFFF6F6F"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/gameImage"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="抓小羊" />
+
+                <TextView
+                    android:id="@+id/tvGameType"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_26px"
+                    android:layout_marginTop="@dimen/divider_5px"
+                    android:textColor="@color/color_FF5A5A5A"
+                    android:textSize="@dimen/divider_24px"
+                    app:layout_constraintStart_toEndOf="@+id/gameImage"
+                    app:layout_constraintTop_toBottomOf="@+id/tvGameName"
+                    tools:text="按顺序记忆" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/tvGameLevel"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="@dimen/divider_26px"
+                    android:layout_marginTop="@dimen/divider_20px"
+                    android:layout_marginEnd="@dimen/divider_28px"
+                    android:layout_marginBottom="@dimen/divider_36px"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/gameImage" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/gameStatuslayout"
+            android:layout_width="@dimen/divider_294px"
+            android:layout_height="@dimen/divider_451px"
+            android:layout_marginStart="@dimen/divider_32px"
+            android:layout_marginTop="@dimen/divider_71px"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_28px"
+            app:layout_constraintStart_toEndOf="@+id/gamelayout"
+            app:layout_constraintTop_toBottomOf="@+id/backLayout">
+
+
+        </com.google.android.material.card.MaterialCardView>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -14,4 +14,8 @@
     <color name="transparent" tools:ignore="ResourceName">#00000000</color><!-- 透明   -->
     <color name="color_FF5F3100" tools:ignore="ResourceName">#FF5F3100</color>
     <color name="color_E0FFFFFF" tools:ignore="ResourceName">#E0FFFFFF</color>
+    <color name="color_FF979797" tools:ignore="ResourceName">#FF979797</color>
+    <color name="color_FF4A75FF" tools:ignore="ResourceName">#FF4A75FF</color>
+    <color name="color_FFFF6F6F" tools:ignore="ResourceName">#FFFF6F6F</color>
+    <color name="color_FF5A5A5A" tools:ignore="ResourceName">#FF5A5A5A</color>
 </resources>

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

@@ -7,6 +7,7 @@
     <dimen name="divider_693px" tools:ignore="ResourceName">693px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_684px" tools:ignore="ResourceName">684px</dimen>
+    <dimen name="divider_665px" tools:ignore="ResourceName">665px</dimen>
     <dimen name="divider_656px" tools:ignore="ResourceName">656px</dimen>
     <dimen name="divider_645px" tools:ignore="ResourceName">645px</dimen>
     <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
@@ -20,6 +21,7 @@
     <dimen name="divider_502px" tools:ignore="ResourceName">502px</dimen>
     <dimen name="divider_472px" tools:ignore="ResourceName">472px</dimen>
     <dimen name="divider_464px" tools:ignore="ResourceName">464px</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>
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
@@ -56,6 +58,7 @@
     <dimen name="divider_307px" tools:ignore="ResourceName">307px</dimen>
     <dimen name="divider_299px" tools:ignore="ResourceName">299px</dimen>
     <dimen name="divider_296px" tools:ignore="ResourceName">296px</dimen>
+    <dimen name="divider_294px" tools:ignore="ResourceName">294px</dimen>
     <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>
@@ -106,6 +109,7 @@
     <dimen name="divider_154px" tools:ignore="ResourceName">154px</dimen>
     <dimen name="divider_153px" tools:ignore="ResourceName">153px</dimen>
     <dimen name="divider_151px" tools:ignore="ResourceName">151px</dimen>
+    <dimen name="divider_148px" tools:ignore="ResourceName">148px</dimen>
     <dimen name="divider_142px" tools:ignore="ResourceName">142px</dimen>
     <dimen name="divider_141px" tools:ignore="ResourceName">141px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>

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

@@ -6,4 +6,5 @@
     <string name="are_you_sure_to_exit_the_training" tools:ignore="ResourceName">确定退出训练吗?</string>
     <string name="determine" tools:ignore="ResourceName">确定</string>
     <string name="cancellation" tools:ignore="ResourceName">取消</string>
+    <string name="game_back">返回</string>
 </resources>