2023年08月31日19:00:14

mac

2023-08-31 38ee59a8404c1fa9385649f9690c8d671a5d95de

 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:
                    {
@@ -1060,6 +1080,7 @@
        {
            if (edit)
            {
                this.function = device;
                Input inputs = Logic.currlogic.input[index];
                //清除之前旧数据
                dicSateteList.Clear();
@@ -1069,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>
@@ -1503,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
                )
@@ -1511,7 +1555,7 @@
            }
            return false;

        } 
        }
        /// <summary>
        /// 判断dictionaryB是否完整包含另一个dictionaryA
        /// </summary>