Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 HDL_ON/DAL/DriverLayer/Control_Udp.cs

@@ -156,11 +156,45 @@
        /// </summary>
        public void ControlBusScenes(Scene scene)
        {
            if (Control.Ins.IsRemote)
            {
            foreach (var f in scene.functions)
            {
                switch (f.localFunction.functionType)
                    var count = 0;
                    List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    var pm = new DAL.Server.HttpServerRequest();
                    foreach (var temp in f.status)
                {
                    case FunctionType.Curtain:
                        if (f.localFunction == null)
                        {
                            continue;
                        }
                        d.Add(temp.key, temp.value);
                        var apiControlData = f.localFunction.GetApiControlData(d);
                        actionObjs.Add(apiControlData);
                        count++;
                        if (count > 9)
                        {
                            var result = pm.ControlDevice(actionObjs);
                            actionObjs = new List<ApiAlinkControlActionObj>();
                            count = 0;
                        }
                    }
                    var pack = pm.ControlDevice(actionObjs);
                }
            }
            else
            {
                foreach (var f in scene.functions)
                {
                    if (f.localFunction == null)
                    {
                        continue;
                    }
                    switch (f.localFunction.spk)
                    {
                        case SPK.CurtainSwitch:
                        foreach (var attr in f.status)
                        {
                            if (attr.key == FunctionAttributeKey.OnOff)
@@ -181,7 +215,7 @@
                            }
                        }
                        break;
                    case FunctionType.AC:
                        case SPK.AcStandard:
                        AC tempAc = new AC();
                        foreach (var attr in f.status)
                        {
@@ -225,8 +259,8 @@
                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.trait_temp.curValue), f.localFunction.bus.LoopId });
                        }
                        break;
                    case FunctionType.Relay:
                    case FunctionType.Dimmer:
                        case SPK.LightSwitch:
                        case SPK.LightDimming:
                        byte brightness = 0;
                        foreach (var attr in f.status)
                        {
@@ -249,11 +283,11 @@
                            }
                        }
                        ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
                            new byte[] { f.localFunction.bus.LoopId, brightness });
                                new byte[] { f.localFunction.bus.LoopId, brightness, (byte)(f.localFunction.delay / 255), (byte)(f.localFunction.delay % 255) });
                        break;
                    case FunctionType.RGB:
                        case SPK.LightRGB:
                        break;
                    case FunctionType.FloorHeating:
                        case SPK.FloorHeatStandard:
                        var tempFh = new FloorHeating();
                        foreach (var attr in f.status)
                        {
@@ -274,7 +308,7 @@
                        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 });
                        break;
                    case FunctionType.Socket:
                        case SPK.ElectricSocket:
                        foreach (var attr in f.status)
                        {
                            if (attr.key == FunctionAttributeKey.OnOff)
@@ -298,6 +332,7 @@
                }
            }
        }
        }

        /// <summary>
        /// 控制bus设备
@@ -312,13 +347,13 @@
                var deviceId = function.bus.DeviceID;
                var loopId = function.bus.LoopId;

                switch (function.functionCategory)
                switch (function.Spk_Prefix)
                {
                    case FunctionCategory.Light:
                        var light = function as Light;
                        switch (light.functionType)
                        switch (light.spk)
                        {
                            case FunctionType.RGB:
                            case SPK.LightRGB:
                                MainPage.Log($"rgb level : {light.brightness}");
                                byte b = 100;//开关操作依据on_off字段，实际开关值依据brightness，当on_off为打开，brightness不能为0
                                if (light.trait_on_off.curValue.ToString() == "off")
@@ -337,7 +372,7 @@
                                            0,0};
                                ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
                                break;
                            case FunctionType.Dimmer:
                            case SPK.LightDimming:
                                byte b1 = 100;
                                if (light.trait_on_off.curValue.ToString() == "off")
                                {
@@ -353,7 +388,7 @@
                                            0, Convert.ToByte(light.fadeTime) });
                                //DimmerPage.UpdataStates(light);
                                break;
                            case FunctionType.Relay:
                            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);
                                break;
@@ -361,9 +396,9 @@
                        break;
                    case FunctionCategory.Curtain:
                        var curtain = function as Curtain;
                        switch (curtain.functionType)
                        switch (curtain.spk)
                        {
                            case FunctionType.Curtain:
                            case SPK.CurtainSwitch:
                                byte b1 = 0;
                                if (curtain.trait_on_off.curValue.ToString() == "stop")
                                {
@@ -379,8 +414,8 @@
                                }
                                ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus.LoopId, b1 });
                                break;
                            case FunctionType.MotorCurtain:
                            case FunctionType.RollingShutter:
                            case SPK.CurtainTrietex:
                            case SPK.CurtainRoller:
                                //if (commandDictionary.Count > 0)
                                //{
                                if (curtain.trait_on_off.curValue.ToString() == "stop")
