diff --git a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt index 2f577cb..fdb4d7c 100644 --- a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt +++ b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt @@ -231,9 +231,41 @@ class TaskListFragment : BaseFragment() { // 积分 binding.tvPoints.text = detail.pointText - // 协作人(workTogether 列表) - // TODO: workTogether 是 List,需要确认实际结构后解析 - binding.rowWorkers.visibility = View.GONE + // 状态标签 + when (detail.status) { + 2 -> { binding.tvStatus.text = "待抢单"; binding.tvStatus.setTextColor(requireContext().getColor(R.color.error)) } + 3 -> { binding.tvStatus.text = "待打卡"; binding.tvStatus.setTextColor(requireContext().getColor(R.color.warning)) } + 4 -> { binding.tvStatus.text = "进行中"; binding.tvStatus.setTextColor(requireContext().getColor(R.color.warning)) } + 5, 6 -> { binding.tvStatus.text = "已完成"; binding.tvStatus.setTextColor(requireContext().getColor(R.color.success)) } + else -> { binding.tvStatus.text = "已结束"; binding.tvStatus.setTextColor(requireContext().getColor(R.color.text_secondary)) } + } + + // 截止时间 + if (!detail.expireTime.isNullOrEmpty()) { + binding.tvExpireTime.text = detail.expireTime + binding.rowExpire.visibility = View.VISIBLE + } else { + binding.rowExpire.visibility = View.GONE + } + + // 预计完成时间(指派任务 type=2) + if (!detail.preFinishTime.isNullOrEmpty()) { + binding.tvPreFinishTime.text = detail.preFinishTime + binding.rowPreFinish.visibility = View.VISIBLE + } else { + binding.rowPreFinish.visibility = View.GONE + } + + // 协作人 + binding.rowWorkers.visibility = View.GONE // TODO: workTogether 结构待确认 + + // 上报人(用户上报 type=3/4 时显示) + if (detail.createName.isNotEmpty() && detail.taskType in listOf(3, 4)) { + binding.tvCreatorName.text = detail.createName + binding.rowCreator.visibility = View.VISIBLE + } else { + binding.rowCreator.visibility = View.GONE + } // 描述 if (detail.content.isNotEmpty()) { diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml index a511486..30d7357 100644 --- a/app/src/main/res/layout/fragment_task_list.xml +++ b/app/src/main/res/layout/fragment_task_list.xml @@ -106,12 +106,40 @@ android:textColor="@color/warning" /> + + + + + + + + + + + + + + + + + + + + + + + + +