1.优化理疗方案页面UI

.idea/misc.xml

@@ -687,6 +687,7 @@
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_train_complete.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_train_incomplete.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_train_none.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_training_content_title.xml" value="0.1415" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_training_daily.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_work_benches_btn.xml" value="0.164" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/selector_monitor_data.xml" value="0.151" />

workbenches/src/main/java/com/yingyang/workbenches/adapter/TrainContentAdapter.kt

@@ -20,11 +20,6 @@ class TrainContentAdapter(override val layoutId: Int = R.layout.item_training_co
         position: Int
     ) {
         binding.data = item
-        binding.tvTrainingProgress.text = if (item.totalTaskNum != item.currentTaskNum) {
-            "未完成"
-        } else {
-            "已完成"
-        }
         if (position % 2 == 0) {
             binding.contentLayout.setBackgroundResource(R.color.color_FFE6ECFF)
         } else {

workbenches/src/main/java/com/yingyang/workbenches/entity/TrainContentBean.kt

@@ -21,4 +21,12 @@ data class TrainContentBean(
     val updateBy: String,
     val updateTime: String,
     val userId: String
-)
+) {
+    fun getTrainingProgress(): String{
+        return if (totalTaskNum != currentTaskNum) {
+            "未完成"
+        } else {
+            "已完成"
+        }
+    }
+}

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

@@ -27,6 +27,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvDate"
                 style="@style/training_content_title_appcompattextview"
+                android:gravity="center_horizontal"
                 android:text="@string/date"
                 app:layout_constraintEnd_toStartOf="@id/tvExerciseTherapy"
                 app:layout_constraintHorizontal_weight="1"
@@ -36,15 +37,17 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvExerciseTherapy"
                 style="@style/training_content_title_appcompattextview"
+                android:gravity="center_horizontal"
                 android:text="@string/tab3"
                 app:layout_constraintEnd_toStartOf="@id/tvTrainingProgress"
-                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintHorizontal_weight="1.5"
                 app:layout_constraintStart_toEndOf="@id/tvDate"
                 tools:ignore="MissingConstraints" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvTrainingProgress"
                 style="@style/training_content_title_appcompattextview"
+                android:gravity="center_horizontal"
                 android:text="@string/training_progress"
                 app:layout_constraintEnd_toStartOf="@id/tvCognitiveTraining"
                 app:layout_constraintHorizontal_weight="1"
@@ -64,7 +67,7 @@
                 android:id="@+id/tvDetail"
                 style="@style/training_content_title_appcompattextview"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintHorizontal_weight="0.8"
                 app:layout_constraintStart_toEndOf="@id/tvCognitiveTraining"
                 tools:ignore="MissingConstraints" />
 

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

@@ -32,7 +32,7 @@
             android:gravity="center_horizontal"
             android:text="@{data.taskName}"
             app:layout_constraintEnd_toStartOf="@id/tvTrainingProgress"
-            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintHorizontal_weight="1.5"
             app:layout_constraintStart_toEndOf="@id/tvDate"
             tools:ignore="MissingConstraints" />
 
@@ -40,6 +40,7 @@
             android:id="@+id/tvTrainingProgress"
             style="@style/item_training_content_appcompattextview"
             android:gravity="center_horizontal"
+            android:text="@{data.getTrainingProgress()}"
             app:layout_constraintEnd_toStartOf="@id/tvCognitiveTraining"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/tvExerciseTherapy"
@@ -49,9 +50,9 @@
             android:id="@+id/tvCognitiveTraining"
             style="@style/item_training_content_appcompattextview"
             android:layout_marginStart="@dimen/divider_32px"
-            android:text="@{data.gameNames}"
             android:paddingTop="@dimen/divider_6px"
             android:paddingBottom="@dimen/divider_8px"
+            android:text="@{data.gameNames}"
             app:layout_constraintEnd_toStartOf="@id/tvDetail"
             app:layout_constraintHorizontal_weight="2"
             app:layout_constraintStart_toEndOf="@id/tvTrainingProgress"
@@ -65,7 +66,7 @@
             android:text="@string/detail"
             android:textColor="@color/color_FF383838"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintHorizontal_weight="0.8"
             app:layout_constraintStart_toEndOf="@id/tvCognitiveTraining"
             tools:ignore="MissingConstraints" />