1.修改首页获取当前任务接口

.idea/misc.xml

@@ -92,9 +92,9 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/dialog_course_treatment.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/dialog_purchase_services.xml" value="0.2962239583333333" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_brain_ability.xml" value="0.21014492753623187" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_data_monitor.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_data_monitor.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_free_training.xml" value="0.21014492753623187" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_task.xml" value="0.6" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_task.xml" value="0.4" />
         <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" />

workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -7,6 +7,7 @@ import com.yingyang.workbenches.adapter.GameAdapter
 import com.yingyang.workbenches.adapter.TaskAdapter
 import com.yingyang.workbenches.databinding.ActivityWorkbenchesBinding
 import com.yingyang.workbenches.dialog.TaskFragment
+import com.yingyang.workbenches.entity.Detail
 import com.yingyang.workbenches.entity.MyTaskBean
 import com.yingyang.workbenches.entity.Record
 import com.yingyangfly.baselib.dialog.TipDialogFragment
@@ -29,7 +30,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
      * 进行中的任务
      */
     private var taskBean = mutableListOf<MyTaskBean>()
-    private var taskList = mutableListOf<String>()
+    private var taskList = mutableListOf<Detail>()
     private val taskAdapter by lazy { TaskAdapter() }
 
     /**
@@ -149,8 +150,9 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             .show(supportFragmentManager)
     }
 
-    private fun showTaskDialog() {
+    private fun showTaskDialog(taskDesn: String) {
         val taskFragment = TaskFragment()
+        taskFragment.setTaskDesn(taskDesn)
         taskFragment.show(supportFragmentManager, "taskFragment")
     }
 
@@ -206,16 +208,16 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
                 taskBean.addAll(it)
                 it[0].let {
                     binding.task = it
-                    if (it.gameCoverImages.isNullOrEmpty().not()) {
-                        taskList.addAll(it.gameCoverImages)
+                    if (it.details.isNullOrEmpty().not()) {
+                        taskList.addAll(it.details)
                     }
                     taskAdapter.setCurrentTaskNum(it.currentTaskNum)
                     taskAdapter.setData(taskList)
                     if (it.currentTaskNum == it.totalTaskNum) {
                         showTipDialog()
                     } else {
-                        playVoice?.speak("根据您的训练情况，您的多项能力都有不错的得分，但是“感知觉”‘注意分配’等还需要继续强化训练，特为您制定了今天的训练方案，快去训练吧！")
-                        showTaskDialog()
+                        playVoice?.speak(it.taskDesn)
+                        showTaskDialog(it.taskDesn)
                     }
 
                 }

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

@@ -2,6 +2,7 @@ package com.yingyang.workbenches.adapter
 
 import com.yingyang.workbenches.R
 import com.yingyang.workbenches.databinding.ItemTaskBinding
+import com.yingyang.workbenches.entity.Detail
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.ext.show
 
@@ -9,7 +10,7 @@ import com.yingyangfly.baselib.ext.show
  * 首页待完成任务adapter
  */
 class TaskAdapter(override val layoutId: Int = R.layout.item_task) :
