场景增加配置自动化使能；安防增加干接点触发条件

wxr

2023-11-06 07c91e3b27d10bad17ad2f805aab7b74e24fad2b

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

@@ -239,7 +239,7 @@
                                    int h = time / (60 * 60);
                                    int m = time % (60 * 60) / 60;
                                    int s = (time % (60 * 60) % 60);
                                    view2.btnState.Text = inputs.hold_time + "s";
                                    view2.btnState.Text = LogicMethod.Current.getTimeStr(inputs.hold_time); 
                                    view2.btnState.Name = h + ":" + m + ":" + s;
                                    this.hold_time = inputs.hold_time;
                                }
@@ -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);

                    };
@@ -1121,9 +1121,11 @@
                }
            }
            int max = 100;
            int min = 1;
            if (device.spk == SPK.SensorLight)
            {
                //照明传感器
                min = 0;
                max =1200;
            }

@@ -1171,12 +1173,12 @@
                            key = "illuminance";
                            comparator = "<";
                        }
                        break;
                        break ;
                }
                selectedState = device.spk + "_" + value;
                AddDictionary(key, value, data_type, comparator);
                SaveInput(device,index, edit);
            },1,max);
            },min,max);
        }
        /// PM2.5,Co2,Tvoc设置值
        /// </summary>
@@ -1400,7 +1402,7 @@
                        this.hold_time = (h + m + s).ToString();
                        if (button != null)
                        {
                            button.Text = this.hold_time + "s";
                            button.Text = LogicMethod.Current.getTimeStr(this.hold_time);
                            button.Name = timeValue;
                        }
                        selectedState = device.spk + "_" + timeValue;
@@ -1451,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);
                    }