From 56dfdc1bf7e7f2bb2456f29c3686dfa935a89e80 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 13:59:45 +0800
Subject: [PATCH] 2022年06月30日13:59:08
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 158 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 139 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 646c43e..3db5687 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,31 @@
}
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:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "open")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
+ }
+ }
}
break;
}
@@ -1057,6 +1084,25 @@
}
}
break;
+ case SPK.CurtainDream:
+ {
+ string percent = GetKeyValue("percent", dicList);
+ string angle = GetKeyValue("angle", dicList);
+ if (percent != "" && angle != "")
+ {
+ stateStr += Language.StringByID(StringId.onLogic) + percent + "%;";
+ stateStr +=Language.StringByID(StringId.Angle)+angle + "掳";
+ }
+ else if (percent != "")
+ {
+ stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
+ }
+ else if (angle != "")
+ {
+ stateStr = Language.StringByID(StringId.onLogic) + Language.StringByID(StringId.Angle) + angle + "掳";
+ }
+ }
+ break;
case SPK.AcStandard:
case SPK.HvacAC:
{
@@ -1564,6 +1610,39 @@
}
break;
+ case SPK.CurtainDream:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "percent":
+ {
+ if (button1 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ button1.Text = value + "%";
+ }
+ break;
+ case "angle":
+ {
+ if (button2 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ button2.Text = value + "掳";
+ }
+ break;
+ }
+
+ }
+
+ }
+ break;
case SPK.AcStandard:
case SPK.HvacAC:
{
@@ -1968,6 +2047,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)
@@ -1984,6 +2091,19 @@
}
}
break;
+ case SPK.DoorLock:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "open")
+ {
+ button1.Text = Language.StringByID(StringId.shi);
+ }
+
+ }
+ }
+ break;
}
}
/// <summary>
--
Gitblit v1.8.0