@@ -411,10 +446,10 @@
                                break;
                        }
                        break;
                    case FunctionCategory.Thermostat:
                        switch (function.functionType)
                    case FunctionCategory.AC:
                        switch (function.spk)
                        {
                            case FunctionType.AC:
                            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.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 });
@@ -460,7 +495,11 @@
                                }

                                break;
                            case FunctionType.FloorHeating:
                        }
                        break;
                    case FunctionCategory.FloorHeat:
                        switch (function.spk) {
                            case SPK.FloorHeatStandard:
                                var fh = function as FloorHeating;
                                if (fh.modeTemp.Count == 4)
                                {
@@ -495,10 +534,10 @@
                                break;
                        }
                        break;
                    case FunctionCategory.Electrical:
                        switch (function.functionType)
                    case FunctionCategory.Electric:
                        switch (function.spk)
                        {
                            case FunctionType.Fan:
                            case SPK.ElectricFan:
                                var fan = function as Fan;
                                if (fan.trait_on_off.curValue.ToString() == "on")
                                {
@@ -508,12 +547,7 @@
                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId, 0 });
                                }
                                break;
                        }
                        break;
                    case FunctionCategory.SwitchDevice:
                        switch (function.functionType)
                        {
                            case FunctionType.Socket:
                            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 });
                                break;
@@ -544,54 +578,54 @@
                var deviceId = function.bus.DeviceID;
                var loopId = function.bus.LoopId;

                switch (function.functionCategory)
                switch (function.Spk_Prefix)
                {
                    case FunctionCategory.Light:
                        switch (function.functionType)
                        switch (function.spk)
                        {
                            case FunctionType.Relay:
                            case FunctionType.Dimmer:
                            case SPK.LightSwitch:
                            case SPK.LightDimming:
                                ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
                                break;
                            case FunctionType.RGB:
                            case SPK.LightRGB:
                                ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId });
                                break;
                        }
                        break;
                    case FunctionCategory.Curtain:
                        switch (function.functionType)
                        switch (function.spk)
                        {
                            case FunctionType.Curtain:
                            case FunctionType.MotorCurtain:
                            case FunctionType.RollingShutter:
                            case SPK.CurtainSwitch:
                            case SPK.CurtainTrietex:
                            case SPK.CurtainRoller:
                                ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus.LoopId });
                                break;
                        }
                        break;
                    case FunctionCategory.Thermostat:
                        switch (function.functionType)
                    case FunctionCategory.AC:
                        switch (function.spk)
                        {
                            case FunctionType.AC:
                            case SPK.AcStandard:
                                ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
                                break;
                            case FunctionType.FloorHeating:
                        }
                        break;
                    case FunctionCategory.FloorHeat:
                        switch (function.spk)
                        {
                            case SPK.FloorHeatStandard:
                                ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
                                break;
                        }
                        break;
                    case FunctionCategory.Electrical:
                        switch (function.functionType)
                    case FunctionCategory.Electric:
                        switch (function.spk)
                        {
                            case FunctionType.Fan:
                            case SPK.ElectricFan:
                                var fan = function as Fan;
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId });
                                break;
                        }
                        break;
                    case FunctionCategory.SwitchDevice:
                        switch (function.functionType)
                        {
                            case FunctionType.Socket:
                            case SPK.ElectricSocket:
                                var s = function as SwitchSocket;
                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId });
                                break;
@@ -599,8 +633,26 @@
                        break;
                    case FunctionCategory.Sensor:
                        var sensor = function as Sensor;
                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { (byte)5,
                                            (byte)((int)sensor.functionType % 256), sensor.bus.LoopId });
                        byte sensorType = 0;
                        switch (function.spk)
                        {
                            case SPK.SensorTemperature:
                                sensorType = 2;
                                break;
                            case SPK.SensorHumidity:
                                sensorType = 3;
                                break;
                            case SPK.SensorTVOC:
                                sensorType = 5;
                                break;
                            case SPK.SensorPm25:
                                sensorType = 6;
                                break;
                            case SPK.SensorCO2:
                                sensorType = 7;
                                break;
                        }
                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, sensorType, sensor.bus.LoopId });
                        break;
                }
            }
@@ -861,7 +913,7 @@
            {
                wait(); 
            }
            //MainPage.Log($"发送Hdl-Link数据，IP:{Control.Ins.reportIp}:8585");
            MainPage.Log($"发送Hdl-Link数据，IP:{Control.Ins.reportIp}:8585");
        }
    }