From ef3f8a51d69b581bfa06f82ee0851dafda4ffc3c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 13 六月 2022 11:23:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 27 +++++++--------------------
1 files changed, 7 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..eef7829 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -420,31 +420,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:
--
Gitblit v1.8.0