From f83dd19370fe9ebccf4fbdb11d77aaabaca38207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Wed, 22 Apr 2026 20:17:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=90=88?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E9=93=BA=E8=B4=B4=E4=BB=BB=E5=8A=A1=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除空的叠层名称显示逻辑，统一使用"铺贴任务"前缀
- 修正任务进度计算方式，使用totalSteps获取总步数
- 优化当前步骤详情获取方法，使用stepSeq匹配查找当前步骤
---
 .../com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt  | 7 ++-----
 .../com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
index 016fe85..65360b5 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt
@@ -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 ->
diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
index 4e037cf..03ee686 100644
--- a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
+++ b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
@@ -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}"