diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 474c4e2..579012e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,6 +78,9 @@ + @@ -110,4 +113,4 @@ android:value="600" /> - \ No newline at end of file + 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 new file mode 100644 index 0000000..162ee15 --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt @@ -0,0 +1,34 @@ +package com.nova.brain.glass.ui + +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.xuqm.base.ui.BaseActivity + +class SprayingActivity : BaseActivity() { + override fun getLayoutId(): Int = R.layout.activity_spraying + override fun fullscreen(): Boolean = true + + private val listener = object : OfflineCmdListener { + override fun onOfflineCmd(cmd: String) { + runOnUiThread { + when (cmd) { + "退出", "返回", "退回" -> { + finish() + } + } + } + } + } + + override fun initData() { + super.initData() + OfflineCmdServiceHelper.addOnLineListener(listener) + } + + override fun onDestroy() { + super.onDestroy() + OfflineCmdServiceHelper.removeOnLineListener(listener) + } +} 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 9be1451..7b2667c 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 @@ -166,7 +166,7 @@ class TaskListActivity : 0 -> startActivity(Intent(this@TaskListActivity, FoActivity::class.java)) 1 -> startActivity(Intent(this@TaskListActivity, ReviewActivity::class.java)) 2 -> startActivity(Intent(this@TaskListActivity, InspectionActivity::class.java)) - 3 -> startActivity(Intent(this@TaskListActivity, ReviewActivity::class.java)) + 3 -> startActivity(Intent(this@TaskListActivity, SprayingActivity::class.java)) } } diff --git a/app/src/main/res/layout/activity_spraying.xml b/app/src/main/res/layout/activity_spraying.xml new file mode 100644 index 0000000..69e9e11 --- /dev/null +++ b/app/src/main/res/layout/activity_spraying.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + +