diff --git a/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java index 7ac5d91..6816d01 100644 --- a/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java @@ -52,7 +52,7 @@ private String createUserId; private String createUserName; private String id; - private int num; + private String num; private String remark; private String scene; private String sceneName; @@ -142,11 +142,11 @@ this.id = id; } - public int getNum() { + public String getNum() { return num; } - public void setNum(int num) { + public void setNum(String num) { this.num = num; } diff --git a/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java b/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java index 7ac5d91..6816d01 100644 --- a/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java +++ b/app/src/main/java/com/casic/br/app/model/TargetCheckManifestModel.java @@ -52,7 +52,7 @@ private String createUserId; private String createUserName; private String id; - private int num; + private String num; private String remark; private String scene; private String sceneName; @@ -142,11 +142,11 @@ this.id = id; } - public int getNum() { + public String getNum() { return num; } - public void setNum(int num) { + public void setNum(String num) { this.num = num; } diff --git a/app/src/main/java/com/casic/br/app/utils/YoloTargetDetectHelper.kt b/app/src/main/java/com/casic/br/app/utils/YoloTargetDetectHelper.kt index c672549..57797c3 100644 --- a/app/src/main/java/com/casic/br/app/utils/YoloTargetDetectHelper.kt +++ b/app/src/main/java/com/casic/br/app/utils/YoloTargetDetectHelper.kt @@ -227,7 +227,7 @@ } } - if (!segmentationResults.isContains(4)) { + if (segmentationResults.isContains(4)) { val result = HiddenTroubleResult() result.alarmCode = "NonResidentUserHasPipelineRust" result.warning = "腐蚀、锈蚀" @@ -236,7 +236,7 @@ } } - if (!segmentationResults.isContains(0)) { + if (segmentationResults.isContains(0)) { val result = HiddenTroubleResult() result.alarmCode = "NonResidentUserHasHoseFlexure" result.warning = "软管不可恢复的弯折拉伸" @@ -247,7 +247,7 @@ } "调压站" -> { - if (!segmentationResults.isContains(4)) { + if (segmentationResults.isContains(4)) { val result = HiddenTroubleResult() result.alarmCode = "NonResidentUserHasPipelineRust" result.warning = "腐蚀、锈蚀" @@ -255,15 +255,6 @@ hiddenTroubles.add(result) } } - - if (!segmentationResults.isContains(0)) { - val result = HiddenTroubleResult() - result.alarmCode = "NonResidentUserHasHoseFlexure" - result.warning = "软管不可恢复的弯折拉伸" - if (!detectedTargetSet.contains(result.warning)) { - hiddenTroubles.add(result) - } - } } }