|
@@ -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)
|