From 0941138a9f60b2e96e83a413221269ecefc38ae2 Mon Sep 17 00:00:00 2001 From: dongliang Date: Wed, 6 May 2026 17:36:26 +0930 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=A1=E6=A3=80=E6=97=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit taskType=5 时在所有状态(待抢单/待打卡/进行中)显示 🔍巡检{executeTimeStart}~{executeTimeEnd} Co-Authored-By: Claude Opus 4.6 (1M context) --- .../xiaoqu/watch/ui/task/TaskListFragment.kt | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) 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 1f58cc6..07da5e1 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 @@ -260,11 +260,16 @@ class TaskListFragment : BaseFragment() { binding.tvPosition.text = "📍 ${detail.positionText}" binding.tvPosition.visibility = View.VISIBLE } - // 时间(派单时间 + 截止时间) + // 时间(派单时间 + 截止时间 + 巡检时段) val timeLines = mutableListOf() 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 (timeLines.isNotEmpty()) { binding.tvTimeInfo.text = timeLines.joinToString("\n") binding.tvTimeInfo.visibility = View.VISIBLE @@ -280,6 +285,8 @@ class TaskListFragment : BaseFragment() { // ===== 待打卡:指引去哪+怎么做 ===== 3 -> { + // 巡检时段 + showInspectTime(detail) // 备注 showNote(detail) @@ -296,6 +303,8 @@ class TaskListFragment : BaseFragment() { // ===== 进行中/待完成:地点+打卡时间+完成指引 ===== 4 -> { + // 巡检时段 + showInspectTime(detail) if (detail.taskType == 5) { // ===== 巡检任务:显示场景打卡清单 ===== showInspectScenes(detail) @@ -324,6 +333,15 @@ class TaskListFragment : BaseFragment() { } } + /** 显示巡检时段(仅 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 + } + } + /** 显示备注/描述(content 或 taskRequire) */ private fun showNote(detail: TaskDetail) { val note = when {