2023年09月01日18:06:42

mac

2023-09-01 0a11352dffeb8d5f31dd40b9728fe1abf4537f04

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

@@ -573,6 +573,26 @@
                        };
                    }
                    break;
                //照度传感器
                case SPK.SensorLight:
                    {

                        ///照度传感器
                        LogicView.FunTypeView illuminanceView = new LogicView.FunTypeView();
                        illuminanceView.btnText.TextID = StringId.zhaomingdu;
                        fLayout.AddChidren(illuminanceView.FLayoutView());

                        ///点击事件
                        illuminanceView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            new PublicInterface { }.ViewZuHe(this, StringId.zhaomingdugaoyu, StringId.zhaomingdudiyu, (intText, view) =>
                            {
                                InputBoxAction(device, intText, index, edit);
                            });

                        };
                    }
                    break;
                //甲醛
                case SPK.SensorHcho:
                    {
@@ -696,6 +716,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 +799,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)
                {
@@ -1013,6 +1080,7 @@
        {
            if (edit)
            {
                this.function = device;
                Input inputs = Logic.currlogic.input[index];
                //清除之前旧数据
                dicSateteList.Clear();
@@ -1022,44 +1090,63 @@
                    dicSateteList.AddRange(inputs.condition);
                }
            }
            int max = 100;
            if (device.spk == SPK.SensorLight)
            {
                //照明传感器
                max =int.MaxValue;
            }

            new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
            {
                string keyValue = "20";
                string key = "20"; 
                string data_type = "integer";
                string comparator = "=";
                switch (textInt)
                {
                    case StringId.wendugaoyu:
                        {
                            keyValue = "temperature";
                            key = "temperature";
                            comparator = ">";
                            data_type = "float";
                        }
                        break;
                    case StringId.wendudiyu:
                        {
                            keyValue = "temperature";
                            key = "temperature";
                            comparator = "<";
                            data_type = "float";
                        }
                        break;
                    case StringId.shidugaoyu:
                        {
                            keyValue = "humidity";
                            key = "humidity";
                            comparator = ">";
                        }
                        break;
                    case StringId.shidudiyu:
                        {
                            keyValue = "humidity";
                            key = "humidity";
                            comparator = "<";
                        }
                        break;
                    case StringId.zhaomingdugaoyu:
                        {
                            key = "illuminance";
                            comparator = ">";
                        }
                        break;
                    case StringId.zhaomingdudiyu:
                        {
                            key = "illuminance";
                            comparator = "<";
                        }
                        break;
                }
                selectedState = device.spk + "_" + value;
                AddDictionary(keyValue, value, data_type, comparator);
                AddDictionary(key, value, data_type, comparator);
                SaveInput(device,index, edit);
            });
            },1,max);
        }
        /// PM2.5,Co2,Tvoc设置值
        /// </summary>
@@ -1313,7 +1400,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>
        /// 添加选中数据
@@ -1431,6 +1543,10 @@
        /// <returns></returns>
        private bool CheckSpk()
        {
            if (this.function == null)
            {
                return false;
            }
            if (this.function.spk == SPK.VideoDoorLock ||
               this.function.spk == SPK.doorgate
                )
@@ -1439,7 +1555,7 @@
            }
            return false;

        } 
        }
        /// <summary>
        /// 判断dictionaryB是否完整包含另一个dictionaryA
        /// </summary>
@@ -1448,7 +1564,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];