From afe5eeb017f0507f0e4519c8fb60841639d78e7d 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 21:08:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(glass):=20=E6=B7=BB=E5=8A=A0=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E6=8B=8D=E6=91=84=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=96=B7=E6=B4=92=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在离线命令服务中添加"继续拍摄"语音指令支持
- 更新喷洒结果页面的语音指令响应逻辑，支持重拍和继续拍摄操作
- 在页面销毁时增加图片路径传递和显示功能
- 重构页面布局结构，添加二维码识别结果显示区域
- 更新提示文本内容，明确说明各种语音操作指令
- 调整页面元素的位置和尺寸以适应新的界面布局需求
---
 .../glass/helper/OfflineCmdServiceHelper.kt   |   1 +
 .../brain/glass/ui/SprayingResultActivity.kt  |   5 +-
 .../res/layout/activity_spraying_result.xml   | 100 ++++++++++++------
 3 files changed, 73 insertions(+), 33 deletions(-)

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 9c5dff4..147258f 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
@@ -146,6 +146,7 @@ object OfflineCmdServiceHelper {
         add(OfflineCmdBean("重拍", "chong pai"))
         add(OfflineCmdBean("重新拍", "chong xin pai"))
         add(OfflineCmdBean("再拍一次", "zai pai yi ci"))
+        add(OfflineCmdBean("继续拍摄", "ji xu pai she"))
     }
     fun init(){
         val service = GlassSdk.getGlassOfflineCmdService()
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 329c51c..792a0cf 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
@@ -39,7 +39,7 @@ class SprayingResultActivity :
                         finish()
                     }
 
-                    "开始", "拍照", "开始拍照", "开始任务" -> {
+                    "重拍", "重新拍", "继续拍照", "再拍一次", "继续拍摄" -> {
                         runOnUiThread {
                             binding.hint.text = "拍照中，请稍后..."
                         }
@@ -109,6 +109,9 @@ class SprayingResultActivity :
         super.onDestroy()
         OfflineCmdServiceHelper.removeOnLineListener(listener)
         GlassSdk.getGlassMediaService()?.removePhotoCallback(mPhotoFileCallback)
+        intent.getStringExtra("path")?.apply {
+            binding.iv.setImageBitmap(BitmapFactory.decodeFile(this))
+        }
     }
 
     private var isPhoto = false
diff --git a/app/src/main/res/layout/activity_spraying_result.xml b/app/src/main/res/layout/activity_spraying_result.xml
index db887fe..ff5e988 100644
--- a/app/src/main/res/layout/activity_spraying_result.xml
+++ b/app/src/main/res/layout/activity_spraying_result.xml
@@ -14,8 +14,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="67dp"
             android:background="@drawable/bg_item"
-            android:text="OCR识别结果：合格"
             android:gravity="center"
+            android:text="OCR识别结果：合格"
             android:textColor="#ff40FF5E"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -23,8 +23,8 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
             android:id="@+id/content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:orientation="vertical"
@@ -33,58 +33,94 @@
             app:layout_constraintTop_toBottomOf="@+id/tvTaskHeader">
 
             <LinearLayout
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginTop="30dp"
-                android:gravity="center|left"
-                app:layout_constraintEnd_toEndOf="parent"
                 android:layout_width="400dp"
-                android:orientation="horizontal"
+                android:layout_height="183dp"
+                android:layout_marginTop="30dp"
                 android:background="@drawable/bg_task_title_selected"
-                android:layout_height="183dp">
-                <ImageView
-                    android:background="@drawable/bg_task_title_selected"
-                    android:layout_width="120dp"
-                    android:id="@+id/iv"
-                    android:layout_marginStart="10dp"
-                    android:layout_height="150dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/hint"/>
-
-            </LinearLayout>
-            <ImageView
+                android:gravity="center|left"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/iv"
+                    android:layout_width="120dp"
+                    android:layout_height="150dp"
+                    android:layout_marginStart="10dp"
+                    android:background="@drawable/bg_task_title_selected"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/hint" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="识码一：XXXXX"
+                        android:textColor="#ff40FF5E"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="16dp"
+                        android:text="识码二：XXXXX"
+                        android:textColor="#ff40FF5E"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="16dp"
+                        android:text="两码一致，符合要求！"
+                        android:textColor="#ff40FF5E"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <ImageView
                 android:layout_width="90dp"
+                android:layout_height="90dp"
                 android:src="@mipmap/ocr_true"
-                android:layout_height="90dp"/>
-            
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/baseRecyclerView"
             android:layout_width="0dp"
             android:layout_height="88dp"
-            android:clipToPadding="false"
             android:layout_marginTop="12dp"
+            android:clipToPadding="false"
             android:overScrollMode="never"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/content" />
+
         <TextView
-            android:layout_width="match_parent"
-            android:layout_marginStart="15dp"
             android:id="@+id/hint"
-            android:layout_marginTop="10dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/baseRecyclerView"
             android:layout_marginVertical="4dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="10dp"
             android:gravity="center"
-            android:text="单击或语音输入“开始”，进入下一步"
+            android:text="单击或语音输入“继续拍摄”，可以继续拍摄下一张证\n
+单击或语音输入“结束任务”，结束全部拍摄并提交任务\n
+单击或语音输入“人工更正结果”，可更改当前检验结果\n
+语音输入“重拍”，可重新拍摄当前照片"
             android:textColor="#ff40FF5E"
-            android:textSize="14sp"/>
+            android:textSize="14sp"
+            app:layout_constraintTop_toBottomOf="@+id/baseRecyclerView" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>