-    BaseDataBindingAdapter<String, ItemTaskBinding>() {
+    BaseDataBindingAdapter<Detail, ItemTaskBinding>() {
 
     var currentTask = 0
 
@@ -17,7 +18,7 @@ class TaskAdapter(override val layoutId: Int = R.layout.item_task) :
         currentTask = currentTaskNum
     }
 
-    override fun onBindViewHolder(binding: ItemTaskBinding, item: String, position: Int) {
+    override fun onBindViewHolder(binding: ItemTaskBinding, item: Detail, position: Int) {
         binding.data = item
         val index = position + 1
         if (index < currentTask) {

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

@@ -5,12 +5,16 @@ import com.yingyangfly.baselib.base.BaseFragment
 import com.yingyangfly.baselib.utils.RxBusCodes
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode
+import java.util.*
 
 /**
  * 数据监控
  */
 class DataMonitorFragment : BaseFragment<FragmentDataMonitorBinding>() {
 
+    private var calendar: Calendar? = null
+
+
     override fun initViews() {
 
     }
@@ -20,7 +24,7 @@ class DataMonitorFragment : BaseFragment<FragmentDataMonitorBinding>() {
     }
 
     override fun initData() {
-
+        calendar = Calendar.getInstance()
     }
 
     /**
@@ -31,4 +35,8 @@ class DataMonitorFragment : BaseFragment<FragmentDataMonitorBinding>() {
 
     }
 
+    private fun setNowDate() {
+
+    }
+
 }

workbenches/src/main/java/com/yingyang/workbenches/dialog/TaskFragment.kt

@@ -6,8 +6,8 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.appcompat.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatTextView
 import androidx.fragment.app.DialogFragment
 import com.bumptech.glide.Glide
 import com.gyf.immersionbar.BarHide
@@ -21,10 +21,15 @@ import com.yingyangfly.baselib.utils.ViewTool
  */
 class TaskFragment : DialogFragment(), View.OnTouchListener {
 
+    private var taskDesn = ""
     private var fishImage: ImageView? = null
-    private var tvContent: TextView? = null
+    private var tvContent: AppCompatTextView? = null
     private var confirmBtan: AppCompatButton? = null
 
+    fun setTaskDesn(taskDesn: String) {
+        this.taskDesn = taskDesn
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         isCancelable = true
@@ -47,7 +52,7 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
     ): View? {
         immersionBar {
             hideBar(BarHide.FLAG_HIDE_BAR)
-            navigationBarColor(com.yingyangfly.baselib.R.color.transparent)
+            navigationBarColor(R.color.transparent)
         }
         val rootView = ViewTool.inflateFragmentPixels(
             activity, R.layout.fragment_task, container, 1194, 834
@@ -70,8 +75,7 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
         Glide.with(this)
             .load("file:///android_asset/home_doctor.gif")
             .into(fishImage!!)
-        tvContent?.text = "根据您的训练情况，您的多项能力都有不错的得分，但是“感知觉”‘注意分配’等还需要继续强化训练，特为您制定了今天的训练方案，快去训练吧！"
-
+        tvContent?.text = taskDesn
     }
 
     override fun onTouch(v: View?, event: MotionEvent?): Boolean {

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

@@ -7,26 +7,43 @@ data class MyTaskBean(
     val createBy: String,
     val createTime: String,
     val currentTaskNum: Int,//当前任务进度
-    val gameCodes: String,//游戏编号
-    val gameNames: String,//游戏名称
+    val details: List<Detail>,
+    val gameCodes: String,
+    val gameNames: String,
     val id: String,
     val orgCode: String,
     val orgName: String,
-    val status: String,//状态
-    val taskDesn: String,//任务描述
-    val taskName: String,//任务名称
-    val taskStartTime: String,//任务创建时间
-    val totalTaskNum: Int,//任务总进度
-    val updateBy: String,
-    val updateTime: String,
-    val userId: String,
-    val gameCoverImages: List<String>//任务图片
+    val status: String,
+    val taskDesn: String,
+    val taskName: String,
+    val taskStartTime: String,
+    val totalTaskNum: Int,
+    val updateBy: Any,
+    val updateTime: Any,
+    val userId: String
 ) {
     fun getGameImage(): String {
-        return if (gameCoverImages.isNullOrEmpty().not()) {
-            gameCoverImages[currentTaskNum]
-        } else {
-            ""
+        if (details.isNullOrEmpty().not()) {
+            val detail = details[currentTaskNum]
+            if (detail != null) {
+                return detail.gameCoverImage
+            }
         }
+        return ""
     }
-}
+}
+
+data class Detail(
+    val createTime: String,
+    val gameCode: String,
+    val gameCoverImage: String,
+    val gameLevel: Int,
+    val gameName: String,
+    val gameType: String,
+    val id: String,
+    val orderNum: Int,
+    val status: String,
+    val taskId: String,
+    val updateTime: String,
+    val userId: String
+)

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

@@ -35,7 +35,85 @@
             app:layout_constraintHorizontal_weight="1.5"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@id/weekLayout"
-            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/leftImage"
+                android:layout_width="@dimen/divider_35px"
+                android:layout_height="@dimen/divider_35px"
+                android:layout_marginStart="@dimen/divider_79px"
+                android:layout_marginTop="@dimen/divider_26px"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_31px"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_18px"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/rightImage"
+                android:layout_width="@dimen/divider_35px"
+                android:layout_height="@dimen/divider_35px"
+                android:layout_marginTop="@dimen/divider_26px"
+                android:layout_marginEnd="@dimen/divider_79px"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/weekLayoutLeft"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvDate">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/data_monitor_week_text"
+                    android:text="@string/sunday" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/data_monitor_week_text"
+                    android:text="@string/monday" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/data_monitor_week_text"
+                    android:text="@string/tuesday" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/data_monitor_week_text"
+                    android:text="@string/wednesday" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/data_monitor_week_text"
+                    android:text="@string/thursday" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/data_monitor_week_text"
+                    android:text="@string/friday" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/data_monitor_week_text"
+                    android:text="@string/saturday" />
+
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvDate"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/weekLayoutLeft" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/weekLayout"

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

@@ -26,7 +26,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvContent"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -34,8 +34,7 @@
             android:layout_marginTop="@dimen/divider_53px"
             android:layout_marginEnd="@dimen/divider_47px"
             android:layout_weight="1"
-            android:textSize="@dimen/divider_28px"
-            tools:text="根据您的训练情况，您的多项能力都有不错的得分，但是“感知觉”‘注意分配’等还需要继续强化训练，特为您制定了今天的训练方案，快去训练吧！" />
+            android:textSize="@dimen/divider_28px" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/confirmBtan"

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

@@ -8,7 +8,7 @@
 
         <variable
             name="data"
-            type="java.lang.String" />
+            type="com.yingyang.workbenches.entity.Detail" />
     </data>
 
     <androidx.cardview.widget.CardView
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="fitXY"
-            app:loadHeadImg="@{data}" />
+            app:loadHeadImg="@{data.gameCoverImage}" />
 
         <FrameLayout
             android:layout_width="match_parent"

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

@@ -48,4 +48,5 @@
     <color name="color_FFCEE4EE" tools:ignore="ResourceName">#FFCEE4EE</color>
     <color name="color_FF93C5D8" tools:ignore="ResourceName">#FF93C5D8</color>
     <color name="color_FF979797" tools:ignore="ResourceName">#FF979797</color>
+    <color name="color_FF9FA5B4" tools:ignore="ResourceName">#FF9FA5B4</color>
 </resources>

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

@@ -38,4 +38,12 @@
     <string name="purchase" tools:ignore="ResourceName">购买</string>
     <string name="good" tools:ignore="ResourceName">好的</string>
     <string name="order_list" tools:ignore="ResourceName">订单记录</string>
+    <string name="monday" tools:ignore="ResourceName">周一</string>
+    <string name="tuesday" tools:ignore="ResourceName">周二</string>
+    <string name="wednesday" tools:ignore="ResourceName">周三</string>
+    <string name="thursday" tools:ignore="ResourceName">周四</string>
+    <string name="friday" tools:ignore="ResourceName">周五</string>
+    <string name="saturday" tools:ignore="ResourceName">周六</string>
+    <string name="sunday" tools:ignore="ResourceName">周日</string>
+
 </resources>

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

@@ -119,4 +119,13 @@
         <item name="layout_constraintBottom_toBottomOf">parent</item>
         <item name="layout_constraintTop_toTopOf">parent</item>
     </style>
+
+    <style name="data_monitor_week_text" tools:ignore="ResourceName">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:textSize">@dimen/divider_20px</item>
+        <item name="android:textColor">@color/color_FF9FA5B4</item>
+        <item name="android:gravity">center</item>
+    </style>
 </resources>