1.优化代码

.idea/misc.xml

@@ -575,6 +575,7 @@
         <entry key="..\:/workspace/hcp-pads/login/src/main/res/layout/activity_login.xml" value="0.4421768707482993" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/activity_questions.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/fragment_count.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/fragment_draw_designs.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/fragment_memory_words.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/fragment_multiple_choice.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/fragment_recognition_image.xml" value="0.23697916666666666" />
@@ -583,6 +584,7 @@
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_identify_picture.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_listen_record.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_memorize_result.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_signature.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_single_choice.xml" value="0.176" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_timepiece.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/item_moca_choice.xml" value="0.72" />
@@ -672,6 +674,7 @@
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_free_training.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_free_training_type.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_game_list.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_leisure_brain_list.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_order_list.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_service_package_type.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_task.xml" value="0.23697916666666666" />

baselib/src/main/java/com/yingyangfly/baselib/adapter/DatabindingAdapter.kt

@@ -16,7 +16,7 @@ import com.yingyangfly.baselib.utils.ScreenUtil
 @BindingAdapter(value = ["loadHeadImg", "isCircle"], requireAll = false)
 fun ImageView.loadHeadImg(url: String?, isCircle: Boolean? = false) {
     url?.let {
-        loadUrl(url, resId = R.mipmap.icon_place_holder, isCircle = isCircle)
+        loadUrl(url, resId = R.mipmap.icon_head_default, isCircle = isCircle)
     }
 }
 

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

@@ -28,12 +28,11 @@
                 android:id="@+id/gameImage"
                 android:layout_width="@dimen/divider_181px"
                 android:layout_height="@dimen/divider_181px"
-                app:isCircle="@{false}"
                 android:scaleType="centerCrop"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:loadHeadImg="@{data.gameCoverImage}" />
+                app:loadImg="@{data.gameCoverImage}" />
 
             <TextView
                 android:layout_width="@dimen/divider_108px"

mmse/src/main/res/layout/fragment_draw_designs.xml

@@ -34,10 +34,10 @@
             android:layout_height="@dimen/divider_179px"
             android:layout_marginStart="@dimen/divider_63px"
             android:layout_marginTop="@dimen/divider_149px"
-            app:isCircle="@{false}"
+            android:scaleType="centerInside"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-            app:loadHeadImg="@{data.reviewDesc}" />
+            app:loadImg="@{data.reviewDesc}" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="0dp"

mmse/src/main/res/layout/fragment_recognition_image.xml

@@ -37,10 +37,10 @@
             android:layout_height="@dimen/divider_179px"
             android:layout_marginTop="@dimen/divider_26px"
             android:layout_marginEnd="@dimen/divider_15px"
-            app:isCircle="@{false}"
+            android:scaleType="centerInside"
             app:layout_constraintEnd_toStartOf="@+id/iamgeeLine"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-            app:loadHeadImg="@{firstData.reviewDesc}" />
+            app:loadImg="@{firstData.reviewDesc}" />
 
         <View
             android:id="@+id/iamgeeLine"
@@ -57,10 +57,10 @@
             android:layout_height="@dimen/divider_179px"
             android:layout_marginStart="@dimen/divider_15px"
             android:layout_marginTop="@dimen/divider_26px"
-            app:isCircle="@{false}"
+            android:scaleType="centerInside"
             app:layout_constraintStart_toEndOf="@+id/iamgeeLine"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-            app:loadHeadImg="@{secondData.reviewDesc}" />
+            app:loadImg="@{secondData.reviewDesc}" />
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="wrap_content"

moca/src/main/res/layout/fragment_identify_picture.xml

@@ -32,11 +32,11 @@
             android:layout_width="@dimen/divider_761px"
             android:layout_height="@dimen/divider_359px"
             android:layout_marginTop="@dimen/divider_57px"
-            app:isCircle="@{false}"
+            android:scaleType="centerInside"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-            app:loadHeadImg="@{data.reviewDesc}" />
+            app:loadImg="@{data.reviewDesc}" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btnPrevious"

moca/src/main/res/layout/fragment_signature.xml

@@ -34,10 +34,10 @@
             android:layout_height="@dimen/divider_179px"
             android:layout_marginStart="@dimen/divider_63px"
             android:layout_marginTop="@dimen/divider_149px"
-            app:isCircle="@{false}"
+            android:scaleType="centerInside"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-            app:loadHeadImg="@{data.reviewDesc}" />
+            app:loadImg="@{data.reviewDesc}" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="0dp"

personalcenter/src/main/res/layout/activity_help.xml

@@ -138,8 +138,8 @@
                         <androidx.appcompat.widget.AppCompatImageView
                             android:layout_width="@dimen/divider_218px"
                             android:layout_height="@dimen/divider_218px"
-                            app:isCircle="@{false}"
-                            app:loadHeadImg="@{data.wxUrl}" />
+                            android:scaleType="centerInside"
+                            app:loadImg="@{data.wxUrl}" />
 
                         <androidx.appcompat.widget.AppCompatTextView
                             style="@style/layout_properties_self_adaption"

workbenches/src/main/res/layout/item_game_list.xml

@@ -22,8 +22,8 @@
             android:id="@+id/gameImage"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:isCircle="@{false}"
-            app:loadHeadImg="@{data.gameCoverImage}" />
+            android:scaleType="centerCrop"
+            app:loadImg="@{data.gameCoverImage}" />
 
         <TextView
             android:layout_width="wrap_content"

workbenches/src/main/res/layout/item_leisure_brain_list.xml

@@ -25,20 +25,20 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:isCircle="@{false}"
+                android:scaleType="centerCrop"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:loadHeadImg="@{data.videoCoverImage}" />
+                app:loadImg="@{data.videoCoverImage}" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="@dimen/divider_72px"
                 android:layout_height="@dimen/divider_72px"
                 android:layout_marginTop="@dimen/divider_60px"
                 android:background="@mipmap/icon_video"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -53,8 +53,8 @@
                 android:textSize="@dimen/divider_24px"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 tools:text="@string/accumulated_training_duration" />
 
 

workbenches/src/main/res/layout/item_task.xml

@@ -21,8 +21,8 @@
             android:id="@+id/taskImage"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="fitXY"
-            app:loadHeadImg="@{data.gameCoverImage}" />
+            android:scaleType="centerCrop"
+            app:loadImg="@{data.gameCoverImage}" />
 
         <FrameLayout
             android:layout_width="match_parent"