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

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

@@ -7,7 +7,6 @@ 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,8 +28,8 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
     /**
      * 进行中的任务
      */
-    private var taskBean = mutableListOf<MyTaskBean>()
-    private var taskList = mutableListOf<Detail>()
+    private var currentTaskRecord: Record? = null
+    private var taskList = mutableListOf<Record>()
     private val taskAdapter by lazy { TaskAdapter() }
 
     /**
@@ -116,12 +115,13 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             }
             //点击跳转正在进行中的任务
             taskBtn.setOnSingleClickListener {
-                if (taskBean.isNotEmpty()) {
-                    val code = taskBean[0].gameCodes.split(",")
-                    if (code.isNullOrEmpty().not()) {
-                        getGameDetail(code.get(taskBean[0].currentTaskNum))
+                if (currentTaskRecord != null) {
+                    currentTaskRecord.let {
+                        val str =
+                            it?.gameUrl + "?gameCode=" + it?.gameCode + "&gameLevel=" + it?.currentLevel +
+                                    "&playClass=A" + "&userToken=" + User.getToken()
+                        JumpUtil.jumpActivityWithUrl(RouterUrlCommon.WEB_VIEW_INTERACTION_JS, str)
                     }
-
                 }
             }
         }
@@ -197,7 +197,6 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
      * 查询是否有进行中的任务
      */
     private fun getFindMyTask() {
-        taskBean.clear()
         taskList.clear()
         viewModel.findMyCurrentTask(fail = {
             it.toast()
@@ -205,10 +204,10 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             if (it.isNullOrEmpty().not()) {
                 binding.rvGame.show(false)
                 binding.taskLayout.show(true)
-                taskBean.addAll(it)
                 it[0].let {
                     binding.task = it
                     if (it.details.isNullOrEmpty().not()) {
+                        currentTaskRecord = it.details[it.currentTaskNum]
                         taskList.addAll(it.details)
                     }
                     taskAdapter.setCurrentTaskNum(it.currentTaskNum)

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

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

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

@@ -7,7 +7,7 @@ data class MyTaskBean(
     val createBy: String,
     val createTime: String,
     val currentTaskNum: Int,//当前任务进度
-    val details: List<Detail>,
+    val details: List<Record>,
     val gameCodes: String,
     val gameNames: String,
     val id: String,
@@ -31,19 +31,4 @@ data class MyTaskBean(
         }
         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/activity_workbenches.xml

@@ -215,7 +215,7 @@
                     android:layout_marginStart="@dimen/divider_57px"
                     android:layout_marginBottom="@dimen/divider_39px"
                     android:background="@drawable/bg_task_progress"
-                    android:text='@{"当前游戏"+task.currentTaskNum+"/8"}'
+                    android:text='@{"当前游戏"+task.currentTaskNum+"/"+task.totalTaskNum}'
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_28px"
                     android:textStyle="bold"

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

@@ -8,7 +8,7 @@
 
         <variable
             name="data"
-            type="com.yingyang.workbenches.entity.Detail" />
+            type="com.yingyang.workbenches.entity.Record" />
     </data>
 
     <androidx.cardview.widget.CardView