From 57c036644fae5019385829edbd72be9a7e00fa7d Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 10:18:03 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into jpush_tst
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 166 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 109 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 304f655..edb2001 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -719,6 +719,15 @@
};
}
break;
+ case "hcho":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.youxiu)+ ":(0~0.08mg/m3)",
+ Language.StringByID(StringId.lianghao)+":(0.09~0.1mg/m3)",
+ Language.StringByID(StringId.chaobiao)+ ":>(0.1mg/m3)",
+ };
+ }
+ break;
case "security":
{
list = new List<string> {
@@ -930,71 +939,98 @@
public string GetString(string type, string strValue)
{
string text = "";
- int intValue = 0;
- if (strValue != "")
- {
- intValue = int.Parse(strValue);
- }
-
switch (type)
{
case "pm25":
{
- if (intValue >= 0 && intValue <= 35)
- {
- text = Language.StringByID(StringId.pmyou);
+ switch (strValue) {
+ case "(0,35]": {
+ text = Language.StringByID(StringId.pmyou);
+ }
+ break;
+ case "(36,75]": {
+ text = Language.StringByID(StringId.pmliang);
+ } break;
+ case "(76,115]": {
+ text = Language.StringByID(StringId.pmqingdu);
+ } break;
+ case "(116,150]": {
+ text = Language.StringByID(StringId.pmzhongdu);
+ } break;
+ case "(150,100000]": {
+ text = Language.StringByID(StringId.pmzhongduwuran);
+ } break;
}
- else if (intValue >35 && intValue <= 75)
- {
- text = Language.StringByID(StringId.pmliang);
- }
- else if (intValue > 75 && intValue <= 115)
- {
- text = Language.StringByID(StringId.pmqingdu);
- }
- else if (intValue >115 && intValue <= 150)
- {
- text = Language.StringByID(StringId.pmzhongdu);
- }
- else if (intValue > 150)
- {
- text = Language.StringByID(StringId.pmzhongduwuran);
- }
+
}
break;
case "co2":
{
-
- if (intValue >= 0 && intValue <= 1000)
+ switch (strValue)
{
- text = Language.StringByID(StringId.zhengchang)+ ":0~1000PPM";
- }
- else if (intValue > 1000 && intValue <= 2000)
- {
- text = Language.StringByID(StringId.piangao) + ":1001~2000PPM";
- }
- else if (intValue > 2000)
- {
- text = Language.StringByID(StringId.chaobiao) + ":>2000PPM";
+ case "(0,1000]":
+ {
+ text = Language.StringByID(StringId.zhengchang) + ":0~1000PPM";
+ }
+ break;
+ case "(1001,2000]":
+ {
+ text = Language.StringByID(StringId.piangao) + ":1001~2000PPM";
+ }
+ break;
+ case "(2000,200000]":
+ {
+ text = Language.StringByID(StringId.chaobiao) + ":>2000PPM";
+ }
+ break;
}
}
break;
case "tvoc":
{
+ switch (strValue)
+ {
+ case "(0,399]":
+ {
+ text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
+ }
+ break;
+ case "(400,699]":
+ {
+ text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
+ }
+ break;
+ case "(700,70000]":
+ {
+ text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
+ }
+ break;
+ }
- if (intValue >=1 && intValue <= 3)
+ }
+ break;
+ case "hcho":
+ {
+ switch (strValue)
{
- text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
+ case "(0,0.08]":
+ {
+ text = Language.StringByID(StringId.youxiu) + ":(0~0.08mg/m3)";
+ }
+ break;
+ case "(0.09,0.1]":
+ {
+ text = Language.StringByID(StringId.lianghao) + ":(0.09~0.1mg/m3)";
+ }
+ break;
+ case "(0.1,10000]":
+ {
+ text = Language.StringByID(StringId.chaobiao) + ":>(0.1mg/m3)";
+ }
+ break;
}
- else if (intValue >=4 && intValue<=6)
- {
- text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
- }
- else if (intValue >= 7 && intValue <= 9)
- {
- text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
- }
+
}
break;
}
@@ -1016,23 +1052,23 @@
{
if (text == Language.StringByID(StringId.pmyou))
{
- value = "10";
+ value = "(0,35]";
}
else if (text == Language.StringByID(StringId.pmliang))
{
- value = "50";
+ value = "(36,75]";
}
else if (text == Language.StringByID(StringId.pmqingdu))
{
- value = "90";
+ value = "(76,115]";
}
else if (text == Language.StringByID(StringId.pmzhongdu))
{
- value = "130";
+ value = "(116,150]";
}
else if (text == Language.StringByID(StringId.pmzhongduwuran))
{
- value = "170";
+ value = "(150,100000]";
}
}
break;
@@ -1040,15 +1076,15 @@
{
if (text == Language.StringByID(StringId.zhengchang) + ":0~1000PPM")
{
- value = "400";
+ value = "(0,1000]";
}
else if (text == Language.StringByID(StringId.piangao) + ":1001~2000PPM")
{
- value = "1850";
+ value = "(1001,2000]";
}
else if (text == Language.StringByID(StringId.chaobiao) + ":>2000PPM")
{
- value = "2200";
+ value = "(2000,200000]";
}
}
break;
@@ -1056,15 +1092,31 @@
{
if (text == Language.StringByID(StringId.zhengchang) + ":0~399PPB")
{
- value = "2";
+ value = "(0,399]";
}
else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB")
{
- value = "5";
+ value = "(400,699]";
}
else if (text == Language.StringByID(StringId.yanzhong) + ":>700PPB")
{
- value = "8";
+ value = "(700,70000]";
+ }
+ }
+ break;
+ case "hcho":
+ {
+ if (text == Language.StringByID(StringId.youxiu) + ":(0~0.08mg/m3)")
+ {
+ value = "(0,0.08]";
+ }
+ else if (text == Language.StringByID(StringId.lianghao) + ":(0.09~0.1mg/m3)")
+ {
+ value = "(0.09,0.1]";
+ }
+ else if (text == Language.StringByID(StringId.chaobiao) + ":>(0.1mg/m3)")
+ {
+ value = "(0.1,10000]";
}
}
break;
--
Gitblit v1.8.0