1.修改数据监控页面UI

.idea/misc.xml

@@ -143,6 +143,8 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_service_package_type_unselected.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_task_btn.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_task_progress.xml" value="0.2165" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_total_training_duration.xml" value="0.1615" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_total_training_duration_text.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_currect_date.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_incomplete.xml" value="0.1615" />
@@ -185,7 +187,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_content.xml" value="0.33808844507845937" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_report.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_course_treatment.xml" value="0.1" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_data_monitor.xml" value="0.6453900709219859" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_data_monitor.xml" value="0.72" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_date.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_free_training.xml" value="0.8800000000000001" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_free_training_list.xml" value="0.8800000000000001" />

workbenches/src/main/java/com/yingyang/workbenches/datamonitor/DataMonitorFragment.kt

@@ -90,6 +90,7 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
         }, success = {
             dataMonitorList.clear()
             if (it != null) {
+                binding.tvTrainingTimeToday.text = it.time
                 if (it.record.isNullOrEmpty().not()) {
                     dataMonitorList.addAll(it.record)
                 }

workbenches/src/main/java/com/yingyang/workbenches/datamonitor/DataMonitorViewModel.kt

@@ -53,7 +53,7 @@ class DataMonitorViewModel : BaseViewModel() {
         date: String,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: DayRecordDetailBean?) -> Unit)? = null,
-    ) = launchFlow(false) {
+    ) = launchFlow(true) {
         val requestBean = GetMonthRecordBean().apply {
             time = date
         }

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

@@ -27,5 +27,6 @@ data class Record(
     val totalNum: String,//  总共等级
     val status: String, //0 通关
     val duration: String, //0 持续时长
-    val playClass: String//游戏玩耍分类  其他 是可以继续 关卡，A 是只有一关
+    val playClass: String,//游戏玩耍分类  其他 是可以继续 关卡，A 是只有一关
+    val gameTotalTime: String
 )

workbenches/src/main/res/drawable/bg_total_training_duration.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:topLeftRadius="@dimen/divider_28px"
+        android:topRightRadius="@dimen/divider_28px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

workbenches/src/main/res/drawable/bg_total_training_duration_text.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:bottomLeftRadius="@dimen/divider_28px"
+        android:bottomRightRadius="@dimen/divider_28px" />
+    <solid android:color="@android:color/white" />
+</shape>

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

@@ -128,6 +128,7 @@
             android:layout_marginTop="@dimen/divider_32px"
             android:layout_marginEnd="@dimen/divider_40px"
             android:background="@drawable/bg_calendar"
+            android:gravity="center_horizontal"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintEnd_toEndOf="parent"
@@ -140,9 +141,36 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
+                android:scrollbarStyle="insideOverlay"
                 android:scrollbars="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider_55px"
+                android:layout_marginStart="@dimen/divider_20px"
+                android:layout_marginTop="@dimen/divider_26px"
+                android:layout_marginEnd="@dimen/divider_20px"
+                android:background="@drawable/bg_total_training_duration"
+                android:gravity="center"
+                android:text="@string/total_training_duration_today"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_24px" />
+
+            <TextView
+                android:id="@+id/tvTrainingTimeToday"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider_64px"
+                android:layout_marginStart="@dimen/divider_20px"
+                android:layout_marginEnd="@dimen/divider_20px"
+                android:layout_marginBottom="@dimen/divider_26px"
+                android:background="@drawable/bg_total_training_duration_text"
+                android:gravity="center"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_24px"
+                android:textStyle="bold"
+                app:drawableStartCompat="@mipmap/icon_duration" />
+
         </LinearLayout>
 
 

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

@@ -55,7 +55,7 @@
             android:layout_marginStart="@dimen/divider_20px"
             android:layout_marginTop="@dimen/divider_2px"
             android:layout_marginEnd="@dimen/divider_7px"
-            android:text="@{data.duration}"
+            android:text="@{data.gameTotalTime}"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_18px"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -47,4 +47,5 @@
     <string name="sunday" tools:ignore="ResourceName">周日</string>
     <string name="contact_after_sales_service" tools:ignore="ResourceName">联系售后</string>
     <string name="back_pager" tools:ignore="MissingTranslation,ResourceName">返回</string>
+    <string name="total_training_duration_today" tools:ignore="ResourceName">今日训练总时长</string>
 </resources>