2023年10月31日14:40:26

mac

2023-10-31 84f62349fc7ee80f6ff1c503458eec8842958e1f

2023年10月31日14:40:26

自动化输入条件萤石摄像头事件值修改为：intelligentDetection_event

 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);
                    }

 HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs

@@ -1,11 +1,16 @@
using System;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
    /// <summary>
    /// 定义常量值类
    /// </summary>
    public class Constant
    {
        public Constant()
        {
        }
        /// <summary>
        /// 移动检测事件值 (萤石摄像头spk="security.ipcam.ez";)
        /// </summary>
        public const string intelligentDetection_event = "intelligentDetection_event";

    }
}


 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);
                                    }

 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;
        }