Merge branch 'WJC' into wxr7

wxr

2021-10-21 475ccc9f21022ce66981effcedf8de339fc98a2f

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

@@ -318,6 +318,12 @@
            string strPath = "";
            switch (functionType)
            {

                case SPK.AirSwitch:
                    {
                        strPath = "FunctionIcon/Icon/electricalbreaker.png";
                    }
                    break;
                case SPK.LightSwitch:
                case SPK.LightRGB:
                case SPK.LightRGBW:
@@ -394,7 +400,8 @@
            || device.spk == SPK.LightDimming
            || device.spk == SPK.LightCCT
            || device.spk == SPK.LightRGB
            || device.spk == SPK.LightRGBW);
            || device.spk == SPK.LightRGBW
            || device.spk == SPK.AirSwitch);
            if (lightjosn != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
@@ -467,7 +474,8 @@
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
                functionTypeList.Add(SPK.LightRGBW);
                functionTypeList.Add(SPK.LightCCT);
                functionTypeList.Add(SPK.LightCCT); 
                functionTypeList.Add(SPK.AirSwitch); 
            }
            else if (deviceType == Language.StringByID(StringId.Curtain))
            {
@@ -558,6 +566,7 @@
                        deviceTypeList.Add(SPK.SensorPm25);
                        deviceTypeList.Add(SPK.SensorTVOC);
                        deviceTypeList.Add(SPK.SensorHcho);
                        deviceTypeList.Add(SPK.AirSwitch);

                    }
                    break;
@@ -574,6 +583,7 @@
                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
                        deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
                        deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
                        deviceTypeList.Add(SPK.AirSwitch);
                    }
                    break;
            }