Browse Source

1.添加获取权限功能

王鹏鹏 2 years ago
parent
commit
c5d5c04cbf

+ 2 - 0
.idea/misc.xml

@@ -24,6 +24,8 @@
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_check_button.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_data_content.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_fun_time.xml" value="0.2185" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_game_current_level.xml" value="0.2185" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_game_total_level.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_health_counseling.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_check_button.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_game_btn.xml" value="0.219" />

+ 1 - 1
home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -62,7 +62,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
             rvGame.layoutManager = GridLayoutManager(this@HomeActivity, 2)
             rvGame.adapter = gameAdapter
             gameAdapter.onGameImageClickListener = {
-                if (it.currentLevel == it.totalLevel) {
+                if (it.currentLevel == it.totalNum) {
                     TipDialogFragment.TipDialogBuilder()
                         .title("当前游戏已通关,是否重新开始?", 0)
                         .leftBtnText("确定")

+ 1 - 1
home/src/main/java/com/yingyangfly/home/entity/Record.kt

@@ -23,7 +23,7 @@ data class Record(
     val updateBy: String,
     val updateTime: String,
     val currentLevel: String,//当前等级
-    val totalLevel: String,//  总共等级
+    val totalNum: String,//  总共等级
     val status: String, //0 通关
     val duration: String, //0 持续时长
     val playClass: String//游戏玩耍分类  其他 是可以继续 关卡,A 是只有一关

+ 12 - 0
home/src/main/res/drawable/bg_game_current_level.xml

@@ -0,0 +1,12 @@
+<?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_17px" />
+    <solid android:color="@color/color_4A76FF" />
+    <padding
+        android:bottom="@dimen/divider_3px"
+        android:left="@dimen/divider_14px"
+        android:right="@dimen/divider_14px"
+        android:top="@dimen/divider_4px" />
+</shape>

+ 13 - 0
home/src/main/res/drawable/bg_game_total_level.xml

@@ -0,0 +1,13 @@
+<?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_17px" />
+    <solid android:color="@android:color/white" />
+
+    <padding
+        android:left="@dimen/divider_14px"
+        android:top="@dimen/divider_4px"
+        android:bottom="@dimen/divider_3px"
+        android:right="@dimen/divider_9px"/>
+</shape>

+ 1 - 1
home/src/main/res/layout/activity_home.xml

@@ -500,7 +500,7 @@
                             android:layout_width="@dimen/divider_140px"
                             android:layout_height="@dimen/divider_50px"
                             android:layout_marginEnd="@dimen/divider_29px"
-                            android:background="@drawable/bg_home_check_button"
+                            android:background="@drawable/bg_home_game_btn"
                             android:text="@string/view"
                             android:textColor="@android:color/white"
                             android:textSize="@dimen/divider_28px" />

+ 20 - 9
home/src/main/res/layout/item_game.xml

@@ -31,15 +31,26 @@
                 app:loadHeadImg="@{data.gameCoverImage}" />
 
             <TextView
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|left"
+                android:layout_marginStart="@dimen/divider_21px"
+                android:layout_marginTop="@dimen/divider_14px"
+                android:background="@drawable/bg_game_current_level"
+                android:text='@{"第"+data.currentLevel+"关"}'
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_14px" />
+
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right|top"
-                android:gravity="right"
-                android:paddingTop="@dimen/divider_8px"
-                android:paddingEnd="@dimen/divider_8px"
-                android:text='@{data.currentLevel+"/10"}'
-                android:textColor="@color/color_FF821EFF"
-                android:textSize="@dimen/divider_24px" />
+                android:layout_gravity="top|right"
+                android:layout_marginTop="@dimen/divider_14px"
+                android:layout_marginEnd="@dimen/divider_21px"
+                android:background="@drawable/bg_game_total_level"
+                android:text='@{"总关卡"+data.totalNum}'
+                android:textColor="@color/color_FF416AFF"
+                android:textSize="@dimen/divider_14px" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -48,7 +59,7 @@
                 android:background="@drawable/bg_buttom_game"
                 android:gravity="center"
                 android:text="@{data.gameName}"
-                android:textColor="@color/color_FF821EFF"
+                android:textColor="@color/color_4A76FF"
                 android:textSize="@dimen/divider_24px"
                 android:textStyle="bold" />
 

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

@@ -59,4 +59,8 @@
     <color name="color_FFDB9CFF" tools:ignore="ResourceName">#FFDB9CFF</color>
     <color name="color_FFBCAFFF" tools:ignore="ResourceName">#FFBCAFFF</color>
     <color name="color_FFFF8272" tools:ignore="ResourceName">#FFFF8272</color>
+    <color name="color_B5FF524A" tools:ignore="ResourceName">#B5FF524A</color>
+    <color name="color_FFA6A9FF" tools:ignore="ResourceName">#FFA6A9FF</color>
+    <color name="color_FF88AAFF" tools:ignore="ResourceName">#FF88AAFF</color>
+    <color name="color_4A76FF" tools:ignore="ResourceName">#4A76FF</color>
 </resources>