1.修改首页UI

.idea/misc.xml

@@ -20,6 +20,7 @@
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/drawable-v21/cv_bg_material.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_layout_calendar_view.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_week_bar.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/anim_loading.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_buttom_game.xml" value="0.219" />
         <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" />
@@ -29,6 +30,7 @@
         <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" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_leve.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_task_btn.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_task_progress.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_title.xml" value="0.2185" />

baselib/src/main/java/com/yingyangfly/baselib/dialog/TaskFragment.kt

@@ -73,7 +73,7 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
 
     private fun init() {
         Glide.with(this)
-            .load("file:///android_asset/home_doctor.gif")
+            .load("file:///android_asset/fish.GIF")
             .into(fishImage!!)
         tvContent?.text = taskDesn
     }

home/src/main/res/drawable/anim_loading.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:oneshot="false"
+    tools:ignore="ResourceName">
+    <item
+        android:drawable="@mipmap/icon_dolphin_four"
+        android:duration="280" />
+    <item
+        android:drawable="@mipmap/icon_dolphin_five"
+        android:duration="280" />
+    <item
+        android:drawable="@mipmap/icon_dolphin_six"
+        android:duration="280" />
+    <item
+        android:drawable="@mipmap/icon_dolphin_seven"
+        android:duration="280" />
+</animation-list>

home/src/main/res/drawable/bg_game_total_level.xml

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list 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_CCFFFFFF" />
 
-    <padding
-        android:left="@dimen/divider_14px"
-        android:top="@dimen/divider_4px"
-        android:bottom="@dimen/divider_3px"
-        android:right="@dimen/divider_9px"/>
-</shape>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="@dimen/divider_26px" />
+            <gradient
+                android:angle="180"
+                android:endColor="@color/color_FFFF8272"
+                android:startColor="@color/color_FFFFC036"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

home/src/main/res/drawable/bg_home_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_FF92ACFF" />
+    <padding
+        android:bottom="@dimen/divider_3px"
+        android:left="@dimen/divider_15px"
+        android:right="@dimen/divider_15px"
+        android:top="@dimen/divider_3px" />
+</shape>

home/src/main/res/drawable/bg_train.xml

@@ -6,9 +6,9 @@
     <item>
         <shape android:shape="rectangle">
             <gradient
-                android:angle="180"
-                android:endColor="@color/color_ff4571ff"
-                android:startColor="@color/color_ff8fafff"
+                android:angle="90"
+                android:endColor="@color/color_FFA6A9FF"
+                android:startColor="@color/color_FF88AAFF"
                 android:type="linear"
                 android:useLevel="true" />
         </shape>

home/src/main/res/layout/activity_home.xml

@@ -514,6 +514,7 @@
             android:id="@+id/fishImage"
             android:layout_width="@dimen/divider_180px"
             android:layout_height="@dimen/divider_289px"
-            android:layout_gravity="bottom|left" />
+            android:layout_gravity="bottom|left"
+            android:visibility="gone" />
     </FrameLayout>
 </layout>

home/src/main/res/layout/item_game.xml

@@ -12,6 +12,7 @@
     </data>
 
     <androidx.cardview.widget.CardView
+        android:id="@+id/gameLayout"
         android:layout_width="@dimen/divider_200px"
         android:layout_height="@dimen/divider_245px"
         android:layout_marginStart="@dimen/divider_21px"
@@ -23,64 +24,57 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <FrameLayout
-                android:id="@+id/gameLayout"
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/gameImage"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_200px"
+                app:isCircle="@{false}"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:isCircle="@{false}"
-                    app:loadHeadImg="@{data.gameCoverImage}" />
-
-                <TextView
-                    android:layout_width="@dimen/divider_158px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:layout_marginTop="@dimen/divider_14px"
-                    android:layout_marginBottom="@dimen/divider_9px"
-                    android:background="@drawable/bg_game_total_level"
-                    android:gravity="right"
-                    android:paddingEnd="@dimen/divider_16px"
-                    android:text='@{"总关卡"+data.totalNum}'
-                    android:textColor="@color/color_FF416AFF"
-                    android:textSize="@dimen/divider_14px" />
-
-                <TextView
-                    android:layout_width="@dimen/divider_79px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|left"
-                    android:layout_marginStart="@dimen/divider_21px"
-                    android:layout_marginTop="@dimen/divider_14px"
-                    android:layout_marginBottom="@dimen/divider_9px"
-                    android:background="@drawable/bg_game_current_level"
-                    android:gravity="center"
-                    android:text='@{"第"+data.currentLevel+"关"}'
-                    android:textColor="@android:color/white"
-                    android:textSize="@dimen/divider_14px" />
-
-            </FrameLayout>
+                app:layout_constraintTop_toTopOf="parent"
+                app:loadHeadImg="@{data.gameCoverImage}" />
 
             <TextView
+                android:layout_width="@dimen/divider_108px"
+                android:layout_height="@dimen/divider_46px"
+                android:background="@mipmap/bg_game_type"
+                android:gravity="center"
+                android:text="@{data.gameType}"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_14px"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:background="@drawable/bg_home_buttom_game"
                 android:gravity="center"
-                android:text="@{data.gameName}"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px"
-                android:textStyle="bold"
+                android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/gameLayout" />
+                app:layout_constraintTop_toBottomOf="@+id/gameImage">
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@{data.gameName}"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_24px"
+                    android:textStyle="bold" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_16px"
+                    android:background="@drawable/bg_home_level"
+                    android:text='@{data.currentLevel+"-"+data.totalNum}'
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_14px" />
 
+            </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </layout>

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

@@ -64,4 +64,5 @@
     <color name="color_FF88AAFF" tools:ignore="ResourceName">#FF88AAFF</color>
     <color name="color_4A76FF" tools:ignore="ResourceName">#4A76FF</color>
     <color name="color_CCFFFFFF" tools:ignore="ResourceName">#CCFFFFFF</color>
+    <color name="color_FF92ACFF" tools:ignore="ResourceName">#FF92ACFF</color>
 </resources>