1.修改首页UI

.idea/misc.xml

@@ -18,12 +18,14 @@
         <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_health_counseling.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" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_play_porpoise.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_professional_evaluation.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_train.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/shape_ract_gold.xml" value="0.2185" />
-        <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_home.xml" value="0.28278433809819764" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/activity_home.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_live_broadcast_list.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/layout/activity_video_player.xml" value="0.22826086956521738" />

baselib/src/main/java/com/yingyangfly/baselib/utils/ViewTool.java

@@ -108,11 +108,11 @@ public class ViewTool {
                     fllp.bottomMargin = (int) (((float) fllp.bottomMargin)
                             / height * heightPixels);
                 }
-                if (view instanceof TextView || view instanceof AppCompatTextView) {
+                if (view instanceof TextView) {
                     TextView textView = (TextView) view;
                     float sp = (float) (height) / (float) (heightPixels);
                     textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, textView.getTextSize() / sp);
-                } else if (view instanceof Button || view instanceof AppCompatButton) {
+                } else if (view instanceof Button) {
                     Button button = (Button) view;
                     float sp = (float) (height) / (float) (heightPixels);
                     button.setTextSize(TypedValue.COMPLEX_UNIT_PX, button.getTextSize() / sp);

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/divider_33px" />
+            <gradient
+                android:angle="90"
+                android:endColor="@color/color_FFFFC036"
+                android:startColor="@color/color_FFFFBD72"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <solid android:color="@color/color_FF6E5FFF" />
+    <corners android:radius="@dimen/divider_23px" />
+</shape>

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

@@ -179,7 +179,7 @@
         <androidx.cardview.widget.CardView
             android:id="@+id/leftLayout"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="@dimen/divider_616px"
             android:layout_marginStart="@dimen/divider_40px"
             android:layout_marginTop="@dimen/divider_55px"
             android:layout_marginBottom="@dimen/divider_48px"
@@ -190,25 +190,71 @@
             app:layout_constraintRight_toLeftOf="@id/rightLayout"
             app:layout_constraintTop_toBottomOf="@+id/titleLayout">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
 
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="@dimen/divider_37px"
+                    android:layout_marginTop="@dimen/divider_21px"
+                    android:layout_marginEnd="@dimen/divider_36px"
+                    android:layout_weight="1">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:src="@mipmap/icon_game"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:layout_width="@dimen/divider_264px"
+                        android:layout_height="@dimen/divider_50px"
+                        android:layout_gravity="center_horizontal|bottom"
+                        android:layout_marginBottom="@dimen/divider_39px"
+                        android:background="@drawable/bg_home_task_progress"
+                        android:text="当前游戏7/8"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <Button
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_80px"
+                    android:layout_marginStart="@dimen/divider_57px"
+                    android:layout_marginTop="@dimen/divider_26px"
+                    android:layout_marginEnd="@dimen/divider_55px"
+                    android:layout_marginBottom="@dimen/divider_36px"
+                    android:background="@drawable/bg_home_task_btn"
+                    android:text="@string/start_exclusive_training"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_28px" />
+
+            </LinearLayout>
         </androidx.cardview.widget.CardView>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/rightLayout"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="@dimen/divider_616px"
             android:layout_marginStart="@dimen/divider_40px"
             android:layout_marginTop="@dimen/divider_51px"
             android:layout_marginEnd="@dimen/divider_40px"
             android:layout_marginBottom="@dimen/divider_48px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintHorizontal_weight="1.3"
             app:layout_constraintLeft_toRightOf="@id/leftLayout"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/titleLayout">
@@ -217,7 +263,6 @@
                 android:id="@+id/tvPlayPorpoise"
                 android:layout_width="@dimen/divider_265px"
                 android:layout_height="@dimen/divider_188px"
-                android:layout_marginEnd="@dimen/divider_14px"
                 android:background="@drawable/bg_play_porpoise"
                 android:gravity="center"
                 android:paddingBottom="@dimen/divider_7px"
@@ -232,7 +277,6 @@
                 android:id="@+id/tvProfessionalEvaluation"
                 android:layout_width="@dimen/divider_265px"
                 android:layout_height="@dimen/divider_188px"
-                android:layout_marginStart="@dimen/divider_14px"
                 android:background="@drawable/bg_professional_evaluation"
                 android:gravity="center"
                 android:paddingBottom="@dimen/divider_7px"
@@ -248,7 +292,6 @@
                 android:layout_width="@dimen/divider_265px"
                 android:layout_height="@dimen/divider_188px"
                 android:layout_marginTop="@dimen/divider_28px"
-                android:layout_marginEnd="@dimen/divider_14px"
                 android:background="@drawable/bg_health_counseling"
                 android:gravity="center"
                 android:paddingBottom="@dimen/divider_7px"
@@ -263,7 +306,6 @@
                 android:id="@+id/tvfunTime"
                 android:layout_width="@dimen/divider_265px"
                 android:layout_height="@dimen/divider_188px"
-                android:layout_marginStart="@dimen/divider_14px"
                 android:layout_marginTop="@dimen/divider_28px"
                 android:background="@drawable/bg_fun_time"
                 android:gravity="center"
@@ -276,8 +318,8 @@
                 app:layout_constraintTop_toBottomOf="@+id/tvPlayPorpoise" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
+                android:layout_width="@dimen/divider_561px"
+                android:layout_height="@dimen/divider_173px"
                 android:layout_marginTop="@dimen/divider_28px"
                 android:background="@drawable/bg_data_content"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -318,7 +360,7 @@
                 <LinearLayout
                     android:id="@+id/accumulatedTrainingDurationLayout"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/divider_173px"
                     android:gravity="center"
                     android:orientation="vertical"
                     app:layout_constraintBottom_toBottomOf="parent"

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

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-
+    <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
+    <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
+    <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
+    <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
+    <dimen name="divider_443px" tools:ignore="ResourceName">443px</dimen>
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
     <dimen name="divider_432px" tools:ignore="ResourceName">432px</dimen>
     <dimen name="divider_430px" tools:ignore="ResourceName">430px</dimen>
@@ -44,6 +48,7 @@
     <dimen name="divider_184px" tools:ignore="ResourceName">184px</dimen>
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
     <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>
+    <dimen name="divider_173px" tools:ignore="ResourceName">173px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
     <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>
     <dimen name="divider_130px" tools:ignore="ResourceName">130px</dimen>

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

@@ -19,4 +19,5 @@
     <string name="professional_evaluation" tools:ignore="ResourceName">专业测评</string>
     <string name="health_counseling" tools:ignore="ResourceName">健康咨询</string>
     <string name="fun_time" tools:ignore="ResourceName">轻松一刻</string>
+    <string name="start_exclusive_training" tools:ignore="ResourceName">开始专属训练</string>
 </resources>

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
+    <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
@@ -12,6 +14,7 @@
     <dimen name="divider_413px" tools:ignore="ResourceName">413px</dimen>
     <dimen name="divider_409px" tools:ignore="ResourceName">409px</dimen>
     <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
+    <dimen name="divider_360px" tools:ignore="ResourceName">360px</dimen>
     <dimen name="divider_354px" tools:ignore="ResourceName">354px</dimen>
     <dimen name="divider_348px" tools:ignore="ResourceName">348px</dimen>
     <dimen name="divider_345px" tools:ignore="ResourceName">345px</dimen>