1

wei

2021-03-26 e1b93fdc286e0f73b2b9a09c0a82a22a71074f2f

 HDL_ON/DAL/DriverLayer/Control_Udp.cs

@@ -288,50 +288,72 @@
                        case SPK.LightRGB:
                            break;
                        case SPK.FloorHeatStandard:
                            byte onoff_1 = 0;
                            byte setTemp_1 = 0;
                            byte mode_1 = 0;
                            foreach (var attr in f.status)
                            if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
                            {
                                switch (attr.key)
                                foreach (var dic in f.status)
                                {
                                    case FunctionAttributeKey.OnOff:
                                        if (attr.value == "on")
                                        {
                                            onoff_1 = 1;
                                        }
                                        else
                                        {
                                            onoff_1 = 0;
                                        }
                                        break;
                                    case FunctionAttributeKey.SetTemp:
                                        setTemp_1 = Convert.ToByte(attr.value);
                                        break;
                                    case FunctionAttributeKey.Mode:
                                        switch (attr.value)
                                        {
                                            case "day":
                                                mode_1 = 2;
                                                break;
                                            case "night":
                                                mode_1 = 3;
                                                break;
                                            case "away":
                                                mode_1 = 4;
                                                break;
                                            case "normal":
                                                mode_1 = 1;
                                                break;
                                            case "timer":
                                                mode_1 = 5;
                                                break;
                                        }
                                        break;
                                    switch (dic.key)
                                    {
                                        case FunctionAttributeKey.OnOff:
                                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 20, dic.value.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus.LoopId });
                                            break;
                                        case "mode":
                                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 21, Convert.ToByte(dic.value), f.localFunction.bus.LoopId });
                                            break;
                                        case FunctionAttributeKey.SetTemp:
                                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
                                                25, Convert.ToByte(dic.value), f.localFunction.bus.LoopId });
                                            break;
                                    }
                                }
                            }
                            ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
                            else
                            {
                                byte onoff_1 = 0;
                                byte setTemp_1 = 0;
                                byte mode_1 = 0;
                                foreach (var attr in f.status)
                                {
                                    switch (attr.key)
                                    {
                                        case FunctionAttributeKey.OnOff:
                                            if (attr.value == "on")
                                            {
                                                onoff_1 = 1;
                                            }
                                            else
                                            {
                                                onoff_1 = 0;
                                            }
                                            break;
                                        case FunctionAttributeKey.SetTemp:
                                            setTemp_1 = Convert.ToByte(attr.value);
                                            break;
                                        case FunctionAttributeKey.Mode:
                                            switch (attr.value)
                                            {
                                                case "day":
                                                    mode_1 = 2;
                                                    break;
                                                case "night":
                                                    mode_1 = 3;
                                                    break;
                                                case "away":
                                                    mode_1 = 4;
                                                    break;
                                                case "normal":
                                                    mode_1 = 1;
                                                    break;
                                                case "timer":
                                                    mode_1 = 5;
                                                    break;
                                            }
                                            break;
                                    }
                                }
                                ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
                                f. localFunction.bus.LoopId, onoff_1, 0, setTemp_1, mode_1,  setTemp_1, setTemp_1, setTemp_1, 0, 0 });
                            }
                            break;
                        case SPK.ElectricSocket:
                            foreach (var attr in f.status)
