From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 472 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 274 insertions(+), 198 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 0f458fb..456591d 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -156,145 +156,180 @@
/// </summary>
public void ControlBusScenes(Scene scene)
{
- foreach (var f in scene.functions)
+ if(Control.Ins.GatewayOnline_Local)
{
- switch (f.localFunction.functionType)
+ foreach (var f in scene.functions)
{
- case FunctionType.Curtain:
- foreach (var attr in f.status)
- {
- if (attr.key == FunctionAttributeKey.OnOff)
+ if (f.localFunction == null)
+ {
+ continue;
+ }
+ switch (f.localFunction.spk)
+ {
+ case SPK.CurtainSwitch:
+ foreach (var attr in f.status)
{
- byte curtainState = 0;
- switch (attr.value)
+ if (attr.key == FunctionAttributeKey.OnOff)
{
- case "on":
- curtainState = 1;
- break;
- case "off":
- curtainState = 2;
- break;
- }
- ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
- new byte[] { f.localFunction.bus_Data.loopId, curtainState });
- break;
- }
- }
- break;
- case FunctionType.AC:
- AC tempAc = new AC();
- foreach (var attr in f.status)
- {
- byte modeKey = 4;
- switch (attr.key)
- {
- case FunctionAttributeKey.OnOff:
- tempAc.trait_on_off.curValue = attr.value;
- break;
- case FunctionAttributeKey.Mode:
- tempAc.trait_mode.curValue = attr.value;
- break;
- case FunctionAttributeKey.FanSpeed:
- tempAc.trait_fan.curValue = attr.value;
- break;
- case FunctionAttributeKey.SetTemp:
- tempAc.trait_temp.curValue = attr.value;
- switch (tempAc.curModeIndex)
- {
- case 3:
- modeKey = 8;
- break;
- case 0:
- modeKey = 4;
- break;
- case 1:
- modeKey = 7;
- break;
- case 4:
- modeKey = 19;
- break;
- case 2:
- modeKey = 2;
- break;
- }
- break;
- }
- ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 3, tempAc.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus_Data.loopId });
- ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 6, tempAc.curModeIndex, f.localFunction.bus_Data.loopId });
- ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 5, tempAc.curFanIndex, f.localFunction.bus_Data.loopId });
- ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.trait_temp.curValue), f.localFunction.bus_Data.loopId });
- }
- break;
- case FunctionType.Relay:
- case FunctionType.Dimmer:
- byte brightness = 0;
- foreach (var attr in f.status)
- {
- switch (attr.key)
- {
- case FunctionAttributeKey.OnOff:
+ byte curtainState = 0;
switch (attr.value)
{
case "on":
- brightness = 100;
+ curtainState = 1;
break;
case "off":
- brightness = 0;
+ curtainState = 2;
break;
}
+ ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
+ new byte[] { f.localFunction.bus.LoopId, curtainState });
break;
- case FunctionAttributeKey.Brightness:
- brightness = Convert.ToByte(attr.value);
- break;
+ }
}
- }
- ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
- new byte[] { f.localFunction.bus_Data.loopId, brightness });
- break;
- case FunctionType.RGB:
- break;
- case FunctionType.FloorHeating:
- var tempFh = new FloorHeating();
- foreach (var attr in f.status)
- {
- switch (attr.key)
+ break;
+ case SPK.AcStandard:
+ AC tempAc = new AC();
+ foreach (var attr in f.status)
{
- case FunctionAttributeKey.OnOff:
- tempFh.trait_on_off.curValue = attr.value;
- break;
- case FunctionAttributeKey.SetTemp:
- tempFh.trait_temp.curValue = attr.value;
- break;
- case FunctionAttributeKey.Mode:
- tempFh.trait_mode.curValue = attr.value;
- break;
- }
- }
- byte b1 = tempFh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
- ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] {
- f. localFunction.bus_Data.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:
- foreach (var attr in f.status)
- {
- if (attr.key == FunctionAttributeKey.OnOff)
- {
- byte onOffValue = 0;
- switch (attr.value)
+ byte modeKey = 4;
+ switch (attr.key)
{
- case "on":
- onOffValue = 1;
+ case FunctionAttributeKey.OnOff:
+ tempAc.trait_on_off.curValue = attr.value;
break;
- case "off":
- onOffValue = 2;
+ 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())
+ {
+ case 3:
+ modeKey = 8;
+ break;
+ case 0:
+ modeKey = 4;
+ break;
+ case 1:
+ modeKey = 7;
+ break;
+ case 4:
+ modeKey = 19;
+ break;
+ case 2:
+ modeKey = 2;
+ break;
+ }
break;
}
- ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
- new byte[] { f.localFunction.bus_Data.loopId, onOffValue });
- 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 });
}
+ break;
+ case SPK.LightSwitch:
+ case SPK.LightDimming:
+ byte brightness = 0;
+ foreach (var attr in f.status)
+ {
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ switch (attr.value)
+ {
+ case "on":
+ brightness = 100;
+ break;
+ case "off":
+ brightness = 0;
+ break;
+ }
+ break;
+ case FunctionAttributeKey.Brightness:
+ brightness = Convert.ToByte(attr.value);
+ break;
+ }
+ }
+ ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
+ new byte[] { f.localFunction.bus.LoopId, brightness, (byte)(f.localFunction.delay / 255), (byte)(f.localFunction.delay % 255) });
+ break;
+ case SPK.LightRGB:
+ break;
+ case SPK.FloorHeatStandard:
+ var tempFh = new FloorHeating();
+ foreach (var attr in f.status)
+ {
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ tempFh.trait_on_off.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.SetTemp:
+ tempFh.trait_temp.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.Mode:
+ tempFh.trait_mode.curValue = attr.value;
+ 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 });
+ break;
+ case SPK.ElectricSocket:
+ foreach (var attr in f.status)
+ {
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ byte onOffValue = 0;
+ switch (attr.value)
+ {
+ case "on":
+ onOffValue = 1;
+ break;
+ case "off":
+ onOffValue = 2;
+ break;
+ }
+ ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
+ new byte[] { f.localFunction.bus.LoopId, onOffValue });
+ break;
+ }
+ }
+ break;
+ }
+ }
+ }
+ else
+ {
+ foreach (var f in scene.functions)
+ {
+ 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)
+ {
+ if (f.localFunction == null)
+ {
+ continue;
}
- break;
+ 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);
}
}
}
@@ -308,18 +343,35 @@
{
try
{
- var subnetId = function.bus_Data.SubnetID;
- var deviceId = function.bus_Data.DeviceID;
- var loopId = function.bus_Data.loopId;
+ var subnetId = function.bus.SubnetID;
+ 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:
- MainPage.Log($"rgb level : {light.brightness}");
+ case SPK.LightCCT:
+ byte b0 = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
+ if (light.trait_on_off.curValue.ToString() == "off")
+ {
+ b0 = 0;
+ }
+ else
+ {
+ b0 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.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,
+ 0,0};
+ ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes0, 1);
+ break;
+ case SPK.LightRGB:
byte b = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
if (light.trait_on_off.curValue.ToString() == "off")
{
@@ -329,15 +381,15 @@
{
b = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
}
- var bytes = new byte[] { function.bus_Data.loopId,
+ var bytes = new byte[] { function.bus.LoopId,
b,
254, 0,Convert.ToByte(light.fadeTime) ,3,
- (byte)light.redColor,(byte)light.greenColor,
- (byte)light.blueColor,
+ (byte)light.RedColor,(byte)light.GreenColor,
+ (byte)light.BlueColor,
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")
{
@@ -348,22 +400,22 @@
b1 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
}
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
- function.bus_Data.loopId,
+ function.bus.LoopId,
b1,
0, Convert.ToByte(light.fadeTime) });
//DimmerPage.UpdataStates(light);
break;
- case FunctionType.Relay:
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.loopId, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
+ 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;
}
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")
{
@@ -377,15 +429,15 @@
{
b1 = 2;
}
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, b1 });
+ 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")
{
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus.LoopId, 0 });
}
else
{
@@ -411,29 +463,29 @@
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_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.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 });
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.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
+ 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 });
break;
case "mode":
- 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.SubnetID, aC.bus.DeviceID, new byte[] { 6, aC.curModeIndex(), aC.bus.LoopId });
break;
case "fan":
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.loopId });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { 5, aC.curFanIndex(), aC.bus.LoopId });
break;
case "temp":
byte modeKey = 4;
- switch (aC.curModeIndex)
+ switch (aC.curModeIndex())
{
case 3:
modeKey = 8;
@@ -451,7 +503,7 @@
modeKey = 2;
break;
}
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.loopId });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.GetAttrState(FunctionAttributeKey.SetTemp)), aC.bus.LoopId });
break;
default:
MainPage.Log($"鍔熻兘鏈敮鎸� : {dic.Key}");
@@ -460,7 +512,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)
{
@@ -490,32 +546,27 @@
break;
}
}
- 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 });
+ 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 });
}
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")
{
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, (byte)fan.openLevel });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId, (byte)fan.openLevel });
}
{
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, 0 });
+ 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_Data.loopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
break;
}
break;
@@ -540,67 +591,88 @@
{
try
{
- var subnetId = function.bus_Data.SubnetID;
- var deviceId = function.bus_Data.DeviceID;
- var loopId = function.bus_Data.loopId;
+ var subnetId = function.bus.SubnetID;
+ 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:
- ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
+ case SPK.LightRGB:
+ ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId});
+ break;
+ case SPK.LightCCT:
+ 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:
- ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
+ 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:
- ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
- break;
- case FunctionType.FloorHeating:
- ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
+ case SPK.AcStandard:
+ ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
}
break;
- case FunctionCategory.Electrical:
- switch (function.functionType)
+ case FunctionCategory.FloorHeat:
+ switch (function.spk)
{
- case FunctionType.Fan:
+ case SPK.FloorHeatStandard:
+ ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
+ break;
+ }
+ break;
+ case FunctionCategory.Electric:
+ switch (function.spk)
+ {
+ case SPK.ElectricFan:
var fan = function as Fan;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId });
+ 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_Data.loopId });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId });
break;
}
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_Data.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;
}
}
@@ -728,7 +800,7 @@
UdpSocket._BusSocket.AsyncBeginSend(packet);
controlLostCount++;
}
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(300);
}
}
catch (Exception ex)
@@ -787,6 +859,10 @@
}
}
+
+ //private void signAlinkPacket()
+ //{
+ //}
/// <summary>
/// 鍙戦�佹暟鎹�
@@ -857,7 +933,7 @@
{
wait();
}
- //MainPage.Log($"鍙戦�丠dl-Link鏁版嵁锛孖P:{Control.Ins.reportIp}:8585");
+ MainPage.Log($"鍙戦�丠dl-Link鏁版嵁锛孖P:{Control.Ins.reportIp}:8585");
}
}
--
Gitblit v1.8.0