From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 八月 2021 09:11:51 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 4683464..27524ab 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -690,18 +690,18 @@
case "co2":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.piangao),
- Language.StringByID(StringId.chaobiao),
+ Language.StringByID(StringId.zhengchang)+ ":0~1000PPM",
+ Language.StringByID(StringId.piangao) + ":1001~2000PPM",
+ Language.StringByID(StringId.chaobiao) + ":>2000PPM",
};
}
break;
case "tvoc":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.chaobiao),
- Language.StringByID(StringId.yanzhong),
+ Language.StringByID(StringId.zhengchang)+ ":0~399PPB",
+ Language.StringByID(StringId.chaobiao)+ ":400~699PPB",
+ Language.StringByID(StringId.yanzhong)+":>700PPB",
};
}
break;
@@ -899,19 +899,19 @@
case "pm25":
{
- if (intValue > 0 && intValue < 35)
+ if (intValue >= 0 && intValue <= 35)
{
text = Language.StringByID(StringId.pmyou);
}
- else if (intValue > 35 && intValue < 75)
+ else if (intValue >35 && intValue <= 75)
{
text = Language.StringByID(StringId.pmliang);
}
- else if (intValue > 75 && intValue < 115)
+ else if (intValue > 75 && intValue <= 115)
{
text = Language.StringByID(StringId.pmqingdu);
}
- else if (intValue > 115 && intValue < 150)
+ else if (intValue >115 && intValue <= 150)
{
text = Language.StringByID(StringId.pmzhongdu);
}
@@ -924,17 +924,17 @@
case "co2":
{
- if (intValue > 0 && intValue < 800)
+ if (intValue >= 0 && intValue <= 1000)
{
- text = Language.StringByID(StringId.zhengchang);
+ text = Language.StringByID(StringId.zhengchang)+ ":0~1000PPM";
}
- else if (intValue > 800 && intValue < 1100)
+ else if (intValue > 1000 && intValue <= 2000)
{
- text = Language.StringByID(StringId.piangao);
+ text = Language.StringByID(StringId.piangao) + ":1001~2000PPM";
}
- else if (intValue > 1100)
+ else if (intValue > 2000)
{
- text = Language.StringByID(StringId.chaobiao);
+ text = Language.StringByID(StringId.chaobiao) + ":>2000PPM";
}
}
break;
@@ -943,15 +943,15 @@
if (intValue >=1 && intValue <= 3)
{
- text = Language.StringByID(StringId.zhengchang);
+ text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
}
else if (intValue >=4 && intValue<=6)
{
- text = Language.StringByID(StringId.chaobiao);
+ text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
}
else if (intValue >= 7 && intValue <= 9)
{
- text = Language.StringByID(StringId.yanzhong);
+ text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
}
}
break;
@@ -996,31 +996,31 @@
break;
case "co2":
{
- if (text == Language.StringByID(StringId.zhengchang))
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~1000PPM")
{
value = "400";
}
- else if (text == Language.StringByID(StringId.piangao))
+ else if (text == Language.StringByID(StringId.piangao) + ":1001~2000PPM")
{
- value = "850";
+ value = "1850";
}
- else if (text == Language.StringByID(StringId.chaobiao))
+ else if (text == Language.StringByID(StringId.chaobiao) + ":>2000PPM")
{
- value = "1200";
+ value = "2200";
}
}
break;
case "tvoc":
{
- if (text == Language.StringByID(StringId.zhengchang))
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~399PPB")
{
value = "2";
}
- else if (text == Language.StringByID(StringId.chaobiao))
+ else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB")
{
value = "5";
}
- else if (text == Language.StringByID(StringId.yanzhong))
+ else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
{
value = "8";
}
--
Gitblit v1.8.0