From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 216 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 157 insertions(+), 59 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 92fc099..7398574 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -648,6 +648,16 @@
};
}
break;
+ case "airFresh":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.zidong),
+ Language.StringByID(StringId.shoudong),
+ Language.StringByID(StringId.dingshi),
+ Language.StringByID(StringId.zhineng),
+ };
+ }
+ break;
case "week":
{
list = new List<string> {
@@ -709,7 +719,31 @@
};
}
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> {
+ Language.StringByID(StringId.bufang ),
+ Language.StringByID(StringId.chefang),
+ };
+ }
+ break;
+ case "鍦扮悊鍥存爮":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.likai ),
+ Language.StringByID(StringId.daoda),
+ };
+ }
+ break;
}
return list;
}
@@ -785,6 +819,27 @@
else if (text == Language.StringByID(StringId.timeMode))
{
str = "timer";
+ }
+ }
+ break;
+ case "airFresh":
+ {
+
+ if (text == Language.StringByID(StringId.autoLogic))
+ {
+ str = "auto";
+ }
+ else if (text == Language.StringByID(StringId.shoudong))
+ {
+ str = "manual";
+ }
+ else if (text == Language.StringByID(StringId.dingshi))
+ {
+ str = "timer";
+ }
+ else if (text == Language.StringByID(StringId.zhineng))
+ {
+ str = "smart";
}
}
break;
@@ -892,71 +947,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 "(35,75]": {
+ text = Language.StringByID(StringId.pmliang);
+ } break;
+ case "(75,115]": {
+ text = Language.StringByID(StringId.pmqingdu);
+ } break;
+ case "(115,150]": {
+ text = Language.StringByID(StringId.pmzhongdu);
+ } break;
+ case "(151,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 "(1000,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 "(399,699]":
+ {
+ text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
+ }
+ break;
+ case "(699,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.08,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;
}
@@ -978,23 +1060,23 @@
{
if (text == Language.StringByID(StringId.pmyou))
{
- value = "10";
+ value = "(0,35]";
}
else if (text == Language.StringByID(StringId.pmliang))
{
- value = "50";
+ value = "(35,75]";
}
else if (text == Language.StringByID(StringId.pmqingdu))
{
- value = "90";
+ value = "(75,115]";
}
else if (text == Language.StringByID(StringId.pmzhongdu))
{
- value = "130";
+ value = "(115,150]";
}
else if (text == Language.StringByID(StringId.pmzhongduwuran))
{
- value = "170";
+ value = "(150,100000]";
}
}
break;
@@ -1002,15 +1084,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 = "(1000,2000]";
}
else if (text == Language.StringByID(StringId.chaobiao) + ":>2000PPM")
{
- value = "2200";
+ value = "(2000,200000]";
}
}
break;
@@ -1018,15 +1100,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 = "(399,699]";
}
- else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
+ else if (text == Language.StringByID(StringId.yanzhong) + ":>700PPB")
{
- value = "8";
+ value = "(699,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.08,0.1]";
+ }
+ else if (text == Language.StringByID(StringId.chaobiao) + ":>(0.1mg/m3)")
+ {
+ value = "(0.1,10000]";
}
}
break;
--
Gitblit v1.8.0