From a0c0e74dda37d7e73a324b55ee65b939636e2e21 Mon Sep 17 00:00:00 2001 From: dongliang Date: Wed, 6 May 2026 18:02:55 +0930 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A1=E6=A3=80=E6=97=B6=E6=AE=B5?= =?UTF-8?q?=E6=8B=86=E4=B8=BA=E5=BC=80=E5=A7=8B/=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E4=B8=A4=E8=A1=8C=EF=BC=8C=E6=A0=BC=E5=BC=8F=E4=B8=8E=E6=B4=BE?= =?UTF-8?q?=E5=8D=95/=E6=88=AA=E6=AD=A2=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 巡检: 09:00~18:00 → 开始: 09:00 结束: 18:00 Co-Authored-By: Claude Opus 4.6 (1M context) --- .../xiaoqu/watch/ui/task/TaskListFragment.kt | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) 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 + } } }