From 7b92c4536b4280241dc4514898f4654d77935f2a Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 4 Dec 2023 16:27:57 +0800
Subject: [PATCH] =?UTF-8?q?desc:VOCS=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E5=8F=AF=E6=8C=A5=E5=8F=91=E6=80=A7=E6=9C=89=E6=9C=BA=E7=89=A9?=
=?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/yinuo/safetywatcher/watcher/port/GasUtilss.kt | 10 ----------
.../safetywatcher/watcher/port/cmd/GasTypeEnum.kt | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
index 8c6040a..9c9aefd 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
@@ -230,16 +230,6 @@ fun getShowWarnTxt(warn: Warning?): String {
"请注意，${it.gasName}浓度过高:${it.gasValue} ${it.unit}，有醉氧风险"
}
}
- } else if (VOCS == it.gasName) {
- return if (it.overRange) {
- "请注意，可挥发性有机物浓度过高，已超过传感器量程"
- } else {
- if (it.gasValue > it.thresholdHigh) {
- "请注意，可挥发性有机物气体浓度:${it.gasValue} ${it.unit}超过高报值${it.thresholdHigh}"
- } else {
- "请注意，可挥发性有机物气体浓度:${it.gasValue} ${it.unit}超过高报值${it.thresholdLow}"
- }
- }
} else {
return if (it.overRange) {
"请注意，${it.gasName}浓度过高，已超过传感器量程"
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt
index 87d549b..dd22b16 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt
@@ -12,7 +12,7 @@ const val NO2 = "NO2"
const val NO = "NO"
const val HF = "HF"
const val CO2 = "CO2"
-const val VOCS = "VOCS"
+const val VOCS = "可挥发性有机物"
/**
* 气体分子质量