From 32ad85a377b00bc54ad7f15a45d7631d3e2b10d5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 13 六月 2022 17:41:12 +0800
Subject: [PATCH] 2022年06月13日17:39:46
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 82 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index ecbb380..3afc54f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -328,6 +328,33 @@
}
break;
case SPK.SenesorMegahealth:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "people_status":
+ {
+ if (value == "true")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.shi);
+ }
+
+ }
+ break;
+ case "target_status":
+ {
+ if (value == "4")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.shi);
+ }
+ }
+ break;
+ }
+
+ }
+ }break;
case SPK.SenesorMegahealth2:
{
foreach (var dic in dicList)
@@ -420,31 +447,18 @@
}
break;
case SPK.SensorCO2:
- {
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "co2");
- inputView.btnState.Text = str;
-
- }
- break;
case SPK.SensorPm25:
- {
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "pm25");
- inputView.btnState.Text = str;
-
- }
- break;
case SPK.SensorTVOC:
- {
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "tvoc");
- inputView.btnState.Text = str;
-
- }
- break;
case SPK.SensorHcho:
{
- string str = new InpOrOutLogicMethod { }.GetText(dicList, "hcho");
+ string strvalue = "";
+ foreach (var dic in dicList)
+ {
+ strvalue = dic["value"];
+ break;
+ }
+ string str = new PublicInterface().GetSensorLevelText(device, strvalue, true);
inputView.btnState.Text = str;
-
}
break;
case SPK.DoorLock:
@@ -1981,6 +1995,34 @@
}
break;
case SPK.SenesorMegahealth:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "people_status":
+ {
+ if (value == "true")
+ {
+ button1.Text = Language.StringByID(StringId.shi);
+ }
+
+ }
+ break;
+ case "target_status":
+ {
+ if (value == "4")
+ {
+ button2.Text = Language.StringByID(StringId.shi);
+ }
+ }
+ break;
+ }
+
+ }
+ }
+ break;
case SPK.SenesorMegahealth2:
{
foreach (var dic in dicList)
--
Gitblit v1.8.0