数据结构优化修改

wei

2021-03-08 37c315988c2dc11e4f477233f7a9f87d57bb61aa

 HDL_ON/DAL/DriverLayer/Control_Udp.cs

@@ -188,47 +188,75 @@
                            }
                            break;
                        case SPK.AcStandard:
                            AC tempAc = new AC();
                            AC acTemp = new AC();
                            byte onoff = 0;
                            byte mode = 0;
                            byte fan = 0;
                            foreach (var attr in f.status)
                            {
                                byte modeKey = 4;
                                switch (attr.key)
                                {
                                    case FunctionAttributeKey.OnOff:
                                        tempAc.trait_on_off.curValue = attr.value;
                                        if(attr.value == "on")
                                        {
                                            onoff = 1;
                                        }
                                        else
                                        {
                                            onoff = 0;
                                        }
                                        break;
                                    case FunctionAttributeKey.Mode:
                                        tempAc.SetAttrState(FunctionAttributeKey.Mode, attr.value);
                                        break;
                                    case FunctionAttributeKey.FanSpeed:
                                        tempAc.SetAttrState(FunctionAttributeKey.FanSpeed, attr.value);
                                        break;
                                    case FunctionAttributeKey.SetTemp:
                                        tempAc.SetAttrState(FunctionAttributeKey.SetTemp, attr.value);
                                        switch (tempAc.curModeIndex())
                                        switch (attr.value)
                                        {
                                            case 3:
                                            case "auto":
                                                mode = 3;
                                                modeKey = 8;
                                                break;
                                            case 0:
                                            case "cool":
                                                mode = 0;
                                                modeKey = 4;
                                                break;
                                            case 1:
                                            case "heat":
                                                mode = 1;
                                                modeKey = 7;
                                                break;
                                            case 4:
                                            case "dry":
                                                mode = 4;
                                                modeKey = 19;
                                                break;
                                            case 2:
                                            case "fan":
                                                mode = 2;
                                                modeKey = 2;
                                                break;
                                        }
                                        break;
                                    case FunctionAttributeKey.FanSpeed:
                                        switch (attr.value)
                                        {
                                            case "high":
                                                fan = 1;
                                                break;
                                            case "medium":
                                                fan = 2;
                                                break;
                                            case "low":
                                                fan = 3;
                                                break;
                                            case "auto":
                                                fan = 0;
                                                break;
                                            default:
                                                fan = 0;
                                                break;
                                        }
                                        break;
                                }
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 3, tempAc.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus.LoopId });
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 6, tempAc.curModeIndex(), f.localFunction.bus.LoopId });
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 5, tempAc.curFanIndex(), f.localFunction.bus.LoopId });
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.GetAttrState(FunctionAttributeKey.SetTemp)), f.localFunction.bus.LoopId });
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 3, onoff, f.localFunction.bus.LoopId });
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 6, mode, f.localFunction.bus.LoopId });
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 5, fan, f.localFunction.bus.LoopId });
                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { modeKey, modeKey, f.localFunction.bus.LoopId });
                            }
                            break;
                        case SPK.LightSwitch:
@@ -260,25 +288,50 @@
                        case SPK.LightRGB:
                            break;
                        case SPK.FloorHeatStandard:
                            var tempFh = new FloorHeating();
                            byte onoff_1 = 0;
                            byte setTemp_1 = 0;
                            byte mode_1 = 0;
                            foreach (var attr in f.status)
                            {
                                switch (attr.key)
                                {
                                    case FunctionAttributeKey.OnOff:
                                        tempFh.trait_on_off.curValue = attr.value;
                                        if (attr.value == "on")
                                        {
                                            onoff_1 = 1;
                                        }
                                        else
                                        {
                                            onoff_1 = 0;
                                        }
                                        break;
                                    case FunctionAttributeKey.SetTemp:
                                        tempFh.trait_temp.curValue = attr.value;
                                        setTemp_1 = Convert.ToByte(attr.value);
                                        break;
                                    case FunctionAttributeKey.Mode:
                                        tempFh.trait_mode.curValue = attr.value;
                                        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;
                                }
                            }
                            byte b1 = tempFh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
                            ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
                                f. localFunction.bus.LoopId, b1, 0, tempFh.curModeIndex, Convert.ToByte( tempFh.trait_temp.curValue),  Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), 0, 0 });
                                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)
