diff --git a/app/src/main/java/com/casic/br/app/external/YoloStateConst.kt b/app/src/main/java/com/casic/br/app/external/YoloStateConst.kt deleted file mode 100644 index d615b31..0000000 --- a/app/src/main/java/com/casic/br/app/external/YoloStateConst.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.br.app.external - -@Retention(AnnotationRetention.SOURCE) -annotation class YoloStateConst { - companion object { - /** - * Yolo当前状态 - *
------------------------------
- * 0 - 分类 - * 1 - 分割 - * 2 - 检测 - * 3 - 绘制 - * */ - const val CLASSIFY = 0 - const val SEGMENTATION = 1 - const val DETECT = 2 - const val DRAW = 3 - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/external/YoloStateConst.kt b/app/src/main/java/com/casic/br/app/external/YoloStateConst.kt deleted file mode 100644 index d615b31..0000000 --- a/app/src/main/java/com/casic/br/app/external/YoloStateConst.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.br.app.external - -@Retention(AnnotationRetention.SOURCE) -annotation class YoloStateConst { - companion object { - /** - * Yolo当前状态 - *
------------------------------
- * 0 - 分类 - * 1 - 分割 - * 2 - 检测 - * 3 - 绘制 - * */ - const val CLASSIFY = 0 - const val SEGMENTATION = 1 - const val DETECT = 2 - const val DRAW = 3 - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt index 4b8af60..a1db260 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt @@ -278,15 +278,19 @@ if (isDetectTarget) { binding.detectView.updateTargetPosition(results) - results.forEach { - val label = LocaleConstant.CLASS_NAMES_ARRAY[it.type] - if (label.isInScene(detectedScene)) { - targetSet.add(label) - //显示角标并弹框 - val message = weakReferenceHandler.obtainMessage() - message.what = 2024082902 - message.obj = label - weakReferenceHandler.sendMessage(message) + if (results.isEmpty()) { + detectResultDialog.dismiss() + } else { + results.forEach { + val label = LocaleConstant.CLASS_NAMES_ARRAY[it.type] + if (label.isInScene(detectedScene)) { + targetSet.add(label) + //显示角标并弹框 + val message = weakReferenceHandler.obtainMessage() + message.what = 2024082902 + message.obj = label + weakReferenceHandler.sendMessage(message) + } } } } else {