wxr
2024-05-15 4b38e2265a83b173efd498366590e77c2d4d90f5
修复一端口控制百分比无效的问题
1个文件已修改
33 ■■■■■ 已修改文件
HDL_ON/DAL/DriverLayer/Control_Udp.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -464,7 +464,13 @@
                {
                    case SPK.LightCCT:
                        #region cct light
                        byte b0 = 100;
                        byte b0 = Convert.ToByte(function.lastBrightness);
                        if (commandDictionary.ContainsKey(FunctionAttributeKey.Brightness))
                        {
                            b0 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                        }
                        else
                        {
                        if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
                        {
                            if (function.trait_on_off.curValue.ToString() == "off")
@@ -476,9 +482,6 @@
                                b0 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
                            }
                        }
                        else
                        {
                            b0 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                        }
                        var bytes0 = new byte[] { function.bus.LoopId,
                                            b0,
@@ -492,7 +495,13 @@
                        break;
                    case SPK.LightRGB:
                        #region rgb light
                        byte b = 100;
                        byte b = Convert.ToByte(function.lastBrightness);
                        if (commandDictionary.ContainsKey(FunctionAttributeKey.Brightness))
                        {
                            b = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                        }
                        else
                        {
                        if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
                        {
                            if (function.trait_on_off.curValue.ToString() == "off")
@@ -504,9 +513,6 @@
                                b = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
                            }
                        }
                        else
                        {
                            b = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                        }
                        var tempLight = new Light();
                        var bytes = new byte[] { function.bus.LoopId,
@@ -521,7 +527,13 @@
                        break;
                    case SPK.LightDimming:
                        #region dimming light
                        byte b1 = 100;
                        byte b1 = Convert.ToByte(function.lastBrightness);
                        if (commandDictionary.ContainsKey(FunctionAttributeKey.Brightness))
                        {
                            b1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                        }
                        else
                        {
                        if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
                        {
                            if (function.trait_on_off.curValue.ToString() == "off")
@@ -533,9 +545,6 @@
                                b1 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
                            }
                        }
                        else
                        {
                            b1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                        }
                        ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
                                            function.bus.LoopId,