From 75e9fca5a41547741af8fd76d819640023f3217d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Wed, 22 Apr 2026 16:16:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(glass):=20=E6=B7=BB=E5=8A=A0=E5=A4=8D?= =?UTF-8?q?=E6=9D=90=E9=93=BA=E8=B4=B4=E4=BB=BB=E5=8A=A1=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增复材铺贴任务的语音命令集合，包括开始、继续识别、重拍等操作 - 添加复材铺贴任务的语音命令监听器注册和移除方法 - 在任务列表中集成复材铺贴任务类型的路由跳转逻辑 - 更新检验活动界面提示文本，统一显示标准操作指引 - 从布局文件中移除冗余的任务切换说明文本 - 在应用清单中注册复材铺贴任务活动组件 --- app/src/main/AndroidManifest.xml | 3 +++ .../brain/glass/helper/OfflineCmdServiceHelper.kt | 15 +++++++++++++++ .../com/nova/brain/glass/ui/InspectionActivity.kt | 4 ++-- .../com/nova/brain/glass/ui/TaskListActivity.kt | 7 +++++++ app/src/main/res/layout/activity_inspection.xml | 2 +- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6d7aba8..ff79028 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,6 +75,9 @@ + 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 ed0b2fa..915113b 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 @@ -90,6 +90,17 @@ object OfflineCmdServiceHelper { private val CMDS_INSPECTION_COMPLETE = listOf( OfflineCmdBean("完成任务", "wan cheng ren wu") ) + private val CMDS_COMPOSITE_LAYUP = listOf( + OfflineCmdBean("开始", "kai shi"), + OfflineCmdBean("开始任务", "kai shi ren wu"), + OfflineCmdBean("下一步", "xia yi bu"), + OfflineCmdBean("继续识别", "ji xu shi bie"), + OfflineCmdBean("继续任务", "ji xu ren wu"), + OfflineCmdBean("重拍", "chong pai"), + OfflineCmdBean("重新拍照", "chong xin pai zhao"), + OfflineCmdBean("重新拍摄", "chong xin pai she"), + OfflineCmdBean("完成任务", "wan cheng ren wu") + ) private val CMDS_WELCOME = listOf( OfflineCmdBean("决策中心", "jue ce zhong xin"), OfflineCmdBean("紧急任务", "jin ji ren wu"), @@ -214,6 +225,10 @@ object OfflineCmdServiceHelper { fun removeListenerInspectionComplete() = removeBeans(CMDS_INSPECTION_COMPLETE) + fun addListenerCompositeLayup() = registerBeans(CMDS_COMPOSITE_LAYUP) + + fun removeListenerCompositeLayup() = removeBeans(CMDS_COMPOSITE_LAYUP) + fun addListenerWelcome() = registerBeans(CMDS_WELCOME) fun removeListenerWelcome() = removeBeans(CMDS_WELCOME) diff --git a/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt index 82b821c..7258ce3 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt @@ -149,7 +149,7 @@ class InspectionActivity : } } viewModel.taskInfoError.observe(this) { msg -> - binding.hint.text = msg + binding.hint.text = "单击或语音输入\"开始\"，进入下一步" msg.showMessage() } viewModel.validateState.observe(this) { state -> @@ -172,7 +172,7 @@ class InspectionActivity : } InspectionValidateState.FAILED -> { val msg = viewModel.taskInfoError.value ?: "识别失败，请重试" - binding.hint.text = msg + binding.hint.text = "单击或语音输入\"开始\"，进入下一步" msg.showMessage() } else -> {} diff --git a/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt index e4671d0..bd183d5 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/TaskListActivity.kt @@ -161,6 +161,13 @@ class TaskListActivity : .putExtra("taskName", item.params?.get("taskName").orEmpty()) .putExtra("taskNumber", item.params?.get("taskNumber").orEmpty()) ) + "复材铺贴任务" -> startActivity( + Intent(this, CompositeLayupTaskActivity::class.java) + .putExtra( + CompositeLayupTaskActivity.EXTRA_TASK_NO, + item.params.firstNotBlank("taskNo", "task_no", "taskId", "task_id", "id") + ) + ) else -> Log.d("TaskListActivity", "unknown taskType: ${item.taskType}") } } diff --git a/app/src/main/res/layout/activity_inspection.xml b/app/src/main/res/layout/activity_inspection.xml index ecbe25e..da79133 100644 --- a/app/src/main/res/layout/activity_inspection.xml +++ b/app/src/main/res/layout/activity_inspection.xml @@ -97,7 +97,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:gravity="center" - android:text="单击或语音输入"开始"，进入下一步 滑动切换上/下一个任务" + android:text="单击或语音输入"开始"，进入下一步" android:textColor="#ff40FF5E" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent"