Просмотр исходного кода

1.训练内容UI添加完成状态字段

王鹏鹏 2 лет назад
Родитель
Сommit
25b7272195

+ 1 - 1
.idea/misc.xml

@@ -65,7 +65,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.36858475894245724" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content.xml" value="0.264" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_main.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_push.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/yingyangfly/baselib/src/main/res/drawable/bg_center_toast.xml" value="0.2265" />

+ 5 - 0
workbenches/src/main/java/com/yingyang/workbenches/adapter/TrainContentAdapter.kt

@@ -16,6 +16,11 @@ 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 {

+ 10 - 2
workbenches/src/main/res/layout/fragment_train_content.xml

@@ -58,14 +58,22 @@
                 android:text="@string/exercise_therapy"
                 app:layout_constraintHorizontal_weight="1"
                 app:layout_constraintLeft_toRightOf="@id/tvDate"
+                app:layout_constraintRight_toLeftOf="@id/tvTrainingProgress" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTrainingProgress"
+                style="@style/training_content_title_appcompattextview"
+                android:text="@string/training_progress"
+                app:layout_constraintHorizontal_weight="1"
+                app:layout_constraintLeft_toRightOf="@id/tvExerciseTherapy"
                 app:layout_constraintRight_toLeftOf="@id/tvCognitiveTraining" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvCognitiveTraining"
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/cognitive_training"
-                app:layout_constraintHorizontal_weight="2"
-                app:layout_constraintLeft_toRightOf="@id/tvExerciseTherapy"
+                app:layout_constraintHorizontal_weight="3"
+                app:layout_constraintLeft_toRightOf="@id/tvTrainingProgress"
                 app:layout_constraintRight_toRightOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>

+ 11 - 2
workbenches/src/main/res/layout/item_training_content.xml

@@ -33,6 +33,15 @@
             android:text="@{data.taskName}"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toRightOf="@id/tvDate"
+            app:layout_constraintRight_toLeftOf="@id/tvTrainingProgress"
+            tools:ignore="MissingConstraints" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTrainingProgress"
+            style="@style/item_training_content_appcompattextview"
+            android:gravity="center"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintLeft_toRightOf="@id/tvExerciseTherapy"
             app:layout_constraintRight_toLeftOf="@id/tvCognitiveTraining"
             tools:ignore="MissingConstraints" />
 
@@ -40,8 +49,8 @@
             android:id="@+id/tvCognitiveTraining"
             style="@style/item_training_content_appcompattextview"
             android:text="@{data.gameNames}"
-            app:layout_constraintHorizontal_weight="2"
-            app:layout_constraintLeft_toRightOf="@id/tvExerciseTherapy"
+            app:layout_constraintHorizontal_weight="3"
+            app:layout_constraintLeft_toRightOf="@id/tvTrainingProgress"
             app:layout_constraintRight_toRightOf="parent"
             tools:ignore="MissingConstraints" />