diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index 0b271e7..dd9306a 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -30,6 +30,7 @@ import com.casic.br.ar.app.vm.InspectionViewModel import com.casic.br.ar.app.widgets.DetectResultDialog import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToDate import com.pengxh.kt.lite.extensions.timestampToTime @@ -116,36 +117,20 @@ } override fun initEvent() { -// val instructLifeManager = InstructLifeManager(this, lifecycle, this) -// instructLifeManager.addInstructEntity( -// InstructEntity() -// .addEntityKey(EntityKey("检查清单", "jian cha qing dan")) -// .setShowTips(true) -// .setIgnoreHelp(false) -// .setCallback { _, _, _ -> -// navigatePageTo() -// } -// ).addInstructEntity( -// InstructEntity() -// .addEntityKey(EntityKey("添加隐患", "tian jia yin huan")) -// .setShowTips(true) -// .setIgnoreHelp(false) -// .setCallback { _, _, _ -> -// RuntimeCache.mat = mat -// RuntimeCache.mainDicModels = mainDicModels -// navigatePageTo() -// } -// ).addInstructEntity( -// InstructEntity() -// .addEntityKey(EntityKey("结束检查", "jie shu jian cha")) -// .setShowTips(true) -// .setIgnoreHelp(false) -// .setCallback { _, _, _ -> -// Intent(this, CheckResultActivity::class.java).also { -// stopTaskLauncher.launch(it) -// } -// } -// ) + binding.stopCheckButton.setOnClickListener { + Intent(this, CheckResultActivity::class.java).also { + stopTaskLauncher.launch(it) + } + } + + binding.addHiddenTroubleButton.setOnClickListener { + RuntimeCache.mainDicModels = mainDicModels + navigatePageTo() + } + + binding.checkManifestButton.setOnClickListener { + navigatePageTo() + } } override fun initViewBinding(): ActivityCheckModeBinding { @@ -406,9 +391,6 @@ return } - //暂停算法 - yolov8ncnn.onPause() - val firstYoloResult = output.first().toInt() //取结果的第一个为场景判断 val label = LocaleConstant.CLASS_NAMES_ARRAY[firstYoloResult] @@ -418,6 +400,9 @@ return } + //暂停算法 + yolov8ncnn.onPause() + val message = weakReferenceHandler.obtainMessage() message.what = 2024082901 message.obj = scene @@ -484,16 +469,4 @@ } return true } - -// override fun onInterceptCommand(command: String?): Boolean { -// return false -// } -// -// override fun onTipsUiReady() { -// -// } -// -// override fun onHelpLayerShow(show: Boolean) { -// -// } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index 0b271e7..dd9306a 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -30,6 +30,7 @@ import com.casic.br.ar.app.vm.InspectionViewModel import com.casic.br.ar.app.widgets.DetectResultDialog import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToDate import com.pengxh.kt.lite.extensions.timestampToTime @@ -116,36 +117,20 @@ } override fun initEvent() { -// val instructLifeManager = InstructLifeManager(this, lifecycle, this) -// instructLifeManager.addInstructEntity( -// InstructEntity() -// .addEntityKey(EntityKey("检查清单", "jian cha qing dan")) -// .setShowTips(true) -// .setIgnoreHelp(false) -// .setCallback { _, _, _ -> -// navigatePageTo() -// } -// ).addInstructEntity( -// InstructEntity() -// .addEntityKey(EntityKey("添加隐患", "tian jia yin huan")) -// .setShowTips(true) -// .setIgnoreHelp(false) -// .setCallback { _, _, _ -> -// RuntimeCache.mat = mat -// RuntimeCache.mainDicModels = mainDicModels -// navigatePageTo() -// } -// ).addInstructEntity( -// InstructEntity() -// .addEntityKey(EntityKey("结束检查", "jie shu jian cha")) -// .setShowTips(true) -// .setIgnoreHelp(false) -// .setCallback { _, _, _ -> -// Intent(this, CheckResultActivity::class.java).also { -// stopTaskLauncher.launch(it) -// } -// } -// ) + binding.stopCheckButton.setOnClickListener { + Intent(this, CheckResultActivity::class.java).also { + stopTaskLauncher.launch(it) + } + } + + binding.addHiddenTroubleButton.setOnClickListener { + RuntimeCache.mainDicModels = mainDicModels + navigatePageTo() + } + + binding.checkManifestButton.setOnClickListener { + navigatePageTo() + } } override fun initViewBinding(): ActivityCheckModeBinding { @@ -406,9 +391,6 @@ return } - //暂停算法 - yolov8ncnn.onPause() - val firstYoloResult = output.first().toInt() //取结果的第一个为场景判断 val label = LocaleConstant.CLASS_NAMES_ARRAY[firstYoloResult] @@ -418,6 +400,9 @@ return } + //暂停算法 + yolov8ncnn.onPause() + val message = weakReferenceHandler.obtainMessage() message.what = 2024082901 message.obj = scene @@ -484,16 +469,4 @@ } return true } - -// override fun onInterceptCommand(command: String?): Boolean { -// return false -// } -// -// override fun onTipsUiReady() { -// -// } -// -// override fun onHelpLayerShow(show: Boolean) { -// -// } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_mode.xml b/app/src/main/res/layout/activity_check_mode.xml index 9920bc0..243f7bf 100644 --- a/app/src/main/res/layout/activity_check_mode.xml +++ b/app/src/main/res/layout/activity_check_mode.xml @@ -1,27 +1,76 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - + android:orientation="horizontal"> + +