fix(ui): 修复复合材料铺贴任务界面显示问题
- 移除空的叠层名称显示逻辑,统一使用"铺贴任务"前缀 - 修正任务进度计算方式,使用totalSteps获取总步数 - 优化当前步骤详情获取方法,使用stepSeq匹配查找当前步骤
这个提交包含在:
父节点
68b653755b
当前提交
f83dd19370
@ -104,13 +104,10 @@ class CompositeLayupTaskActivity :
|
||||
binding.tvTaskHeader.text = "复材铺贴任务"
|
||||
viewModel.taskDetail.observe(this) { detail ->
|
||||
if (detail == null) return@observe
|
||||
val currentDetail = viewModel.currentDetail()
|
||||
binding.tvTaskName.text = currentDetail?.ply?.ifBlank {
|
||||
detail.taskName.ifBlank { "铺贴任务" }
|
||||
} ?: detail.taskName.ifBlank { "铺贴任务" }
|
||||
binding.tvTaskName.text = "铺贴任务${viewModel.currentStepSeq}"
|
||||
binding.content1.text = "零件号:${detail.partNo.ifBlank { "-" }}"
|
||||
binding.content2.text = "任务编号:${detail.taskNo.ifBlank { taskNoFromIntent }}"
|
||||
binding.content3.text = "任务进度:${viewModel.currentStepSeq}/${detail.taskSteps}"
|
||||
binding.content3.text = "任务进度:${viewModel.currentStepSeq}/${viewModel.totalSteps}"
|
||||
binding.hint.text = "单击或语音输入“开始”,进入下一步"
|
||||
}
|
||||
viewModel.taskDetailError.observe(this) { message ->
|
||||
|
||||
@ -107,7 +107,7 @@ class CompositeLayupTaskVM : BaseListViewModel<ItemItem>() {
|
||||
fun currentDetail(): CompositeLayupDetailItem? =
|
||||
taskDetail.value?.detailList
|
||||
?.sortedBy { it.stepSeq }
|
||||
?.getOrNull((currentStepSeq - 1).coerceAtLeast(0))
|
||||
?.find { it.stepSeq == currentStepSeq }
|
||||
|
||||
fun currentProgressText(): String = "${currentStepSeq}/${totalSteps}"
|
||||
|
||||
|
||||
正在加载...
在新工单中引用
屏蔽一个用户