From cafb1acbfc48f9a4b9e6feaeed5641c7da2f255b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 16:53:01 +0800
Subject: [PATCH] 2023年03月28日16:52:45
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 36ba961..c389912 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -311,7 +311,7 @@
}
}
break;
- case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
{
@@ -404,6 +404,12 @@
{
inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
}
+ }
+ break;
+ case SPK.VideoDoorLock:
+ {
+ string value = this.GetValue(dicList);
+ inputView.btnState.Text = value;
}
break;
case SPK.doorgate:
@@ -672,7 +678,7 @@
{
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.Current.GetDevice(inputCondition.sid);
- if (device.spk == SPK.SensorEnvironment
+ if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
|| device.spk == SPK.SensorEnvironment2
|| device.spk == SPK.SensorEnvironment3
)
@@ -2128,6 +2134,15 @@
}
}
break;
+ case SPK.VideoDoorLock:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ button1.Text = value;
+ }
+ }
+ break;
case SPK.MusicStandard:
case SPK.AvMusic:
{
@@ -2594,7 +2609,7 @@
break;
case "pm10":
{
- ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm25, indexVulae, true, stateValue);
+ ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm10, indexVulae, true, stateValue);
}
break;
case "pm25":
--
Gitblit v1.8.0