shumeng/xqwatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 巡检时段拆为开始/结束两行，格式与派单/截止统一

Browse Source 
巡检: 09:00~18:00 → 开始: 09:00
                     结束: 18:00

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
dongliang
2026-05-06 18:02:55 +09:30
parent 777c867711
commit a0c0e74dda
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
View File

@@ -265,10 +265,10 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
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()) { if (detail.taskType == 5) {
val end = detail.executeTimeEnd ?: "" if (!detail.executeTimeStart.isNullOrEmpty()) timeLines.add("开始: ${detail.executeTimeStart}")
timeLines.add("巡检: ${detail.executeTimeStart}~${end}") if (!detail.executeTimeEnd.isNullOrEmpty()) timeLines.add("结束: ${detail.executeTimeEnd}")
} }
if (timeLines.isNotEmpty()) { if (timeLines.isNotEmpty()) {
binding.tvTimeInfo.text = timeLines.joinToString("\n") binding.tvTimeInfo.text = timeLines.joinToString("\n")
@@ -333,12 +333,16 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
} }
} }
/** 显示巡检时段（仅 taskType=5 时） */ /** 显示巡检时段（仅 taskType=5 时，拆为开始/结束两行） */
private fun showInspectTime(detail: TaskDetail) { private fun showInspectTime(detail: TaskDetail) {
if (detail.taskType == 5 && !detail.executeTimeStart.isNullOrEmpty()) { if (detail.taskType == 5) {
val end = detail.executeTimeEnd ?: "" val lines = mutableListOf<String>()
binding.tvTimeInfo.text = "巡检: ${detail.executeTimeStart}~${end}" if (!detail.executeTimeStart.isNullOrEmpty()) lines.add("开始: ${detail.executeTimeStart}")
binding.tvTimeInfo.visibility = View.VISIBLE if (!detail.executeTimeEnd.isNullOrEmpty()) lines.add("结束: ${detail.executeTimeEnd}")
if (lines.isNotEmpty()) {
binding.tvTimeInfo.text = lines.joinToString("\n")
binding.tvTimeInfo.visibility = View.VISIBLE
}
} }
} }