wxr
2024-05-11 a1ffd4bb9ff6b9eaa94a787cd5429595edbe4823
HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -302,7 +302,8 @@
                            break;
                        case SPK.LightRGB:
                            break;
                        case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
                        case SPK.HvacFloorHeat:
                        case SPK.FloorHeatStandard:
                            if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
                            {
                                foreach (var dic in f.status)
@@ -391,6 +392,27 @@
                                    break;
                                }
                            }
                            break;
                        case SPK.OtherCommon://2024-02-01 15:19:28  刚加的,不发布,客服遇到的问题
                            //foreach (var attr in f.status)
                            //{
                            //    if (attr.key == FunctionAttributeKey.OnOff)
                            //    {
                            //        byte onOffValue = 0;
                            //        switch (attr.value)
                            //        {
                            //            case "on":
                            //                onOffValue = 0;
                            //                break;
                            //            case "off":
                            //                onOffValue = 255;
                            //                break;
                            //        }
                            //        ControlBytesSend(Command.SetCommonSwitch, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
                            //            new byte[] { f.localFunction.bus.LoopId, onOffValue });
                            //        break;
                            //    }
                            //}
                            break;
                    }
                }
@@ -552,7 +574,28 @@
                        }
                        else
                        {
                            ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
                            if (commandDictionary.ContainsKey(FunctionAttributeKey.Percent))
                            {
                                ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { (byte)(((int)function.bus.LoopId) + 16), Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
                            }
                            else
                            {
                                byte tempCurtainState = 0;
                                if (function.trait_on_off.curValue.ToString() == "stop")
                                {
                                    tempCurtainState = 0;
                                }
                                else if (function.trait_on_off.curValue.ToString() == "on")
                                {
                                    tempCurtainState = 1;
                                }
                                else
                                {
                                    tempCurtainState = 2;
                                }
                                ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, tempCurtainState });
                            }
                        }
                        break;