From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 846 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 570 insertions(+), 276 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 58f56f0..3c742c4 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -29,6 +29,7 @@
/// 鎵�鏈夊涓�绔彛鐨勬帶鍒堕兘浼氭斁鍒拌繖涓泦鍚堥噷
/// </summary>
static List<Control_Udp> controlList = new List<Control_Udp>(50);
+
public System.Net.IPEndPoint EndPoint
{
@@ -65,7 +66,7 @@
/// <summary>
/// 閲嶅彂楠岃瘉
/// </summary>
- public void ReceiveRepeatManager(string receiveFlag)
+ public static void ReceiveRepeatManager(string receiveFlag,byte []usefulBytes)
{
for (int i = 0; i < controlList.Count; i++)
{
@@ -155,145 +156,255 @@
/// </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.SubnetID, f.localFunction.bus.DeviceID,
- new byte[] { f.localFunction.bus.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.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.trait_temp.curValue), f.localFunction.bus.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.SubnetID, f.localFunction.bus.DeviceID,
- new byte[] { f.localFunction.bus.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 acTemp = new AC();
+ byte onoff = 0;
+ byte mode = 0;
+ byte fan = 0;
+ 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.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:
- 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:
+ if(attr.value == "on")
+ {
+ onoff = 1;
+ }
+ else
+ {
+ onoff = 0;
+ }
break;
- case "off":
- onOffValue = 2;
+ case FunctionAttributeKey.Mode:
+ switch (attr.value)
+ {
+ case "auto":
+ mode = 3;
+ modeKey = 8;
+ break;
+ case "cool":
+ mode = 0;
+ modeKey = 4;
+ break;
+ case "heat":
+ mode = 1;
+ modeKey = 7;
+ break;
+ case "dry":
+ mode = 4;
+ modeKey = 19;
+ break;
+ 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.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
- new byte[] { f.localFunction.bus.LoopId, onOffValue });
- break;
+ 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:
+ 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:
+ if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
+ {
+ foreach (var dic in f.status)
+ {
+ switch (dic.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 20, dic.value.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus.LoopId });
+ break;
+ case "mode":
+ ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 21, Convert.ToByte(dic.value), f.localFunction.bus.LoopId });
+ break;
+ case FunctionAttributeKey.SetTemp:
+ ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
+ 25, Convert.ToByte(dic.value), f.localFunction.bus.LoopId });
+ break;
+ }
+ }
+ }
+ else
+ {
+ byte onoff_1 = 0;
+ byte setTemp_1 = 0;
+ byte mode_1 = 0;
+ foreach (var attr in f.status)
+ {
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ if (attr.value == "on")
+ {
+ onoff_1 = 1;
+ }
+ else
+ {
+ onoff_1 = 0;
+ }
+ break;
+ case FunctionAttributeKey.SetTemp:
+ setTemp_1 = Convert.ToByte(attr.value);
+ break;
+ case FunctionAttributeKey.Mode:
+ 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;
+ }
+ }
+ ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
+ 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)
+ {
+ 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);
}
}
}
@@ -311,64 +422,96 @@
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 (function.spk)
{
- case FunctionType.RGB:
- MainPage.Log($"rgb level : {light.brightness}");
+ case SPK.LightCCT:
+ byte b0 = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ b0 = 0;
+ }
+ else
+ {
+ 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(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;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�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 FunctionType.Dimmer:
+ 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)
+ {
+ b1 = 100;
+ }
+ else
+ {
+ b1 = 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 FunctionType.Relay:
- 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);
+ case SPK.LightSwitch:
+ 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.functionType)
+ switch (function.spk)
{
- case FunctionType.Curtain:
+ 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;
}
@@ -376,63 +519,46 @@
{
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 FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- //if (commandDictionary.Count > 0)
- //{
- if (curtain.trait_on_off.curValue.ToString() == "stop")
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
+ 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;
- case FunctionCategory.Thermostat:
- switch (function.functionType)
+ case FunctionCategory.AC:
+ switch (function.spk)
{
- case FunctionType.AC:
- 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 });
+ case SPK.AcStandard:
+ 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":
+ case FunctionAttributeKey.SetTemp:
byte modeKey = 4;
- switch (aC.curModeIndex)
+ switch (ac.GetModeIndex(function))
{
case 3:
modeKey = 8;
@@ -450,7 +576,8 @@
modeKey = 2;
break;
}
- ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), 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}");
@@ -459,62 +586,188 @@
}
break;
- case FunctionType.FloorHeating:
- var fh = function as FloorHeating;
- if (fh.modeTemp.Count == 4)
+ }
+ break;
+ case FunctionCategory.FloorHeat:
+ var fhTemp = new FloorHeating();
+ switch (function.spk)
+ {
+ case SPK.FloorHeatStandard:
+ if (function.Fh_Mode_Temp.Count == 4)
{
- byte b1 = fh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
- if (fh.workMode > 0)
+ if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
{
- b1 += (byte)(16 + fh.workMode);
- }
- if (commandDictionary.ContainsKey("temp"))
- {
- var dicTempString = "";
- commandDictionary.TryGetValue("temp", out dicTempString);
- var dicTemp = Convert.ToByte(dicTempString);
- switch (fh.trait_mode.curValue)
+ foreach (var dic in commandDictionary)
{
- case "day":
- fh.modeTemp["day"] = dicTemp;
- break;
- case "night":
- fh.modeTemp["night"] = dicTemp;
- break;
- case "away":
- fh.modeTemp["away"] = dicTemp;
- break;
- case "normal":
- fh.modeTemp["normal"] = dicTemp;
- break;
+ switch (dic.Key)
+ {
+ case FunctionAttributeKey.OnOff:
+ ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 20, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, function.bus.LoopId });
+ break;
+ case "mode":
+ ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 21, fhTemp.GetModeIndex(function), function.bus.LoopId });
+ break;
+ case FunctionAttributeKey.SetTemp:
+ byte modeKey = 25;
+ switch (fhTemp.GetModeIndex(function))
+ {
+ case 1:
+ modeKey = 25;
+ break;
+ case 2:
+ modeKey = 26;
+ break;
+ case 3:
+ modeKey = 27;
+ break;
+ case 4:
+ modeKey = 28;
+ break;
+ }
+ 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}");
+ 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 });
+ else
+ {
+ var onoffString = function.trait_on_off.curValue.ToString();
+ byte b1 = 1;
+ if (onoffString == "off")
+ {
+ b1 = 0;
+ }
+ var wm = fhTemp.GetWorkModeIndex(function);
+ if (wm > 0)
+ {
+ b1 += (byte)(16 + wm);
+ }
+ if (commandDictionary.ContainsKey("set_temp"))
+ {
+ var dicTempString = "";
+ commandDictionary.TryGetValue("set_temp", out dicTempString);
+ var dicTemp = Convert.ToByte(dicTempString);
+ var mode = function.GetAttrState(FunctionAttributeKey.Mode);
+ switch (mode)
+ {
+ case "day":
+ function.Fh_Mode_Temp["day"] = dicTemp;
+ break;
+ case "night":
+ function.Fh_Mode_Temp["night"] = dicTemp;
+ break;
+ case "away":
+ function.Fh_Mode_Temp["away"] = dicTemp;
+ break;
+ case "normal":
+ function.Fh_Mode_Temp["normal"] = dicTemp;
+ break;
+ }
+ }
+ 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;
}
break;
- case FunctionCategory.Electrical:
- switch (function.functionType)
+ case FunctionCategory.Electric:
+ switch (function.spk)
{
- case FunctionType.Fan:
- var fan = function as Fan;
- if (fan.trait_on_off.curValue.ToString() == "on")
+ case SPK.ElectricFan:
+ 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:
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
break;
}
break;
- case FunctionCategory.SwitchDevice:
- switch (function.functionType)
+ case FunctionCategory.AirFresh:
+ switch(function.spk)
{
- case FunctionType.Socket:
- 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 });
+ case SPK.AirFreshJinmao:
+ //1 鏂伴缂栧彿 1~200
+ //2 绫诲瀷 绗笁鏂圭被鍨� 0锛氶噾鑼傛柊椋�
+
+ //3 寮�鍏� 0 - 鍏虫満锛�1 - 寮�鏈�
+ byte switchValue = 0;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) == true
+ && commandDictionary[FunctionAttributeKey.OnOff] == "on")
+ {
+ switchValue = 1;
+ }
+
+ //4 杩愯妯″紡 1 - 閫氶锛�2 - 鍔犳箍
+ byte airFreshMode = 1;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.Mode) == true
+ && commandDictionary[FunctionAttributeKey.Mode] == "humidification")
+ {
+ airFreshMode = 2;
+ }
+ //5 鑺傝兘鑸掗�傞�夋嫨 1 - 鑸掗�傦紝2 - 鑺傝兘
+ byte airFreshEnergy = 1;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.Energy) == true
+ && commandDictionary[FunctionAttributeKey.Energy] == "true")
+ {
+ airFreshEnergy = 2;
+ }
+ //6 椋庨�熸。浣� 0 - 鑷姩锛�1 - 1妗ｏ紝2 - 2妗ｏ紝3 - 3妗�
+ byte airFreshFan = 0;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.FanSpeed) == true)
+ {
+ switch (commandDictionary[FunctionAttributeKey.FanSpeed])
+ {
+ case "auto":
+ airFreshFan = 0;
+ break;
+ case "level_1":
+ airFreshFan = 1;
+ break;
+ case "level_2":
+ airFreshFan = 2;
+ break;
+ case "level_3":
+ airFreshFan = 3;
+ break;
+ }
+ }
+ //7 婀垮害璁惧畾 %
+ //8 瀹ゅ唴娓╁害鍊� 鈩�
+ byte indoorTemp_airFrsh = 0;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.IndoorTemp) == true)
+ {
+ indoorTemp_airFrsh= Convert.ToByte(commandDictionary[FunctionAttributeKey.IndoorTemp]);
+ }
+ byte indoorHumidity_airFrsh = 0;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.IndoorHumidity) == true)
+ {
+ indoorHumidity_airFrsh = Convert.ToByte(commandDictionary[FunctionAttributeKey.IndoorHumidity]);
+ }
+ //9 瀹ゅ唴婀垮害鍊� 鈩�
+ //10 杩囨护缃戝墿浣� %
+ //11 杩囨护缃戜娇鐢ㄨ秴鏃� 1 瓒呮椂 0 鏃�
+ ControlBytesSend(Command.FreshAirControl_JinMao, subnetId, deviceId, new byte[] {
+ function.bus.LoopId,0, switchValue ,
+ airFreshMode,airFreshEnergy,
+ airFreshFan,
+ Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Humidity)),
+ indoorTemp_airFrsh,
+ indoorHumidity_airFrsh,
+ //Convert.ToByte( function.GetAttrState(FunctionAttributeKey.FilterRemain)),
+ //function.GetAttrState(FunctionAttributeKey.FilterTimeout) =="true"?1:0,
+ 0,0
+ });
break;
}
break;
@@ -543,63 +796,89 @@
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;
+ 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:
+ 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:
- var fan = function as Fan;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId });
+ case SPK.ElectricFan:
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
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.LoopId });
+ case SPK.ElectricSocket:
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.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.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, function.bus.LoopId });
+ break;
+ case FunctionCategory.AirFresh:
+ switch(function.spk)
+ {
+ case SPK.AirFreshJinmao:
+ ControlBytesSend(Command.FreshAirRead_JinMao, subnetId, deviceId, new byte[] { function.bus.LoopId });
+ break;
+ }
break;
}
}
@@ -623,7 +902,7 @@
{
for (int i = 0; i < controlList.Count;)
{
- if (controlList[i] == null || 3 <= controlList[i].Packet.HaveSendCount)
+ if (controlList[i] == null || 3 <= controlList[i].packet.HaveSendCount)
{
controlList.RemoveAt(i);
}
@@ -692,7 +971,7 @@
void run()
{
allDone.Set();
- Packet.HaveSendCount = 4;
+ packet.HaveSendCount = 4;
}
//鏁版嵁鍙戦�佸鐞�
@@ -706,7 +985,7 @@
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(1000);
- UdpSocket._BusSocket.Start(6000);
+ UdpSocket._BusSocket.Start(UdpSocket._BusSocket.Port);
controlLostCount = 0;
})
{ IsBackground = true }.Start();
@@ -715,19 +994,19 @@
try
{
MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
- UdpSocket._BusSocket.AsyncBeginSend(Packet);
- Packet.HaveSendCount--;
+ UdpSocket._BusSocket.AsyncBeginSend(packet);
+ packet.HaveSendCount--;
//杩欓噷鏄噸鍙戜袱娆�
- while (Packet.HaveSendCount < 3)
+ while (packet.HaveSendCount < 3)
{
- if (Packet.FlagDateTime.AddMilliseconds(1000).Ticks <= DateTime.Now.Ticks)
+ if (packet.FlagDateTime.AddMilliseconds(1000).Ticks <= DateTime.Now.Ticks)
{
MainPage.Log("閲嶅彂鏁版嵁:" + SendFlag);
- UdpSocket._BusSocket.AsyncBeginSend(Packet);
+ UdpSocket._BusSocket.AsyncBeginSend(packet);
controlLostCount++;
}
- System.Threading.Thread.Sleep(100);
+ System.Threading.Thread.Sleep(300);
}
}
catch (Exception ex)
@@ -743,7 +1022,7 @@
/// <summary>
/// 褰撳墠鏁版嵁鍖�
/// </summary>
- Packet Packet;
+ Packet packet;
/// <summary>
/// 璁板綍鍙戦�佹暟鎹寘
/// </summary>
@@ -760,6 +1039,10 @@
case Command.SetACMode:
case Command.ReadFloorHeat:
case Command.SetFloorHeat:
+ case Command.FreshAirRead:
+ case Command.FreshAirControl:
+ case Command.FreshAirRead_JinMao:
+ case Command.FreshAirControl_JinMao:
this.sendFlag += string.Format("{0}", target.AddData[0]);
break;
case Command.SetLogicLoopColor:
@@ -800,14 +1083,14 @@
{
try
{
- Packet = new Packet(target.SendBytes, target.IPEndPoint);
- Packet.HaveSendCount = 3 - sendCount;
+ packet = new Packet(target.SendBytes, target.IPEndPoint);
+ packet.HaveSendCount = 3 - sendCount;
signPacket(target);
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
thread.IsBackground = true;
- thread.Start(Packet);
+ thread.Start(packet);
if (isWait)
{
@@ -827,41 +1110,52 @@
{
try
{
- var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 100000).ToString() } };
+ var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", Utlis.GetTimestamp ()} };
var bodyString = JsonConvert.SerializeObject(sendJob);
var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString);
//缁勬挱鍙戦��
- Packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
- Packet.HaveSendCount = 4;//ps锛氭病鏈夐噸鍙戯紝鍚庢湡鏈夋椂闂村彲浠ュ鍔犻噸鍙戝垽鏂�
+ packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
+ packet.HaveSendCount = 4;
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
thread.IsBackground = true;
- thread.Start(Packet);
+ thread.Start(packet);
//wait();涓嶉渶瑕佺瓑寰�
+
+
+
+
+ //hjSocket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+ //hjSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
+ //EndPoint ipep = new IPEndPoint(IPAddress.Parse(CsConst.myLocalIP), HDLUDP.UDPPort);
+ //hjSocket.Bind(ipep);
+
+
+
}
catch (Exception ex)
{
MainPage.Log($"Send bus data error {ex.Message}");
}
}
+
+
/// <summary>
/// 鍙戦�乽dp A鍗忚鏁版嵁
/// </summary>
- public void SendLocalHdlLinkData(byte[] sendBytes)
+ public void SendLocalHdlLinkData(byte[] sendBytes,string id, bool isWait=false)
{
- if (controlLostCount > 3)
- {
- UdpSocket._BusSocket.Stop();
- UdpSocket._BusSocket.Start(8585);
- controlLostCount = 0;
- }
- Packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse(Control.Ins.reportIp), 8585));
- Packet.HaveSendCount = 2;//ps锛氭病鏈夐噸鍙戯紝鍚庢湡鏈夋椂闂村彲浠ュ鍔犻噸鍙戝垽鏂�
-
+ packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse(Control.Ins.reportIp), 8585));
+ sendFlag = id;
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
thread.IsBackground = true;
- thread.Start(Packet);
- controlLostCount++;
+ thread.Start(packet);
+ if (isWait)
+ {
+ wait();
+ }
+ MainPage.Log($"鍙戦�丠dl-Link鏁版嵁锛孖P:{Control.Ins.reportIp}:8585");
}
}
+
}
--
Gitblit v1.8.0