From fbbd205386a651d5a92e322cf27176c45a1b0242 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: Thu, 23 Apr 2026 09:58:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(glass):=20=E4=BF=AE=E5=A4=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=90=88=E5=8F=A0=E6=94=BE=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F=E5=92=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新 glass3.open.sdk 依赖版本从 2.1.7-E 到 2.1.6-E
- 在 CompositeLayupResultActivity 中添加 activity 状态检查避免已销毁后执行操作
- 在 CompositeLayupTaskActivity 中添加 activity 状态检查避免已销毁后执行操作
- 在 CompositeLayupResultActivity 的 onDestroy 中清理 UI handler 回调和媒体服务监听器
- 在 CompositeLayupTaskActivity 的 onDestroy 中清理媒体服务回调和离线命令监听器
---
 app/build.gradle                                            | 3 ++-
 .../com/nova/brain/glass/ui/CompositeLayupResultActivity.kt | 6 ++++++
 .../com/nova/brain/glass/ui/CompositeLayupTaskActivity.kt   | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5136be5..bd7e69a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,7 +142,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation "io.noties.markwon:core:4.6.2"
 
-    implementation ('com.rokid.security:glass3.open.sdk:2.1.7-E') {
+//    implementation ('com.rokid.security:glass3.open.sdk:2.1.7-E') {
+    implementation ('com.rokid.security:glass3.open.sdk:2.1.6-E') {
         exclude group: "org.slf4j"
     }
     implementation 'com.rokid.security.sdk:online-speech:0.1.0'
diff --git a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
index 37791e9..7958460 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/CompositeLayupResultActivity.kt
@@ -56,11 +56,13 @@ class CompositeLayupResultActivity : BaseActivity<ActivityCompositeLayupResultBi
     private var uiMode = UiMode.RECOGNIZE_SUCCESS
 
     private val layupWorkingRunnable: Runnable = Runnable {
+        if (isFinishing || isDestroyed) return@Runnable
         if (uiMode == UiMode.LAYUP_PROMPT) {
             applyMode(UiMode.LAYUP_WORKING)
         }
     }
     private val completeRunnable: Runnable = Runnable {
+        if (isFinishing || isDestroyed) return@Runnable
         if (uiMode == UiMode.COMPLETE) {
             goTaskList()
         }
@@ -293,6 +295,10 @@ class CompositeLayupResultActivity : BaseActivity<ActivityCompositeLayupResultBi
     }
 
     override fun onDestroy() {
+        uiHandler.removeCallbacksAndMessages(null)
+        GlassMediaServiceHelper.removePhotoCallback(photoCallback)
+        OfflineCmdServiceHelper.removeListenerCompositeLayup()
+        OfflineCmdServiceHelper.removeOnLineListener(listener)
         super.onDestroy()
         window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
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 facf5e2..2e85086 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
@@ -59,6 +59,7 @@ class CompositeLayupTaskActivity :
         override fun getCallbackId(): String = photoCallbackId
 
         override fun onTakePhotoV2(path: String?, width: Int, height: Int) {
+            if (isFinishing || isDestroyed) return
             LogHelper.d("CompositeLayupTask onTakePhotoV2 width=$width height=$height path=$path")
             if (path == null) {
                 if (isPhoto) {
@@ -142,6 +143,9 @@ class CompositeLayupTaskActivity :
     override fun onDestroy() {
         isCaptureInFlight = false
         hasNavigatedNextPage = false
+        GlassMediaServiceHelper.removePhotoCallback(photoCallback)
+        OfflineCmdServiceHelper.removeListenerCompositeLayup()
+        OfflineCmdServiceHelper.removeOnLineListener(listener)
         super.onDestroy()
         window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }