Explorar o código

1.优化代码

王鹏鹏 %!s(int64=2) %!d(string=hai) anos
pai
achega
056791ebf9

+ 2 - 0
.idea/misc.xml

@@ -539,6 +539,8 @@
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_evaluate.xml" value="0.8" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_recommend_doctor.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/item_search_doctor.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/drawable/bg_home_task_btn.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/home/src/main/res/drawable/bg_home_task_progress.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/drawable/bg_results_content.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_binding_evaluation.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/home/src/main/res/layout/activity_evaluation.xml" value="0.23697916666666666" />

+ 3 - 3
home/src/main/res/drawable/bg_home_task_btn.xml

@@ -5,11 +5,11 @@
 
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="@dimen/divider_33px" />
+            <corners android:radius="@dimen/divider_40px" />
             <gradient
                 android:angle="180"
-                android:endColor="@color/color_FFFFC036"
-                android:startColor="@color/color_FFFFBD72"
+                android:endColor="@color/color_FFFB4F28"
+                android:startColor="@color/color_FFFB4F28"
                 android:type="linear"
                 android:useLevel="true" />
         </shape>

+ 1 - 1
home/src/main/res/drawable/bg_home_task_progress.xml

@@ -4,5 +4,5 @@
     android:shape="rectangle"
     tools:ignore="ResourceName">
     <solid android:color="@color/color_FF6E5FFF" />
-    <corners android:radius="@dimen/divider_23px" />
+    <corners android:radius="@dimen/divider_25px" />
 </shape>

+ 20 - 24
home/src/main/res/layout/activity_home.xml

@@ -351,52 +351,48 @@
                 android:orientation="vertical"
                 android:visibility="gone">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <androidx.cardview.widget.CardView
                     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">
+                    android:layout_marginStart="@dimen/divider_65px"
+                    android:layout_marginTop="@dimen/divider_63px"
+                    android:layout_marginEnd="@dimen/divider_65px"
+                    android:layout_weight="1"
+                    app:cardCornerRadius="@dimen/divider_28px">
 
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:loadImg="@{task.getGameImage()}"
-                        app:roundRadius="@{8}" />
+                        android:scaleType="centerCrop"
+                        app:loadImg="@{task.getGameImage()}" />
 
                     <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:layout_marginBottom="@dimen/divider_16px"
                         android:background="@drawable/bg_home_task_progress"
+                        android:gravity="center"
                         android:text='@{"当前游戏"+task.currentTaskNum+"/"+task.totalTaskNum}'
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_28px"
-                        android:textStyle="bold"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent" />
+                        android:textStyle="bold" />
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.cardview.widget.CardView>
 
                 <Button
                     android:id="@+id/btnTask"
-                    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:layout_width="@dimen/divider_315px"
+                    android:layout_height="@dimen/divider_73px"
+                    android:layout_marginStart="@dimen/divider_105px"
+                    android:layout_marginTop="@dimen/divider_25px"
+                    android:layout_marginEnd="@dimen/divider_104px"
+                    android:layout_marginBottom="@dimen/divider_58px"
                     android:background="@drawable/bg_home_task_btn"
                     android:text="@string/start_exclusive_training"
                     android:textColor="@android:color/white"
-                    android:textSize="@dimen/divider_28px" />
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold" />
 
             </LinearLayout>
         </FrameLayout>

BIN=BIN
home/src/main/res/mipmap-xxhdpi/icon_occupy_bitmap.png


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

@@ -70,4 +70,5 @@
     <color name="color_FF2826B5" tools:ignore="ResourceName">#FF2826B5</color>
     <color name="color_FF2F55FB" tools:ignore="ResourceName">#FF2F55FB</color>
     <color name="color_FFF0F0F0" tools:ignore="ResourceName">#FFF0F0F0</color>
+    <color name="color_FFFB4F28" tools:ignore="ResourceName">#FFFB4F28</color>
 </resources>

+ 1 - 0
home/src/main/res/values/dimens.xml

@@ -24,6 +24,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_395px" tools:ignore="ResourceName">395px</dimen>
     <dimen name="divider_389px" tools:ignore="ResourceName">389px</dimen>
     <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
     <dimen name="divider_363px" tools:ignore="ResourceName">363px</dimen>