From 309d7ff018dddf810027bdfe05c85976b22f3b76 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 十二月 2022 17:34:37 +0800
Subject: [PATCH] Merge branch 'wjc' into dev--wxr
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 27544e7..36ba961 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -759,6 +759,12 @@
this.SensorView(thisView, device, "co2", indexVulae);
}
+ else if (device.spk == SPK.SensorPm10)
+ {
+
+ this.SensorView(thisView, device, "pm10", indexVulae);
+
+ }
else if (device.spk == SPK.SensorPm25)
{
@@ -2514,6 +2520,11 @@
strtext = Language.StringByID(StringId.co2) + new PublicInterface { }.GetString("co2", value);
}
break;
+ case "pm10":
+ {
+ strtext = Language.StringByID(StringId.pm10) + new PublicInterface { }.GetString("pm25", value);
+ }
+ break;
case "pm25":
{
strtext = Language.StringByID(StringId.pm25) + new PublicInterface { }.GetString("pm25", value);
@@ -2540,8 +2551,9 @@
Input inputedit = Logic.currlogic.input[indexVulae];
///鐘舵�佸��
string stateValue = "";
- foreach (var dic in inputedit.condition)
+ for (int i=0;i<inputedit.condition.Count;i++)
{
+ var dic = inputedit.condition[i];
string comparator = dic["comparator"];
stateValue = dic["value"];
switch (key)
@@ -2580,6 +2592,11 @@
ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
}
break;
+ case "pm10":
+ {
+ ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm25, indexVulae, true, stateValue);
+ }
+ break;
case "pm25":
{
ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
--
Gitblit v1.8.0