From d90c55272f597acd0e946493896b7977293cf84d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 三月 2023 09:10:31 +0800
Subject: [PATCH] 人脸管理菜单
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 064ddef..61b2a8c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -342,7 +342,7 @@
}
break;
//鐜妫�娴嬩紶鎰熷櫒
- case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
{
@@ -463,6 +463,21 @@
co2View.btnClick.MouseUpEventHandler += (sender, e) =>
{
PmCo2TvocAction(this, device, "co2", StringId.co2, index, edit);
+ };
+ }
+ break;
+ //pm10
+ case SPK.SensorPm10:
+ {
+ ///pm210
+ LogicView.FunTypeView pm10View = new LogicView.FunTypeView();
+ pm10View.btnText.TextID = StringId.pm10;
+ fLayout.AddChidren(pm10View.FLayoutView());
+
+ ///pm10鐐瑰嚮浜嬩欢
+ pm10View.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "pm10", StringId.pm10, index, edit);
};
}
break;
@@ -632,7 +647,7 @@
Input inputDevice = new Input();
inputDevice.condition_type = "3";
inputDevice.sid = device.sid;
- inputDevice.condition = dicSateteList;
+ inputDevice.condition.AddRange(dicSateteList);
if (device.spk == SPK.doorgate)
{
//鍙瀵硅
@@ -913,7 +928,7 @@
if (inputs.condition.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = inputs.condition;
+ dicSateteList.AddRange(inputs.condition);
}
}
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -975,7 +990,7 @@
if (inputs.condition.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = inputs.condition;
+ dicSateteList.AddRange(inputs.condition);
}
}
PublicInterface view = new PublicInterface();
@@ -1001,6 +1016,7 @@
case SPK.SensorPm25:
case SPK.SensorTVOC:
case SPK.SensorHcho:
+ case SPK.SensorPm10:
{
if (!Is_SpkAttribute(key))
{
@@ -1076,7 +1092,7 @@
if (dicList.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = dicList;
+ dicSateteList.AddRange(dicList);
}
InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
}
--
Gitblit v1.8.0