1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/DAL/DriverLayer/Control_Udp.cs

@@ -17,10 +17,6 @@
            MainPage.Log($"control bus udp 被创建，时间：{DateTime.Now}");
        }
        /// <summary>
        /// 通讯ID
        /// </summary>
        public const int msg_id = 1;
        /// <summary>
        /// 通讯端口
        /// </summary>
        public int port = 0;
@@ -165,11 +161,11 @@
                {
                    case FunctionType.Curtain:
                        byte curtainState = 0;
                        if (function.trait_on_off.value.ToString() == "on")
                        if (function.trait_on_off.curValue.ToString() == "on")
                        {
                            curtainState = 1;
                        }
                        else if (function.trait_on_off.value.ToString() == "off")
                        else if (function.trait_on_off.curValue.ToString() == "off")
                        {
                            curtainState = 2;
                        }
@@ -181,7 +177,7 @@
                        break;
                    case FunctionType.AC:
                        var aC = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(function));//as AC;
                        ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
                        ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
                        ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.LoopID });
                        ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.LoopID });
                        byte modeKey = 4;
@@ -203,18 +199,18 @@
                                modeKey = 2;
                                break;
                        }
                        ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
                        ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.LoopID });

                        break;
                    case FunctionType.Relay:
                    case FunctionType.Dimmer:
                        byte brightness = 0;
                        if (function.trait_on_off.value.ToString() == "on")
                        if (function.trait_on_off.curValue.ToString() == "on")
                        {
                            var brightnessTrait = function.function.Find((obj) => obj.name == "brightness");
                            var brightnessTrait = function.function.Find((obj) => obj.key == "brightness");
                            if (brightnessTrait != null)
                            {
                                brightness = Convert.ToByte(brightnessTrait.value);
                                brightness = Convert.ToByte(brightnessTrait.curValue);
                            }
                        }
                        ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
@@ -229,10 +225,10 @@
                        break;
                    case FunctionType.FloorHeating:
                        var fh = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(function));//as AC;
                        var fhModeTempTrait = function.function.Find((obj) => obj.name == "mode");
                        if (fhModeTempTrait.value_key.Count == 4)
                        var fhModeTempTrait = function.function.Find((obj) => obj.key == "mode");
                        if (fhModeTempTrait.value.Count == 4)
                        {
                            byte b1 = function.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
                            byte b1 = function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
                            if (fh.workMode > 0)
                            {
                                b1 += (byte)(16 + fh.workMode);
@@ -242,7 +238,7 @@
                        break;
                    case FunctionType.Socket:
                        //var s = function as SwitchSocket;
                        ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { function.bus_Data.LoopID, function.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
                        ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { function.bus_Data.LoopID, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
                        break;
                }
            }
@@ -270,7 +266,7 @@
                            case FunctionType.RGB:
                                MainPage.Log($"rgb level : {light.brightness}");
                                byte b = 100;//开关操作依据on_off字段，实际开关值依据brightness，当on_off为打开，brightness不能为0
                                if (light.trait_on_off.value.ToString() == "off")
                                if (light.trait_on_off.curValue.ToString() == "off")
                                {
                                    b = 0;
                                }
@@ -288,7 +284,7 @@
                                break;
                            case FunctionType.Dimmer:
                                byte b1 = 100;
                                if (light.trait_on_off.value.ToString() == "off")
                                if (light.trait_on_off.curValue.ToString() == "off")
                                {
                                    b1 = 0;
                                }
@@ -303,7 +299,7 @@
                                //DimmerPage.UpdataStates(light);
                                break;
                            case FunctionType.Relay:
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.LoopID, light.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.LoopID, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
                                //RelayPage.UpdataState(light);
                                break;
                        }
@@ -314,11 +310,11 @@
                        {
                            case FunctionType.Curtain:
                                byte b1 = 0;
                                if (curtain.trait_on_off.value.ToString() == "stop")
                                if (curtain.trait_on_off.curValue.ToString() == "stop")
                                {
                                    b1 = 0;
                                }
                                else if (curtain.trait_on_off.value.ToString() == "on")
                                else if (curtain.trait_on_off.curValue.ToString() == "on")
                                {
                                    b1 = 1;
                                }
@@ -332,7 +328,7 @@
                            case FunctionType.RollingShutter:
                                //if (commandDictionary.Count > 0)
                                //{
                                if (curtain.trait_on_off.value.ToString() == "stop")
                                if (curtain.trait_on_off.curValue.ToString() == "stop")
                                {
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, 0 });
                                }
@@ -365,14 +361,14 @@
                        {
                            case FunctionType.AC:
                                var aC = function as AC;
                                ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus_Data.LoopID, (byte)aC.curTempType, 32, 32, 32, 32, 32, 0, aC.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, Convert.ToByte(aC.trait_temp.value), 0 });
                                ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus_Data.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.trait_temp.curValue), 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 });
                                foreach (var dic in commandDictionary)
                                {
                                    switch (dic.Key)
                                    {
                                        case "on_off":
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
                                            break;
                                        case "mode":
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.LoopID });
@@ -400,7 +396,7 @@
                                                    modeKey = 2;
                                                    break;
                                            }
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.LoopID });
                                            break;
                                        default:
                                            MainPage.Log($"功能未支持 : {dic.Key}");
@@ -413,7 +409,7 @@
                                var fh = function as FloorHeating;
                                if (fh.modeTemp.Count == 4)
                                {
                                    byte b1 = fh.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
                                    byte b1 = fh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
                                    if (fh.workMode > 0)
                                    {
                                        b1 += (byte)(16 + fh.workMode);
@@ -423,7 +419,7 @@
                                        var dicTempString = "";
                                        commandDictionary.TryGetValue("temp", out dicTempString);
                                        var dicTemp = Convert.ToByte(dicTempString);
                                        switch (fh.trait_mode.value)
                                        switch (fh.trait_mode.curValue)
                                        {
                                            case "day":
                                                fh.modeTemp["day"] = dicTemp;
@@ -449,7 +445,7 @@
                        {
                            case FunctionType.Fan:
                                var fan = function as Fan;
                                if (fan.trait_on_off.value.ToString() == "on")
                                if (fan.trait_on_off.curValue.ToString() == "on")
                                {
                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID, (byte)fan.openLevel });
                                }
@@ -464,7 +460,7 @@
                        {
                            case FunctionType.Socket:
                                var s = function as SwitchSocket;
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID, s.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
                                break;
                        }
                        break;
@@ -773,7 +769,7 @@
        {
            try
            {
                var sendJob = new JObject { { "id", msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 100000).ToString() } };
                var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 100000).ToString() } };
                var bodyString = JsonConvert.SerializeObject(sendJob);
                
                var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString);