备份

wxr

2021-11-23 ccd5b1c8dc2d0399745779fb4f9a261d24d75a6d

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

@@ -135,7 +135,8 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                //开关灯光 light.Switch
                                //开关灯光
                                case SPK.AirSwitch:
                                case SPK.LightDimming:
                                case SPK.LightRGB:
                                case SPK.LightRGBW:
@@ -152,7 +153,10 @@
                                //新风
                                case SPK.AirFreshStandard:
                                case SPK.HvacAirFresh:
                                {//开关灯
                                //插座
                                case SPK.PanelSocket:
                                case SPK.ElectricSocket:
                                    {//开关灯
                                        foreach (var dic in dicList)
                                        {

@@ -906,8 +910,12 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯
                                //插座
                                case SPK.PanelSocket:
                                case SPK.ElectricSocket:
                                    {//开关

                                        foreach (var dic in dicList)
                                        {
@@ -1355,7 +1363,11 @@
        {
            switch (device.spk)
            {
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                //开关灯光
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                    {
                        foreach (var dic in dicList)
@@ -1922,6 +1934,7 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