From fd1f19e8479c764fa28b0da3a2f9b34a3debe772 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 03 八月 2023 21:47:04 +0800
Subject: [PATCH] 2023年08月03日21:47:02
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 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 eb5a27b..1c1e568 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -696,6 +696,38 @@
}
}
break;
+ case SPK.Peephole:
+ LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
+ viewPeephole.btnText.TextID = StringId.ActivityDetection;
+ //viewPeephole.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ fLayout.AddChidren(viewPeephole.FLayoutView());
+ viewPeephole.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ this.identifier = "pir_event";//浜轰綋鎰熷簲鍛婅
+ this.DeviceView(device, viewPeephole.btnState, StringId.shi, StringId.offLogic, 1);
+
+ };
+ if (edit)
+ {
+ this.GetEditState(device, index, viewPeephole.btnState, null, null, null);
+ }
+ break;
+ case SPK.Ev_Ipcam:
+ LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView();
+ viewEzIpcam.btnText.TextID = StringId.ActivityDetection;
+ //viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ fLayout.AddChidren(viewEzIpcam.FLayoutView());
+ viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ this.identifier = "motiondetect_event";//浜轰綋鎰熷簲鍛婅
+ this.DeviceView(device, viewEzIpcam.btnState, StringId.shi, StringId.offLogic, 1);
+
+ };
+ if (edit)
+ {
+ this.GetEditState(device, index, viewEzIpcam.btnState, null, null, null);
+ }
+ break;
}
#region 淇濆瓨
@@ -747,11 +779,26 @@
inputDevice.condition = new List<Dictionary<string, string>>();
}
}
+ else if(device.spk == SPK.Peephole)
+ {
+ //鐚溂-浜轰綋鎰熷簲鍛婅
+ inputDevice.condition_type = "9";
+ inputDevice.identifier = this.identifier;
+ inputDevice.condition = new List<Dictionary<string, string>>();
+ }
+ else if(device.spk == SPK.Ev_Ipcam)
+ {
+ //钀ょ煶鎽勫儚澶�-绉诲姩鐩戞祴鍛婅
+ inputDevice.condition_type = "9";
+ inputDevice.identifier = this.identifier;
+ inputDevice.condition = new List<Dictionary<string, string>>();
+ }
else if (device.spk == SPK.VideoDoorLock)
{
////钀ょ煶瑙嗛闂ㄩ攣
inputDevice.condition_type = "9";
inputDevice.identifier = this.identifier;
+ inputDevice.condition = new List<Dictionary<string, string>>();
}
else if (device.spk == SPK.SensorPirHold)
{
@@ -1313,7 +1360,32 @@
//鏈夋暟鎹噸鏂拌祴鍊�
dicSateteList.AddRange(dicList);
}
- InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
+ //浜嬩欢涓撶敤
+ switch (device.spk)
+ {
+ case SPK.IpCam_Imou:
+ {
+ if (inputs.identifier == "ipcam_region_alram_event")
+ {
+ button1.Text = Language.StringByID(StringId.shi);
+ }
+
+ }
+ break;
+ case SPK.Peephole:
+ if (inputs.identifier == "pir_event")
+ {
+ button1.Text = Language.StringByID(StringId.shi );
+ }
+ break;
+ case SPK.Ev_Ipcam:
+ if (inputs.identifier == "motiondetect_event")
+ {
+ button1.Text = Language.StringByID(StringId.shi);
+ }
+ break;
+ }
+ InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4, "");
}
/// <summary>
/// 娣诲姞閫変腑鏁版嵁
@@ -1448,7 +1520,10 @@
/// <returns></returns>
public bool IsContainsAll(List<Dictionary<string, string>> dictionaryA, List<Dictionary<string, string>> dictionaryB)
{
-
+ if (dictionaryA.Count == 0 || dictionaryB.Count == 0) {
+ //钀ょ煶鐚溂锛屾憚鍍忓ご锛屽ぇ鍗庢憚鍍忓ご鍙湁浜嬩欢锛屾病鏈夎緭鍏ユ潯浠�
+ return true;
+ }
for (int i = 0; i < dictionaryA.Count; i++)
{
var dic = dictionaryA[i];
--
Gitblit v1.8.0