From e589fcd769e60a2fcfea491c83ddcb3c9b3705a4 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:44:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(task):=20=E8=A7=A3=E5=86=B3=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=93=8D=E4=BD=9C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加任务详情空值检查避免空指针异常
- 在任务加载中时显示提示信息
- 阻止任务未加载完成时的拍照操作
---
 .../com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt     | 4 ++++
 1 file changed, 4 insertions(+)

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 65360b5..facf5e2 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
@@ -150,6 +150,10 @@ class CompositeLayupTaskActivity :
         if (isCaptureInFlight || hasNavigatedNextPage || taskNoFromIntent.isBlank()) {
             return
         }
+        if (viewModel.taskDetail.value == null) {
+            "任务加载中，请稍候".showMessage()
+            return
+        }
         binding.hint.text = "拍照中，请稍后..."
         isPhoto = true
         isCaptureInFlight = true