From adf7df175e590b7d9e0f33c0c2ea1d2897da6301 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 29 三月 2023 14:33:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 4a885bc..335597a 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:
{
@@ -622,11 +622,12 @@
case SPK.VideoDoorLock:
{
LogicView.FunTypeView view1 = new LogicView.FunTypeView();
- view1.btnText.Text = "鐢ㄦ埛浜哄憳";// StringId.shipintonghuahujiao;
+ view1.btnText.TextID=StringId.yonghurenyuan;
view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
fLayout.AddChidren(view1.FLayoutView());
view1.btnClick.MouseUpEventHandler += (sender, e) =>
{
+ this.identifier = "open_door";//寮�閿佷簨浠�
this.VideoDoorLockAction(this, device, view1.btnState);
};
if (edit)
@@ -686,6 +687,12 @@
inputDevice.condition = new List<Dictionary<string, string>>();
}
}
+ else if (device.spk == SPK.VideoDoorLock)
+ {
+ ////钀ょ煶瑙嗛闂ㄩ攣
+ inputDevice.condition_type = "9";
+ inputDevice.identifier = this.identifier;
+ }
if (edit)
--
Gitblit v1.8.0