20200909

wxr

2020-09-09 c3e1b733fc45bd9f0b88bfb560cfa87a270b079b

 HDL_ON/DriverLayer/Control.cs

@@ -38,10 +38,10 @@
            }
            else
            {
                var commandObj = function.GetSendJObject(CommandType_A.write);
                var commandString = Newtonsoft.Json.JsonConvert.SerializeObject(commandObj);
                var commandBytes = CommonPage.MyEncodingUTF8.GetBytes(commandString);
                MqttCommon.MqttRemoteSend(commandBytes);
                //var commandObj = function.GetSendJObject(CommandType_A.write);
                //var commandString = Newtonsoft.Json.JsonConvert.SerializeObject(commandObj);
                //var commandBytes = CommonPage.MyEncodingUTF8.GetBytes(commandString);
                //MqttCommon.MqttRemoteSend(commandBytes);
            }
        }

@@ -67,10 +67,10 @@
            }
            else
            {
                var commandObj = function.GetSendJObject(CommandType_A.read);
                var commandString = Newtonsoft.Json.JsonConvert.SerializeObject(commandObj);
                var commandBytes = CommonPage.MyEncodingUTF8.GetBytes(commandString);
                MqttCommon.MqttRemoteSend(commandBytes);
                //var commandObj = function.GetSendJObject(CommandType_A.read);
                //var commandString = Newtonsoft.Json.JsonConvert.SerializeObject(commandObj);
                //var commandBytes = CommonPage.MyEncodingUTF8.GetBytes(commandString);
                //MqttCommon.MqttRemoteSend(commandBytes);
            }
        }

@@ -81,7 +81,7 @@
        {
            foreach(var busSceneData in scene.bus_SceneData)
            {
                foreach(var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
                foreach(var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
                {
                    if(busSceneData.Key == function.sid)
                    {
@@ -104,17 +104,17 @@
                                var fh = function as FloorHeating;
                                if (fh.modeTemp.Count == 4)
                                {
                                    byte b1 = fh.on_off == "on" ? (byte)1 : (byte)0;
                                    byte b1 = fh.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
                                    if (fh.workMode > 0)
                                    {
                                        b1 += (byte)(16 + fh.workMode);
                                    }
                                    ControlBytesSend(Command.SetFloorHeat, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { fh.bus_Data.LoopID, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["ordinary"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
                                    ControlBytesSend(Command.SetFloorHeat, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { fh.bus_Data.LoopID, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
                                }
                                break;
                            case FunctionType.Socket:
                                var s = function as SwitchSocket;
                                ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { s.bus_Data.LoopID, s.on_off == "on" ? (byte)100 : (byte)0 });
                                ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { s.bus_Data.LoopID, s.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
                                break;
                        }
                    }
@@ -145,7 +145,7 @@
                            case FunctionType.RGB:
                                MainPage.Log($"rgb level : {light.brightness}");
                                byte b = 100;//开关操作依据on_off字段，实际开关值依据brightness，当on_off为打开，brightness不能为0
                                if (light.on_off == "off")
                                if (light.trait_on_off.value.ToString() == "off")
                                {
                                    b = 0;
                                }
@@ -163,7 +163,7 @@
                                break;
                            case FunctionType.Dimmer:
                                byte b1 = 100;
                                if (light.on_off == "off")
                                if (light.trait_on_off.value.ToString() == "off")
                                {
                                    b1 = 0;
                                }
@@ -177,7 +177,7 @@
                                            0, 0 });
                                break;
                            case FunctionType.Relay:
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.LoopID, light.on_off == "on" ? (byte)100 : (byte)0, 0, 0 });
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.LoopID, light.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
                                break;
                        }
                        break;
@@ -187,11 +187,11 @@
                        {
                            case FunctionType.Curtain:
                                byte b1 = 0;
                                if (curtain.on_off == "stop")
                                if (curtain.trait_on_off.value.ToString() == "stop")
                                {
                                    b1 = 0;
                                }
                                else if (curtain.on_off == "on")
                                else if (curtain.trait_on_off.value.ToString() == "on")
                                {
                                    b1 = 1;
                                }
@@ -203,15 +203,15 @@
                                break;
                            case FunctionType.MotorCurtain:
                            case FunctionType.RollingShutter:
                                if (curtain.on_off == "stop")
                                if (curtain.trait_on_off.value.ToString() == "stop")
                                {
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, 0 });
                                }
                                else if (curtain.on_off == "on")
                                else if (curtain.trait_on_off.value.ToString() == "on")
                                {
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 100 });
                                }
                                else if (curtain.on_off == "off")
                                else if (curtain.trait_on_off.value.ToString() == "off")
                                {
                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 0 });
                                }
@@ -223,14 +223,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.on_off == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, (byte)aC.curTemp, 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.value.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, (byte)aC.trait_temp.value, 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":
                                            Control.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 });
                                            Control.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 });
                                            break;
                                        case "mode":
                                            Control.ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.LoopID });
@@ -258,7 +258,7 @@
                                                    modeKey = 2;
                                                    break;
                                            }
                                            Control.ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.curTemp), aC.bus_Data.LoopID });
                                            Control.ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
                                            break;
                                        default:
                                            MainPage.Log($"功能未支持 : {dic.Key}");
