1.修改UI

.idea/misc.xml

@@ -70,7 +70,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_game_list.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_task.xml" value="0.8800000000000001" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_train_report.xml" value="0.536" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content.xml" value="0.264" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content.xml" value="0.176" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content_details.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/spinner_list_item.xml" value="0.1" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_main.xml" value="0.22826086956521738" />

workbenches/src/main/java/com/yingyang/workbenches/net/WorkbenchesApiService.kt

@@ -58,7 +58,7 @@ interface WorkbenchesApiService {
     suspend fun getSelectByDictType(@Query("dictType") dictType: String): BaseResp<List<TrainTypeBean>>
 
     /**
-     * 获取训练内容列表
+     * 获取疗程列表
      */
     @POST("app/task/findMyTask")
     suspend fun findMyTask(@Query("treatmentId") treatmentId: String): BaseResp<List<TrainContentBean>>

workbenches/src/main/java/com/yingyang/workbenches/traincontent/TrainContentFragment.kt

@@ -3,6 +3,7 @@ package com.yingyang.workbenches.traincontent
 import android.text.SpannableString
 import com.yingyang.workbenches.adapter.TrainContentAdapter
 import com.yingyang.workbenches.databinding.FragmentTrainContentBinding
+import com.yingyang.workbenches.entity.TrainContentBean
 import com.yingyang.workbenches.entity.TreatmentBean
 import com.yingyang.workbenches.widget.OnSpinnerItemSelectedListener
 import com.yingyang.workbenches.widget.SpinnerTextFormatter
@@ -23,6 +24,7 @@ class TrainContentFragment :
     /**
      * 训练内容adapter
      */
+    private var trainContentBeanList = mutableListOf<TrainContentBean>()
     private val adapter by lazy { TrainContentAdapter() }
 
     override fun initViews() {
@@ -54,6 +56,9 @@ class TrainContentFragment :
         findAllTreatment()
     }
 
+    /**
+     * 获取疗程列表
+     */
     private fun findAllTreatment() {
         viewModel.findAllTreatment(fail = {
             it.toast()
@@ -66,17 +71,23 @@ class TrainContentFragment :
                 binding.treatmentSpinner.setSpinnerTextFormatter(textFormatter)
                 binding.treatmentSpinner.setSelectedTextFormatter(textFormatter)
                 binding.treatmentSpinner.attachDataSource(it)
+                findMyTask(it[0].id)
             }
         })
     }
 
+    /**
+     * 获取训练内容列表
+     */
     private fun findMyTask(treatmentId: String) {
+        trainContentBeanList.clear()
         viewModel.findMyTask(treatmentId, fail = {
             it.toast()
         }, success = {
             if (it.isNullOrEmpty().not()) {
-                adapter.setData(it)
+                trainContentBeanList.addAll(it)
             }
+            adapter.setData(trainContentBeanList)
         })
     }
 }

workbenches/src/main/java/com/yingyang/workbenches/traincontent/TrainContentViewModel.kt

@@ -12,7 +12,7 @@ import com.yingyangfly.baselib.mvvm.BaseViewModel
 class TrainContentViewModel : BaseViewModel() {
 
     /**
-     * 获取休闲健脑视频列表
+     * 获取训练内容列表
      */
     fun findAllTreatment(
         fail: ((msg: String) -> Unit)? = null,
@@ -25,7 +25,7 @@ class TrainContentViewModel : BaseViewModel() {
     )
 
     /**
-     * 获取休闲健脑视频列表
+     * 获取疗程列表
      */
     fun findMyTask(
         treatmentId: String,

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

@@ -61,7 +61,7 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/treatmentLayout">
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvDate"
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/date"
@@ -70,7 +70,7 @@
                 app:layout_constraintRight_toLeftOf="@id/tvExerciseTherapy"
                 tools:ignore="MissingConstraints" />
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvExerciseTherapy"
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/exercise_therapy"
@@ -79,7 +79,7 @@
                 app:layout_constraintRight_toLeftOf="@id/tvTrainingProgress"
                 tools:ignore="MissingConstraints" />
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvTrainingProgress"
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/training_progress"
@@ -88,12 +88,20 @@
                 app:layout_constraintRight_toLeftOf="@id/tvCognitiveTraining"
                 tools:ignore="MissingConstraints" />
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvCognitiveTraining"
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/cognitive_training"
-                app:layout_constraintHorizontal_weight="3"
+                app:layout_constraintHorizontal_weight="2"
                 app:layout_constraintLeft_toRightOf="@id/tvTrainingProgress"
+                app:layout_constraintRight_toLeftOf="@id/tvDetail"
+                tools:ignore="MissingConstraints" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvDetail"
+                style="@style/training_content_title_appcompattextview"
+                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintLeft_toRightOf="@id/tvCognitiveTraining"
                 app:layout_constraintRight_toRightOf="parent"
                 tools:ignore="MissingConstraints" />
 

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

@@ -19,7 +19,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvDate"
             style="@style/item_training_content_appcompattextview"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:text="@{data.taskStartTime}"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -29,7 +29,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvExerciseTherapy"
             style="@style/item_training_content_appcompattextview"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:text="@{data.taskName}"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toRightOf="@id/tvDate"
@@ -39,7 +39,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTrainingProgress"
             style="@style/item_training_content_appcompattextview"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toRightOf="@id/tvExerciseTherapy"
             app:layout_constraintRight_toLeftOf="@id/tvCognitiveTraining"
@@ -48,9 +48,22 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvCognitiveTraining"
             style="@style/item_training_content_appcompattextview"
+            android:layout_marginStart="@dimen/divider_32px"
             android:text="@{data.gameNames}"
-            app:layout_constraintHorizontal_weight="3"
+            app:layout_constraintHorizontal_weight="2"
             app:layout_constraintLeft_toRightOf="@id/tvTrainingProgress"
+            app:layout_constraintRight_toLeftOf="@id/tvDetail"
+            tools:ignore="MissingConstraints" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvDetail"
+            style="@style/item_training_content_appcompattextview"
+            android:layout_marginEnd="@dimen/divider_20px"
+            android:gravity="center_horizontal"
+            android:text="@string/detail"
+            android:textColor="@color/color_FF383838"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintLeft_toRightOf="@id/tvCognitiveTraining"
             app:layout_constraintRight_toRightOf="parent"
             tools:ignore="MissingConstraints" />
 

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

@@ -28,4 +28,5 @@
     <string name="memory" tools:ignore="ResourceName">记忆力</string>
     <string name="capacity_calculation" tools:ignore="ResourceName">计算力</string>
     <string name="exercise_therapy" tools:ignore="ResourceName">运动疗法</string>
+    <string name="detail" tools:ignore="ResourceName">查看详情</string>
 </resources>

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

@@ -104,7 +104,7 @@
     <style name="training_content_title_appcompattextview" tools:ignore="ResourceName">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center_horizontal</item>
+        <item name="android:gravity">center</item>
         <item name="android:textSize">@dimen/divider_28px</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>