diff --git a/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt index b49bee0..e8f61dd 100644 --- a/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt @@ -37,7 +37,7 @@ "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌", "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪", "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌", - "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头", + "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头", "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器", "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露", "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥", diff --git a/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt index b49bee0..e8f61dd 100644 --- a/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/ar/app/utils/LocaleConstant.kt @@ -37,7 +37,7 @@ "三脚架", "三通", "标准软管", "人", "作业信息公示牌", "切断阀", "危险告知牌", "压力表", "压力表", "防护服", "可燃气体报警控制器", "呼气器", "喉箍", "气体检测报警仪", "水枪", "头", "安全告知牌", "安全带", "安全帽", "安全标识", "安全标识牌", - "安全绳", "对讲设备", "水枪", "工服", "开关", "报警装置", "接头", + "安全绳", "对讲设备", "水枪", "工服", "开关", "燃气探测器", "接头", "施工路牌", "气体检测报警仪", "水带", "水带", "流量计", "消火栓箱", "灭火器", "灶台", "灶具", "照明设备", "熄火保护", "燃气管道", "燃气计量器具", "电线裸露", "电路图", "警戒线", "调压器", "调长器", "贴纸", "跨电线", "路锥", diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/CheckItemDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/CheckItemDialog.kt index 9439ed6..8ae9e5b 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/CheckItemDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/CheckItemDialog.kt @@ -108,8 +108,14 @@ detectHelper.siftHiddenTrouble(targetTypeSet, segmentationResults, detectResults) for (result in detectResults) { val typeName = LocaleConstant.TARGET_NAMES_ARRAY[result.type] - if (checkItem.contains(typeName) || checkItem.contains("对讲设备")) { - startCountDownTimer(typeName, false) + val type = if (typeName == "可燃气体报警控制器") { + "燃气泄漏报警装置" + } else { + typeName + } + + if (checkItem.contains(type) || checkItem.contains("对讲设备")) { + startCountDownTimer(type, false) return } }