自动化

wxr

2023-03-29 1820fafc5b982120f87c8045e832d85bbbb62f6b

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

@@ -89,6 +89,7 @@
                //空调
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.AcIr:
                //地热
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
@@ -342,7 +343,7 @@
                    }
                    break;
                //环境检测传感器
                case SPK.SensorEnvironment:
                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                case SPK.SensorEnvironment2:
                case SPK.SensorEnvironment3:
                    {
@@ -463,6 +464,21 @@
                        co2View.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            PmCo2TvocAction(this, device, "co2", StringId.co2, index, edit);
                        };
                    }
                    break;
                //pm10
                case SPK.SensorPm10:
                    {
                        ///pm210
                        LogicView.FunTypeView pm10View = new LogicView.FunTypeView(); 
                        pm10View.btnText.TextID = StringId.pm10;
                        fLayout.AddChidren(pm10View.FLayoutView());

                        ///pm10点击事件
                        pm10View.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            PmCo2TvocAction(this, device, "pm10", StringId.pm10, index, edit);
                        };
                    }
                    break;
@@ -632,7 +648,7 @@
                Input inputDevice = new Input();
                inputDevice.condition_type = "3";
                inputDevice.sid = device.sid;
                inputDevice.condition = dicSateteList;
                inputDevice.condition.AddRange(dicSateteList);
                if (device.spk == SPK.doorgate)
                {
                    //可视对讲
@@ -913,7 +929,7 @@
                if (inputs.condition.Count != 0)
                {
                    //有数据重新赋值
                    dicSateteList = inputs.condition;
                    dicSateteList.AddRange(inputs.condition);
                }
            }
            new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -975,7 +991,7 @@
                if (inputs.condition.Count != 0)
                {
                    //有数据重新赋值
                    dicSateteList = inputs.condition;
                    dicSateteList.AddRange(inputs.condition);
                }
            }
            PublicInterface view = new PublicInterface();
@@ -1001,6 +1017,7 @@
                       case SPK.SensorPm25:
                       case SPK.SensorTVOC:
                       case SPK.SensorHcho:
                       case SPK.SensorPm10:
                           {
                               if (!Is_SpkAttribute(key))
                               {
@@ -1076,7 +1093,7 @@
            if (dicList.Count != 0)
            {
                //有数据重新赋值
                dicSateteList = dicList;
                dicSateteList.AddRange(dicList);
            }
            InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
        }