@@ -350,78 +403,93 @@
                switch (function.Spk_Prefix)
                {
                    case FunctionCategory.Light:
                        var light = function as Light;
                        switch (light.spk)
                        switch (function.spk)
                        {
                            case SPK.LightCCT:
                                byte b0 = 100;//开关操作依据on_off字段，实际开关值依据brightness，当on_off为打开，brightness不能为0
                                if (light.trait_on_off.curValue.ToString() == "off")
                                if (function.trait_on_off.curValue.ToString() == "off")
                                {
                                    b0 = 0;
                                }
                                else
                                {
                                    b0 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
                                    b0 = Convert.ToByte( function.GetAttrState(FunctionAttributeKey.Brightness)) == 0 ? (byte)100 : Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                                }
                                var bytes0 = new byte[] { function.bus.LoopId,
                                            b0,
                                            254, 0,Convert.ToByte(light.fadeTime) ,2,
                                            (byte)((int)light.Attr_CCT.curValue/256),(byte)((int)light.Attr_CCT.curValue%256),
                                            (byte)light.BlueColor,
                                            254, 0,Convert.ToByte(function.GetAttrState(FunctionAttributeKey.FadeTime)) ,2,
                                            (byte)(Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.CCT))/256),
                                            (byte)(Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.CCT))%256),
                                            0,
                                            0,0};
                                ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes0, 1);
                                break;
                            case SPK.LightRGB:
                                byte b = 100;//开关操作依据on_off字段，实际开关值依据brightness，当on_off为打开，brightness不能为0
                                if (light.trait_on_off.curValue.ToString() == "off")
                                if (function.trait_on_off.curValue.ToString() == "off")
                                {
                                    b = 0;
                                }
                                else
                                {
                                    b = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
                                    byte lightBri1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                                    if (lightBri1 == 0)
                                    {
                                        b = 100;
                                    }
                                    else
                                    {
                                        b = lightBri1;
                                    }
                                }
                                var tempLight = new Light();
                                var bytes = new byte[] { function.bus.LoopId,
                                            b,
                                            254, 0,Convert.ToByte(light.fadeTime) ,3,
                                            (byte)light.RedColor,(byte)light.GreenColor,
                                            (byte)light.BlueColor,
                                            254, 0,Convert.ToByte(function.GetAttrState(FunctionAttributeKey.FadeTime)) ,3,
                                            (byte)tempLight.GetColor(0,function),
                                            (byte)tempLight.GetColor(1,function),
                                            (byte)tempLight.GetColor(2,function),
                                            0,0};
                                ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
                                break;
                            case SPK.LightDimming:
                                byte b1 = 100;
                                if (light.trait_on_off.curValue.ToString() == "off")
                                if (function.trait_on_off.curValue.ToString() == "off")
                                {
                                    b1 = 0;
                                }
                                else
                                {
                                    b1 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
                                    byte lightBri = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
                                    if (lightBri == 0)
                                    {
                                        b = 100;
                                    }
                                    else
                                    {
                                        b = lightBri;
                                    }
                                }
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
                                            function.bus.LoopId,
                                            b1,
                                            0, Convert.ToByte(light.fadeTime) });
                                //DimmerPage.UpdataStates(light);
                                            0, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.FadeTime)) });
                                break;
                            case SPK.LightSwitch:
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
                                //RelayPage.UpdataState(light);
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
                                break;
                        }
                        break;
                    case FunctionCategory.Curtain:
                        var curtain = function as Curtain;
                        switch (curtain.spk)
                        switch (function.spk)
                        {
                            case SPK.CurtainSwitch:
                                byte b1 = 0;
                                if (curtain.trait_on_off.curValue.ToString() == "stop")
                                if (function.trait_on_off.curValue.ToString() == "stop")
                                {
                                    b1 = 0;
                                }
                                else if (curtain.trait_on_off.curValue.ToString() == "on")
                                else if (function.trait_on_off.curValue.ToString() == "on")
                                {
                                    b1 = 1;
                                }
@@ -429,37 +497,19 @@
                                {
                                    b1 = 2;
                                }
                                ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus.LoopId, b1 });
                                ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, b1 });
                                break;
                            case SPK.CurtainTrietex:
                            case SPK.CurtainRoller:
                                //if (commandDictionary.Count > 0)
                                //{
                                if (curtain.trait_on_off.curValue.ToString() == "stop")
                                if (function.trait_on_off.curValue.ToString() == "stop")
                                {
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus.LoopId, 0 });
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, 0 });
                                }
                                else
                                {
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(curtain.percent) });
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });

                                }
                                //}
                                //else
                                //{
                                //    if (curtain.trait_on_off.value.ToString() == "stop")
                                //    {
                                //        ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
                                //    }
                                //    else if (curtain.trait_on_off.value.ToString() == "on")
                                //    {
                                //        ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 100 });
                                //    }
                                //    else if (curtain.trait_on_off.value.ToString() == "off")
                                //    {
                                //        ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 0 });
                                //    }
                                //}
                                break;
                        }
                        break;