@@ -271,12 +271,12 @@
                                var fh = function as FloorHeating;
                                if (fh.modeTemp.Count == 4)
                                {
                                    byte b1 = fh.on_off == "on" ? (byte)1 : (byte)0;
                                    byte b1 = fh.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
                                    if (fh.workMode > 0)
                                    {
                                        b1 += (byte)(16 + fh.workMode);
                                    }
                                    ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus_Data.LoopID, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["ordinary"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
                                    ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus_Data.LoopID, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
                                }
                                //else
                                //{
@@ -290,7 +290,7 @@
                        {
                            case FunctionType.Fan:
                                var fan = function as Fan;
                                if (fan.on_off == "on")
                                if (fan.trait_on_off.value.ToString() == "on")
                                {
                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID, (byte)fan.openLevel });
                                }
@@ -305,7 +305,7 @@
                        {
                            case FunctionType.Socket:
                                var s = function as SwitchSocket;
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID, s.on_off == "on" ? (byte)100 : (byte)0 });
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID, s.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
                                break;
                        }
                        break;
@@ -359,143 +359,6 @@



                //switch (function.functionCategory)
                //{
                //    case FunctionCategory.Light:
                //        var light = function as Light;
                //        switch (light.functionType)
                //        {
                //            case FunctionType.RGB:
                //                MainPage.Log($"rgb level : {light.brightness}");
                //                byte b = 100;//开关操作依据on_off字段，实际开关值依据brightness，当on_off为打开，brightness不能为0
                //                if (light.on_off == "off")
                //                {
                //                    b = 0;
                //                }
                //                else
                //                {
                //                    b = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
                //                }
                //                var bytes = new byte[] { function.bus_Data.LoopID,
                //                            b,
                //                            254, 0,0,3,
                //                            (byte)light.redColor,(byte)light.greenColor,
                //                            (byte)light.blueColor,
                //                            0,0};
                //                MainPage.Log($"rgb level1 : {light.brightness}");
                //                ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
                //                MainPage.Log($"rgb level2 : {light.brightness}");
                //                break;
                //            case FunctionType.Dimmer:
                //                byte b1 = 100;
                //                if (light.on_off == "off")
                //                {
                //                    b1 = 0;
                //                }
                //                else
                //                {
                //                    b1 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
                //                }
                //                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
                //                            function.bus_Data.LoopID,
                //                            b1,
                //                            0, 0 });
                //                break;
                //            case FunctionType.Relay:
                //                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.LoopID, light.on_off == "on" ? (byte)100 : (byte)0, 0, 0 });
                //                break;
                //        }
                //        break;
                //    case FunctionCategory.Curtain:
                //        var curtain = function as Curtain;
                //        switch (curtain.functionType)
                //        {
                //            case FunctionType.Curtain:
                //                byte b1 = 0;
                //                if (curtain.on_off == "stop")
                //                {
                //                    b1 = 0;
                //                }
                //                else if (curtain.on_off == "on")
                //                {
                //                    b1 = 1;
                //                }
                //                else
                //                {
                //                    b1 = 2;
                //                }
                //                ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, b1 });
                //                break;
                //            case FunctionType.MotorCurtain:
                //            case FunctionType.RollingShutter:
                //                if (curtain.on_off == "stop")
                //                {
                //                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, 0 });
                //                }
                //                else if (curtain.on_off == "on")
                //                {
                //                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 100 });
                //                }
                //                else if (curtain.on_off == "off")
                //                {
                //                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 0 });
                //                }
                //                break;
                //        }
                //        break;
                //    case FunctionCategory.Thermostat:
                //        switch (function.functionType)
                //        {
                //            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.on_off == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, (byte)aC.curTemp, 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 });
                //                break;
                //            case FunctionType.FloorHeating:
                //                var fh = function as FloorHeating;
                //                if (fh.modeTemp.Count == 4)
                //                {
                //                    byte b1 = fh.on_off == "on" ? (byte)1 : (byte)0;
                //                    if (fh.workMode > 0)
                //                    {
                //                        b1 += (byte)(16 + fh.workMode);
                //                    }
                //                    ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus_Data.LoopID, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["ordinary"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
                //                }
                //                //else
                //                //{
                //                //    ControlBytesSend(Command.ReadFloorHeat, subnetId,deviceId,new byte[] { fh.bus_Data.LoopID});
                //                //}
                //                break;
                //        }
                //        break;
                //    case FunctionCategory.Electrical:
                //        switch (function.functionType)
                //        {
                //            case FunctionType.Fan:
                //                var fan = function as Fan;
                //                if (fan.on_off == "on")
                //                {
                //                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID, (byte)fan.openLevel });
                //                }
                //                {
                //                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID, 0 });
                //                }
                //                break;
                //        }
                //        break;
                //    case FunctionCategory.SwitchDevice:
                //        switch (function.functionType)
                //        {
                //            case FunctionType.Socket:
                //                var s = function as SwitchSocket;
                //                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID, s.on_off == "on" ? (byte)100 : (byte)0 });
                //                break;
                //        }
                //        break;
                //}


            }
            catch (Exception ex)
            {
@@ -521,7 +384,7 @@
                        {
                            case FunctionType.Relay:
                            case FunctionType.Dimmer:
                                ControlBytesSend(Command.ReadLightSingleLoopBrightness, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
                                ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
                                break;
                            case FunctionType.RGB:
                                ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });