From 84f62349fc7ee80f6ff1c503458eec8842958e1f Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 31 十月 2023 14:41:16 +0800 Subject: [PATCH] 2023年10月31日14:40:26 --- HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs | 17 +++++++++++------ HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 2 +- HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 2 +- HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs index f99b97c..d64166b 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs @@ -758,7 +758,7 @@ fLayout.AddChidren(viewEzIpcam.FLayoutView()); viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) => { - this.identifier = "motiondetect_event";//浜轰綋鎰熷簲鍛婅 + this.identifier = Constant.intelligentDetection_event;//浜轰綋鎰熷簲鍛婅 this.DeviceView(device, viewEzIpcam.btnState, StringId.shi, StringId.offLogic, 1); }; @@ -1453,7 +1453,7 @@ } break; case SPK.Ev_Ipcam: - if (inputs.identifier == "motiondetect_event") + if (inputs.identifier == Constant.intelligentDetection_event) { button1.Text = Language.StringByID(StringId.shi); } diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs index 7c72381..369e59f 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs @@ -1,11 +1,16 @@ 锘縰sing System; namespace HDL_ON.UI.UI2.Intelligence.Automation { - public class Constant - { - public Constant() - { - } - } + /// <summary> + /// 瀹氫箟甯搁噺鍊肩被 + /// </summary> + public class Constant + { + /// <summary> + /// 绉诲姩妫�娴嬩簨浠跺�� (钀ょ煶鎽勫儚澶磗pk="security.ipcam.ez";) + /// </summary> + public const string intelligentDetection_event = "intelligentDetection_event"; + + } } diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs index 073fe47..1425f70 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs @@ -473,7 +473,7 @@ } break; case SPK.Ev_Ipcam: - if (inputCondition.identifier == "motiondetect_event") + if (inputCondition.identifier == Constant.intelligentDetection_event) { inputView.btnState.Text = Language.StringByID(StringId.shi); } diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs index 93ee383..ea4a26d 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs @@ -189,7 +189,7 @@ list.AddRange(list2); list.AddRange(FunctionList.List.groupControls); #if DEBUG - GetTestDevice(ref list, true); + //GetTestDevice(ref list, true); #endif return list; } -- Gitblit v1.8.0