diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5bc31c6..474c4e2 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/ui/InspectionActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt index d4be411..7437e08 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 @@ -2,13 +2,14 @@ package com.nova.brain.glass.ui import com.nova.brain.glass.R import com.nova.brain.glass.databinding.ActivityFoBinding +import com.nova.brain.glass.databinding.ActivityInspectionBinding import com.nova.brain.glass.databinding.ActivityReviewBinding import com.nova.brain.glass.helper.OfflineCmdListener import com.nova.brain.glass.helper.OfflineCmdServiceHelper import com.xuqm.base.ui.BaseActivity -class InspectionActivity : BaseActivity() { - override fun getLayoutId(): Int =R.layout.activity_review +class InspectionActivity : BaseActivity() { + override fun getLayoutId(): Int =R.layout.activity_inspection override fun fullscreen(): Boolean = true private val listener = object : OfflineCmdListener { override fun onOfflineCmd(cmd: String) { @@ -17,12 +18,6 @@ class InspectionActivity : BaseActivity() { "退出","返回","退回"->{ finish() } - "驳回","拒绝","不同意"->{ - finish() - } - "同意","通过"->{ - finish() - } } } } 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 735f011..9be1451 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 @@ -50,6 +50,9 @@ class TaskListActivity : override fun onOfflineCmd(cmd: String) { runOnUiThread { when (cmd) { + "退出","返回","退回"->{ + finish() + } "下一页", "翻页", "查看下一页", "继续翻页", "继续下一页" -> { "--------------->".log() toNext() @@ -162,7 +165,7 @@ class TaskListActivity : when (position % 4) { 0 -> startActivity(Intent(this@TaskListActivity, FoActivity::class.java)) 1 -> startActivity(Intent(this@TaskListActivity, ReviewActivity::class.java)) - 2 -> startActivity(Intent(this@TaskListActivity, ReviewActivity::class.java)) + 2 -> startActivity(Intent(this@TaskListActivity, InspectionActivity::class.java)) 3 -> startActivity(Intent(this@TaskListActivity, ReviewActivity::class.java)) } }