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"