BUG修复

wei

2021-11-04 e238b9cc3caef879fd907ceab8997d08ae891ea3

 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:
@@ -146,12 +147,13 @@
                                case SPK.CurtainRoller:
                                case SPK.CurtainTrietex:
                                //空调
                                case SPK.AcStandard:
                                case SPK.AcStandard:case SPK.HvacAC:
                                //地热
                                case SPK.FloorHeatStandard:
                                case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
                                //新风
                                case SPK.AirFreshStandard:
                                    {//开关灯
                                case SPK.HvacAirFresh:
                                {//开关灯
                                        foreach (var dic in dicList)
                                        {

@@ -205,6 +207,7 @@
                                    }
                                    break;
                                case SPK.SensorDryContact:
                                case SPK.SensorDryContact2:
                                    {
                                        foreach (var dic in dicList)
                                        {
@@ -269,6 +272,7 @@
                                            switch (dic["key"])
                                            {
                                                case "status":
                                                case "people_status":
                                                    {
                                                        if (value == "true")
                                                        {
@@ -302,6 +306,7 @@
                                    }
                                    break;
                                case SPK.SenesorMegahealth:
                                case SPK.SenesorMegahealth2:
                                    {
                                        foreach (var dic in dicList)
                                        {
@@ -902,6 +907,7 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯

@@ -975,6 +981,7 @@
                                    }
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -1073,7 +1080,7 @@

                                    }
                                    break;
                                case SPK.FloorHeatStandard:
                                case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -1146,6 +1153,7 @@
                                    }
                                    break;
                                case SPK.AirFreshStandard:
                                case SPK.HvacAirFresh:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string fan = GetKeyValue("fan", dicList);
@@ -1350,6 +1358,7 @@
            switch (device.spk)
            {
                //开关灯光
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                    {
                        foreach (var dic in dicList)
@@ -1432,6 +1441,7 @@
                    }
                    break;
                case SPK.AcStandard:
                case SPK.HvacAC:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1542,7 +1552,7 @@

                    }
                    break;
                case SPK.FloorHeatStandard:
                case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
                    {

                        foreach (var dic in dicList)
@@ -1626,6 +1636,7 @@
                    }
                    break;
                case SPK.AirFreshStandard:
                case SPK.HvacAirFresh:
                    {

                        foreach (var dic in dicList)
@@ -1650,8 +1661,8 @@
                                        }
                                    }
                                    break;
                             
                                   case "fan":

                                case "fan":
                                    {
                                        if (button2 == null)
                                        {
@@ -1726,6 +1737,7 @@
                    }
                    break;
                case SPK.SensorDryContact:
                case SPK.SensorDryContact2:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1783,6 +1795,7 @@
                            switch (dic["key"])
                            {
                                case "status":
                                case "people_status":
                                    {
                                        if (value == "true")
                                        {
@@ -1815,6 +1828,7 @@
                    }
                    break;
                case SPK.SenesorMegahealth:
                case SPK.SenesorMegahealth2:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1911,6 +1925,7 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯

@@ -1983,7 +1998,8 @@
                                    }
                                    break;
                                case SPK.AcStandard:
                                case SPK.FloorHeatStandard:
                                case SPK.HvacAC:
                                case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
                                    {
                                        foreach (var dic in dicList)
                                        {