@@ -467,25 +517,26 @@
                        switch (function.spk)
                        {
                            case SPK.AcStandard:
                                var aC = function as AC;
                                ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus.LoopId, (byte)aC.curTempType, 32, 32, 32, 32, 32, 0, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex(), aC.curFanIndex(), Convert.ToByte(aC.GetAttrState(FunctionAttributeKey.SetTemp)), 0 });
                                //ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.on_off == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
                                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 });
                                foreach (var dic in commandDictionary)
                                {
                                    switch (dic.Key)
                                    {
                                        case "on_off":
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus.LoopId });
                                        case FunctionAttributeKey.OnOff:
                                            ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 3, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, function.bus.LoopId });
                                            break;
                                        case "mode":
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { 6, aC.curModeIndex(), aC.bus.LoopId });
                                            ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 6, ac.GetModeIndex(function), function.bus.LoopId });
                                            break;
                                        case "fan":
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { 5, aC.curFanIndex(), aC.bus.LoopId });
                                            ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 5, ac.GetFanIndex(function), function.bus.LoopId });
                                            break;
                                        case "temp":
                                            byte modeKey = 4;
                                            switch (aC.curModeIndex())
                                            switch (ac.GetModeIndex(function))
                                            {
                                                case 3:
                                                    modeKey = 8;
@@ -503,7 +554,8 @@
                                                    modeKey = 2;
                                                    break;
                                            }
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.GetAttrState(FunctionAttributeKey.SetTemp)), aC.bus.LoopId });
                                            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}");
@@ -515,38 +567,48 @@
                        }
                        break;
                    case FunctionCategory.FloorHeat:
                        switch (function.spk) {
                        var fhTemp = new FloorHeating();
                        switch (function.spk)
                        {
                            case SPK.FloorHeatStandard:
                                var fh = function as FloorHeating;
                                if (fh.modeTemp.Count == 4)
                                if (function.Fh_Mode_Temp.Count == 4)
                                {
                                    byte b1 = fh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
                                    if (fh.workMode > 0)
                                    var onoffString = function.trait_on_off.curValue.ToString();
                                    byte b1 = 1;
                                    if(onoffString == "off")
                                    {
                                        b1 += (byte)(16 + fh.workMode);
                                        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);
                                        switch (fh.trait_mode.curValue)
                                        var mode = function.GetAttrState(FunctionAttributeKey.Mode);
                                        switch (mode)
                                        {
                                            case "day":
                                                fh.modeTemp["day"] = dicTemp;
                                                function.Fh_Mode_Temp["day"] = dicTemp;
                                                break;
                                            case "night":
                                                fh.modeTemp["night"] = dicTemp;
                                                function.Fh_Mode_Temp["night"] = dicTemp;
                                                break;
                                            case "away":
                                                fh.modeTemp["away"] = dicTemp;
                                                function.Fh_Mode_Temp["away"] = dicTemp;
                                                break;
                                            case "normal":
                                                fh.modeTemp["normal"] = dicTemp;
                                                function.Fh_Mode_Temp["normal"] = dicTemp;
                                                break;
                                        }
                                    }
                                    ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus.LoopId, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
                                    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;
                        }
@@ -555,18 +617,16 @@
                        switch (function.spk)
                        {
                            case SPK.ElectricFan:
                                var fan = function as Fan;
                                if (fan.trait_on_off.curValue.ToString() == "on")
                                if (function.trait_on_off.curValue.ToString() == "on")
                                {
                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId, (byte)fan.openLevel });
                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.OpenLevel)) });
                                }
                                {
                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId, 0 });
                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, 0 });
                                }
                                break;
                            case SPK.ElectricSocket:
                                var s = function as SwitchSocket;
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
                                break;
                        }
                        break;
@@ -642,17 +702,14 @@
                        switch (function.spk)
                        {
                            case SPK.ElectricFan:
                                var fan = function as Fan;
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId });
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
                                break;
                            case SPK.ElectricSocket:
                                var s = function as SwitchSocket;
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId });
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
                                break;
                        }
                        break;
                    case FunctionCategory.Sensor:
                        var sensor = function as Sensor;
                        byte sensorType = 0;
                        switch (function.spk)
                        {
@@ -672,7 +729,7 @@
                                sensorType = 7;
                                break;
                        }
                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, sensorType, sensor.bus.LoopId });
                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, sensorType, function.bus.LoopId });
                        break;
                }
            }