From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 13:14:00 +0800
Subject: [PATCH] 2023年07月26日13:12:21
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index affe59a..a0ddf37 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -699,7 +699,7 @@
case SPK.Peephole:
LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
viewPeephole.btnText.TextID = StringId.ActivityDetection;
- viewPeephole.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ //viewPeephole.btnText.Name = Language.StringByID(StringId.shipinmensuo);
fLayout.AddChidren(viewPeephole.FLayoutView());
viewPeephole.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -715,7 +715,7 @@
case SPK.Ev_Ipcam:
LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView();
viewEzIpcam.btnText.TextID = StringId.ActivityDetection;
- viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ //viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo);
fLayout.AddChidren(viewEzIpcam.FLayoutView());
viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -784,12 +784,14 @@
//鐚溂-浜轰綋鎰熷簲鍛婅
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)
{
@@ -1357,7 +1359,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>
/// 娣诲姞閫変腑鏁版嵁
@@ -1492,7 +1519,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