feat: 巡检任务显示巡检时段

taskType=5 时在所有状态(待抢单/待打卡/进行中)显示
🔍巡检{executeTimeStart}~{executeTimeEnd}

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
dongliang
2026-05-06 17:36:26 +09:30
parent 48b88eaa4b
commit 0941138a9f

View File

@@ -260,11 +260,16 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
binding.tvPosition.text = "📍 ${detail.positionText}" binding.tvPosition.text = "📍 ${detail.positionText}"
binding.tvPosition.visibility = View.VISIBLE binding.tvPosition.visibility = View.VISIBLE
} }
// 时间(派单时间 + 截止时间) // 时间(派单时间 + 截止时间 + 巡检时段
val timeLines = mutableListOf<String>() val timeLines = mutableListOf<String>()
if (detail.sendTime.isNotEmpty()) timeLines.add("🕐${detail.sendTime}派单") if (detail.sendTime.isNotEmpty()) timeLines.add("🕐${detail.sendTime}派单")
if (!detail.expireTime.isNullOrEmpty()) timeLines.add("⏰截止${detail.expireTime}") if (!detail.expireTime.isNullOrEmpty()) timeLines.add("⏰截止${detail.expireTime}")
if (!detail.preFinishTime.isNullOrEmpty()) timeLines.add("📋要求${detail.preFinishTime}完成") 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()) { if (timeLines.isNotEmpty()) {
binding.tvTimeInfo.text = timeLines.joinToString("\n") binding.tvTimeInfo.text = timeLines.joinToString("\n")
binding.tvTimeInfo.visibility = View.VISIBLE binding.tvTimeInfo.visibility = View.VISIBLE
@@ -280,6 +285,8 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
// ===== 待打卡:指引去哪+怎么做 ===== // ===== 待打卡:指引去哪+怎么做 =====
3 -> { 3 -> {
// 巡检时段
showInspectTime(detail)
// 备注 // 备注
showNote(detail) showNote(detail)
@@ -296,6 +303,8 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
// ===== 进行中/待完成:地点+打卡时间+完成指引 ===== // ===== 进行中/待完成:地点+打卡时间+完成指引 =====
4 -> { 4 -> {
// 巡检时段
showInspectTime(detail)
if (detail.taskType == 5) { if (detail.taskType == 5) {
// ===== 巡检任务:显示场景打卡清单 ===== // ===== 巡检任务:显示场景打卡清单 =====
showInspectScenes(detail) showInspectScenes(detail)
@@ -324,6 +333,15 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
} }
} }
/** 显示巡检时段(仅 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 */ /** 显示备注/描述content 或 taskRequire */
private fun showNote(detail: TaskDetail) { private fun showNote(detail: TaskDetail) {
val note = when { val note = when {