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 20ceb79..2ee4050 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 @@ -265,10 +265,10 @@ class TaskListFragment : BaseFragment() { if (detail.sendTime.isNotEmpty()) timeLines.add("派单: ${detail.sendTime}") if (!detail.expireTime.isNullOrEmpty()) timeLines.add("截止: ${detail.expireTime}") if (!detail.preFinishTime.isNullOrEmpty()) timeLines.add("要求: ${detail.preFinishTime}完成") - // 巡检任务显示巡检时段 - if (detail.taskType == 5 && !detail.executeTimeStart.isNullOrEmpty()) { - val end = detail.executeTimeEnd ?: "" - timeLines.add("巡检: ${detail.executeTimeStart}~${end}") + // 巡检任务显示巡检时段(拆为开始/结束两行) + if (detail.taskType == 5) { + if (!detail.executeTimeStart.isNullOrEmpty()) timeLines.add("开始: ${detail.executeTimeStart}") + if (!detail.executeTimeEnd.isNullOrEmpty()) timeLines.add("结束: ${detail.executeTimeEnd}") } if (timeLines.isNotEmpty()) { binding.tvTimeInfo.text = timeLines.joinToString("\n") @@ -333,12 +333,16 @@ class TaskListFragment : BaseFragment() { } } - /** 显示巡检时段(仅 taskType=5 时) */ + /** 显示巡检时段(仅 taskType=5 时,拆为开始/结束两行) */ private fun showInspectTime(detail: TaskDetail) { - if (detail.taskType == 5 && !detail.executeTimeStart.isNullOrEmpty()) { - val end = detail.executeTimeEnd ?: "" - binding.tvTimeInfo.text = "巡检: ${detail.executeTimeStart}~${end}" - binding.tvTimeInfo.visibility = View.VISIBLE + if (detail.taskType == 5) { + val lines = mutableListOf() + if (!detail.executeTimeStart.isNullOrEmpty()) lines.add("开始: ${detail.executeTimeStart}") + if (!detail.executeTimeEnd.isNullOrEmpty()) lines.add("结束: ${detail.executeTimeEnd}") + if (lines.isNotEmpty()) { + binding.tvTimeInfo.text = lines.joinToString("\n") + binding.tvTimeInfo.visibility = View.VISIBLE + } } }