feat(glass): 添加复材铺贴任务功能支持
- 新增复材铺贴任务的语音命令集合,包括开始、继续识别、重拍等操作 - 添加复材铺贴任务的语音命令监听器注册和移除方法 - 在任务列表中集成复材铺贴任务类型的路由跳转逻辑 - 更新检验活动界面提示文本,统一显示标准操作指引 - 从布局文件中移除冗余的任务切换说明文本 - 在应用清单中注册复材铺贴任务活动组件
这个提交包含在:
父节点
b739da5997
当前提交
75e9fca5a4
@ -75,6 +75,9 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name=".ui.TaskListActivity"
|
android:name=".ui.TaskListActivity"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
<activity
|
||||||
|
android:name=".ui.CompositeLayupTaskActivity"
|
||||||
|
android:exported="false" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.ChatActivity"
|
android:name=".ui.ChatActivity"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
|||||||
@ -90,6 +90,17 @@ object OfflineCmdServiceHelper {
|
|||||||
private val CMDS_INSPECTION_COMPLETE = listOf(
|
private val CMDS_INSPECTION_COMPLETE = listOf(
|
||||||
OfflineCmdBean("完成任务", "wan cheng ren wu")
|
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(
|
private val CMDS_WELCOME = listOf(
|
||||||
OfflineCmdBean("决策中心", "jue ce zhong xin"),
|
OfflineCmdBean("决策中心", "jue ce zhong xin"),
|
||||||
OfflineCmdBean("紧急任务", "jin ji ren wu"),
|
OfflineCmdBean("紧急任务", "jin ji ren wu"),
|
||||||
@ -214,6 +225,10 @@ object OfflineCmdServiceHelper {
|
|||||||
|
|
||||||
fun removeListenerInspectionComplete() = removeBeans(CMDS_INSPECTION_COMPLETE)
|
fun removeListenerInspectionComplete() = removeBeans(CMDS_INSPECTION_COMPLETE)
|
||||||
|
|
||||||
|
fun addListenerCompositeLayup() = registerBeans(CMDS_COMPOSITE_LAYUP)
|
||||||
|
|
||||||
|
fun removeListenerCompositeLayup() = removeBeans(CMDS_COMPOSITE_LAYUP)
|
||||||
|
|
||||||
fun addListenerWelcome() = registerBeans(CMDS_WELCOME)
|
fun addListenerWelcome() = registerBeans(CMDS_WELCOME)
|
||||||
|
|
||||||
fun removeListenerWelcome() = removeBeans(CMDS_WELCOME)
|
fun removeListenerWelcome() = removeBeans(CMDS_WELCOME)
|
||||||
|
|||||||
@ -149,7 +149,7 @@ class InspectionActivity :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
viewModel.taskInfoError.observe(this) { msg ->
|
viewModel.taskInfoError.observe(this) { msg ->
|
||||||
binding.hint.text = msg
|
binding.hint.text = "单击或语音输入\"开始\",进入下一步"
|
||||||
msg.showMessage()
|
msg.showMessage()
|
||||||
}
|
}
|
||||||
viewModel.validateState.observe(this) { state ->
|
viewModel.validateState.observe(this) { state ->
|
||||||
@ -172,7 +172,7 @@ class InspectionActivity :
|
|||||||
}
|
}
|
||||||
InspectionValidateState.FAILED -> {
|
InspectionValidateState.FAILED -> {
|
||||||
val msg = viewModel.taskInfoError.value ?: "识别失败,请重试"
|
val msg = viewModel.taskInfoError.value ?: "识别失败,请重试"
|
||||||
binding.hint.text = msg
|
binding.hint.text = "单击或语音输入\"开始\",进入下一步"
|
||||||
msg.showMessage()
|
msg.showMessage()
|
||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
|
|||||||
@ -161,6 +161,13 @@ class TaskListActivity :
|
|||||||
.putExtra("taskName", item.params?.get("taskName").orEmpty())
|
.putExtra("taskName", item.params?.get("taskName").orEmpty())
|
||||||
.putExtra("taskNumber", item.params?.get("taskNumber").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}")
|
else -> Log.d("TaskListActivity", "unknown taskType: ${item.taskType}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -97,7 +97,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="单击或语音输入"开始",进入下一步 滑动切换上/下一个任务"
|
android:text="单击或语音输入"开始",进入下一步"
|
||||||
android:textColor="#ff40FF5E"
|
android:textColor="#ff40FF5E"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|||||||
正在加载...
在新工单中引用
屏蔽一个用户