@@ -518,9 +540,9 @@
                        {
                            case SPK.AcStandard:
                                var ac = new AC();
                                ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { function.bus.LoopId, 0, 32, 32, 32, 32, 32, 0, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0,
                                    ac.GetModeIndex(function),
                                    ac.GetFanIndex(function), Convert.ToByte(function.GetAttrState(FunctionAttributeKey.SetTemp)), 0 });
                                //ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { function.bus.LoopId, 0, 32, 32, 32, 32, 32, 0, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0,
                                //    ac.GetModeIndex(function),
                                //    ac.GetFanIndex(function), Convert.ToByte(function.GetAttrState(FunctionAttributeKey.SetTemp)), 0 });
                                foreach (var dic in commandDictionary)
                                {
                                    switch (dic.Key)
@@ -534,7 +556,7 @@
                                        case "fan":
                                            ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 5, ac.GetFanIndex(function), function.bus.LoopId });
                                            break;
                                        case "temp":
                                        case FunctionAttributeKey.SetTemp:
                                            byte modeKey = 4;
                                            switch (ac.GetModeIndex(function))
                                            {
@@ -573,42 +595,83 @@
                            case SPK.FloorHeatStandard:
                                if (function.Fh_Mode_Temp.Count == 4)
                                {
                                    var onoffString = function.trait_on_off.curValue.ToString();
                                    byte b1 = 1;
                                    if(onoffString == "off")
                                    if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
                                    {
                                        b1 = 0;
                                    }
                                    var wm = fhTemp.GetWorkModeIndex(function);
                                    if (wm > 0)
                                    {
                                        b1 += (byte)(16 + wm);
                                    }
                                    if (commandDictionary.ContainsKey("temp"))
                                    {
                                        var dicTempString = "";
                                        commandDictionary.TryGetValue("temp", out dicTempString);
                                        var dicTemp = Convert.ToByte(dicTempString);
                                        var mode = function.GetAttrState(FunctionAttributeKey.Mode);
                                        switch (mode)
                                        foreach (var dic in commandDictionary)
                                        {
                                            case "day":
                                                function.Fh_Mode_Temp["day"] = dicTemp;
                                                break;
                                            case "night":
                                                function.Fh_Mode_Temp["night"] = dicTemp;
                                                break;
                                            case "away":
                                                function.Fh_Mode_Temp["away"] = dicTemp;
                                                break;
                                            case "normal":
                                                function.Fh_Mode_Temp["normal"] = dicTemp;
                                                break;
                                            switch (dic.Key)
                                            {
                                                case FunctionAttributeKey.OnOff:
                                                    ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 20, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, function.bus.LoopId });
                                                    break;
                                                case "mode":
                                                    ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 21, fhTemp.GetModeIndex(function), function.bus.LoopId });
                                                    break;
                                                case FunctionAttributeKey.SetTemp:
                                                    byte modeKey = 25;
                                                    switch (fhTemp.GetModeIndex(function))
                                                    {
                                                        case 1:
                                                            modeKey = 25;
                                                            break;
                                                        case 2:
                                                            modeKey = 26;
                                                            break;
                                                        case 3:
                                                            modeKey = 27;
                                                            break;
                                                        case 4:
                                                            modeKey = 28;
                                                            break;
                                                    }
                                                    ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] {
                                                modeKey, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.SetTemp)), function.bus.LoopId });
                                                    break;
                                                default:
                                                    MainPage.Log($"功能未支持 : {dic.Key}");
                                                    break;
                                            }
                                        }
                                    }
                                    var tt = fhTemp.GetTempUintIndex(function);
                                    ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId, b1,
                                    else
                                    {
                                        var onoffString = function.trait_on_off.curValue.ToString();
                                        byte b1 = 1;
                                        if (onoffString == "off")
                                        {
                                            b1 = 0;
                                        }
                                        var wm = fhTemp.GetWorkModeIndex(function);
                                        if (wm > 0)
                                        {
                                            b1 += (byte)(16 + wm);
                                        }
                                        if (commandDictionary.ContainsKey("temp"))
                                        {
                                            var dicTempString = "";
                                            commandDictionary.TryGetValue("temp", out dicTempString);
                                            var dicTemp = Convert.ToByte(dicTempString);
                                            var mode = function.GetAttrState(FunctionAttributeKey.Mode);
                                            switch (mode)
                                            {
                                                case "day":
                                                    function.Fh_Mode_Temp["day"] = dicTemp;
                                                    break;
                                                case "night":
                                                    function.Fh_Mode_Temp["night"] = dicTemp;
                                                    break;
                                                case "away":
                                                    function.Fh_Mode_Temp["away"] = dicTemp;
                                                    break;
                                                case "normal":
                                                    function.Fh_Mode_Temp["normal"] = dicTemp;
                                                    break;
                                            }
                                        }
                                        var tt = fhTemp.GetTempUintIndex(function);
                                        ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId, b1,
                                        (byte)tt,fhTemp.GetModeIndex(function), function.Fh_Mode_Temp["normal"], function.Fh_Mode_Temp["day"], function.Fh_Mode_Temp["night"], function.Fh_Mode_Temp["away"], 0, 0 });
                                    }
                                }
                                break;
                        }