Merge branch 'WJC' into wxr7

wxr

2021-08-28 ea8f01fd99a2ef85bf96623c1bf90e84128cbe5c

Merge branch 'WJC' into wxr7

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

@@ -56,6 +56,8 @@
                case SPK.AcStandard:
                //地热
                case SPK.FloorHeatStandard:
                //新风
                case SPK.AirFreshStandard:
                    {

                        LogicView.FunTypeView view = new LogicView.FunTypeView();

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

@@ -149,6 +149,8 @@
                                case SPK.AcStandard:
                                //地热
                                case SPK.FloorHeatStandard:
                                //新风
                                case SPK.AirFreshStandard:
                                    {//开关灯
                                        foreach (var dic in dicList)
                                        {

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

@@ -526,6 +526,7 @@
                        deviceTypeList.Add(SPK.CurtainRoller);
                        deviceTypeList.Add(SPK.CurtainTrietex);
                        deviceTypeList.Add(SPK.AcStandard);
                        deviceTypeList.Add(SPK.AirFreshStandard);
                        deviceTypeList.Add(SPK.FloorHeatStandard);
                        deviceTypeList.Add(SPK.SensorSmoke);
                        deviceTypeList.Add(SPK.SensorWater);