From 19997b4d54e803c67443a42711bd48de04bf41c9 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: Tue, 14 Apr 2026 22:48:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(spraying):=20=E6=B7=BB=E5=8A=A0=E5=96=B7?=
 =?UTF-8?q?=E6=B4=92=E4=BD=9C=E4=B8=9A=E8=A1=A5=E5=85=85=E6=8B=8D=E7=85=A7?=
 =?UTF-8?q?=E5=92=8C=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在离线命令服务中增加补充照片、确认提交、提交、确认等语音指令
- 集成SprayingPhotoManager管理器用于照片操作
- 在拍照前和提交后调用SprayingPhotoManager.clear()清理照片
- 在OCR识别和结果页面添加照片到管理器
- 新增SprayingFinishActivity用于处理完成操作
- 实现finishLauncher处理补充拍照和提交动作
- 更新AndroidManifest.xml注册新活动
---
 app/src/main/AndroidManifest.xml              |  3 +++
 .../glass/helper/OfflineCmdServiceHelper.kt   |  4 +++
 .../nova/brain/glass/ui/SprayingActivity.kt   |  4 +++
 .../brain/glass/ui/SprayingOCRActivity.kt     |  2 ++
 .../brain/glass/ui/SprayingResultActivity.kt  | 26 ++++++++++++++++++-
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3658d39..fda696a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
         <activity
             android:name=".ui.SprayingManualResultActivity"
             android:exported="false" />
+        <activity
+            android:name=".ui.SprayingFinishActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.WelcomeActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt
index 21cb8d4..c3fb793 100644
--- a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt
+++ b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt
@@ -163,6 +163,10 @@ object OfflineCmdServiceHelper {
         add(OfflineCmdBean("结束", "jie shu"))
         add(OfflineCmdBean("完成", "wan cheng"))
         add(OfflineCmdBean("完成任务", "wan cheng ren wu"))
+        add(OfflineCmdBean("补充照片", "bu chong zhao pian"))
+        add(OfflineCmdBean("确认提交", "que ren ti jiao"))
+        add(OfflineCmdBean("提交", "ti jiao"))
+        add(OfflineCmdBean("确认", "que ren"))
         //
     }
     fun init(){
diff --git a/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt
index 0571bab..67f9e42 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt
@@ -7,6 +7,7 @@ import com.nova.brain.glass.R
 import com.nova.brain.glass.databinding.ActivitySprayingBinding
 import com.nova.brain.glass.helper.OfflineCmdListener
 import com.nova.brain.glass.helper.OfflineCmdServiceHelper
+import com.nova.brain.glass.helper.SprayingPhotoManager
 import com.nova.brain.glass.model.ItemItem
 import com.nova.brain.glass.viewmodel.SprayingVM
 import com.rokid.security.glass3.open.sdk.GlassSdk
@@ -40,6 +41,7 @@ class SprayingActivity :
                         runOnUiThread {
                             binding.hint.text = "拍照中，请稍后..."
                         }
+                        SprayingPhotoManager.clear()
                         isPhoto = true
                         takePhoto()
                     }
@@ -82,6 +84,7 @@ class SprayingActivity :
                     "相机异常".showMessage()
                 }
             } else {
+                SprayingPhotoManager.addPhoto(path)
                 startActivity(Intent(this@SprayingActivity, SprayingOCRActivity::class.java).apply {
                     putExtra("path", path)
                 })
@@ -122,6 +125,7 @@ class SprayingActivity :
                             runOnUiThread {
                                 binding.hint.text = "拍照中，请稍后..."
                             }
+                            SprayingPhotoManager.clear()
                             isPhoto = true
                             takePhoto()
                         }
diff --git a/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt
index b7b55e4..04fc518 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt
@@ -10,6 +10,7 @@ import com.nova.brain.glass.R
 import com.nova.brain.glass.databinding.ActivitySprayingOcrBinding
 import com.nova.brain.glass.helper.OfflineCmdListener
 import com.nova.brain.glass.helper.OfflineCmdServiceHelper
+import com.nova.brain.glass.helper.SprayingPhotoManager
 import com.nova.brain.glass.model.ItemItem
 import com.nova.brain.glass.viewmodel.SprayingOCRVM
 import com.nova.brain.glass.viewmodel.SprayingVM
@@ -85,6 +86,7 @@ class SprayingOCRActivity :
                     "相机异常".showMessage()
                 }
             } else {
+                SprayingPhotoManager.addPhoto(path)
                 runOnUiThread {
                     binding.hint.text = "单击或语音输入“重拍”，可重新拍摄"
                     showPhoto(path)
diff --git a/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt
index 58402bf..7af5615 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt
@@ -12,6 +12,7 @@ import com.nova.brain.glass.R
 import com.nova.brain.glass.databinding.ActivitySprayingResultBinding
 import com.nova.brain.glass.helper.OfflineCmdListener
 import com.nova.brain.glass.helper.OfflineCmdServiceHelper
+import com.nova.brain.glass.helper.SprayingPhotoManager
 import com.nova.brain.glass.model.ItemItem
 import com.nova.brain.glass.viewmodel.SprayingResultVM
 import com.rokid.security.glass3.open.sdk.GlassSdk
@@ -50,6 +51,26 @@ class SprayingResultActivity :
                 }
             }
         }
+    private val finishLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode != Activity.RESULT_OK) {
+                return@registerForActivityResult
+            }
+            when (result.data?.getStringExtra(SprayingFinishActivity.EXTRA_FINISH_ACTION)) {
+                SprayingFinishActivity.ACTION_SUPPLEMENT -> {
+                    runOnUiThread {
+                        binding.hint.text = "拍照中，请稍后..."
+                    }
+                    isPhoto = true
+                    takePhoto()
+                }
+
+                SprayingFinishActivity.ACTION_SUBMIT -> {
+                    SprayingPhotoManager.clear()
+                    finish()
+                }
+            }
+        }
 
     private val listener = object : OfflineCmdListener {
         override fun onOfflineCmd(cmd: String) {
@@ -91,7 +112,9 @@ class SprayingResultActivity :
     fun rest() {
         manualResultLauncher.launch(Intent(this, SprayingManualResultActivity::class.java))
     }
-    fun taskFinish(){}
+    fun taskFinish() {
+        finishLauncher.launch(Intent(this, SprayingFinishActivity::class.java))
+    }
 
     private val photoCallbackId = UUID.randomUUID().toString()
 
@@ -117,6 +140,7 @@ class SprayingResultActivity :
                     "相机异常".showMessage()
                 }
             } else {
+                SprayingPhotoManager.addPhoto(path)
                 startActivity(
                     Intent(
                         this@SprayingResultActivity, SprayingOCRActivity::class.java