From c7f6a15a17344e55f0c2349392501100ba2a206e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 27 九月 2021 09:33:27 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 702 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 343 insertions(+), 359 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index a87374e..2179b3d 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -50,8 +50,17 @@
/// <summary>
/// 鍙戦�佹暟鎹紝涓嶉渶瑕佺瓑寰呭洖澶�
/// </summary>
- public void ControlBytesSend(Command command, byte subnetID, byte deviceID, byte[] gatewayBytes, int sendCount = 3)
+ public void ControlBytesSend(Command command, byte subnetID, byte deviceID, byte[] gatewayBytes, int sendCount = 3,bool reSend = false)
{
+#if DEBUG
+ string ddd = "";
+ foreach (var bb in gatewayBytes)
+ {
+ ddd += bb + ",";
+ }
+ MainPage.Log($"鍙戦�乥us鍛戒护:" + ((int)command).ToString("X").PadLeft(4,'0') + " : 鏁版嵁:" + ddd);
+#endif
+
var control = new Control_Udp();
control.Send(new Target()
{
@@ -60,7 +69,8 @@
SubnetID = subnetID,
DeviceID = deviceID,
AddData = gatewayBytes,
- }, sendCount, false);
+ //}, 3, true);
+ }, sendCount, reSend);
}
/// <summary>
@@ -182,7 +192,7 @@
break;
}
ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
- new byte[] { f.localFunction.bus.LoopId, curtainState });
+ new byte[] { f.localFunction.bus.LoopId, curtainState },0);
break;
}
}
@@ -287,7 +297,7 @@
break;
case SPK.LightRGB:
break;
- case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
{
foreach (var dic in f.status)
@@ -356,6 +366,7 @@
}
break;
case SPK.ElectricSocket:
+ case SPK.PanelSocket:
foreach (var attr in f.status)
{
if (attr.key == FunctionAttributeKey.OnOff)
@@ -414,7 +425,7 @@
/// </summary>
/// <param name="commandString"></param>
/// <returns></returns>
- public void WriteBusData(Function function, Dictionary<string, string> commandDictionary)
+ public void WriteBusData(Function function, Dictionary<string, string> commandDictionary, bool reSend = false)
{
try
{
@@ -422,158 +433,199 @@
var deviceId = function.bus.DeviceID;
var loopId = function.bus.LoopId;
- switch (function.Spk_Prefix)
+ switch (function.spk)
{
- case FunctionCategory.Light:
- switch (function.spk)
+ case SPK.LightCCT:
+ #region cct light
+ byte b0 = 100;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
{
- 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,
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ b0 = 0;
+ }
+ else
+ {
+ b0 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
+ }
+ }
+ else
+ {
+ b0 = 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 (function.trait_on_off.curValue.ToString() == "off")
- {
- b = 0;
- }
- else
- {
- 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,
+ ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes0, 1);
+ #endregion
+ break;
+ case SPK.LightRGB:
+ #region rgb light
+ byte b = 100;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
+ {
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ b = 0;
+ }
+ else
+ {
+ b = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
+ }
+ }
+ else
+ {
+ b = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+ }
+ var tempLight = new Light();
+ var bytes = new byte[] { function.bus.LoopId,
b,
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 SPK.LightDimming:
- byte b1 = 100;
- if (function.trait_on_off.curValue.ToString() == "off")
- {
- b1 = 0;
- }
- else
- {
- byte lightBri = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
- if (lightBri == 0)
- {
- b1 = 100;
- }
- else
- {
- b1 = lightBri;
- }
- }
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
+ ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
+ #endregion
+ break;
+ case SPK.LightDimming:
+ #region dimming light
+ byte b1 = 100;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
+ {
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ b1 = 0;
+ }
+ else
+ {
+ b1 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
+ }
+ }
+ else
+ {
+ b1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+ }
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
function.bus.LoopId,
b1,
0, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.FadeTime)) });
- break;
- 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;
- }
+ #endregion
break;
- case FunctionCategory.Curtain:
- switch (function.spk)
+ case SPK.LightSwitch:
+ #region LightSwitch
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
+ #endregion
+ break;
+ case SPK.CurtainSwitch:
+ #region switch curtain
+ byte switchCurtain = 0;
+ if (function.trait_on_off.curValue.ToString() == "stop")
{
- case SPK.CurtainSwitch:
- byte b1 = 0;
- if (function.trait_on_off.curValue.ToString() == "stop")
- {
- b1 = 0;
- }
- else if (function.trait_on_off.curValue.ToString() == "on")
- {
- b1 = 1;
- }
- else
- {
- b1 = 2;
- }
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, b1 });
- break;
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
- if (function.trait_on_off.curValue.ToString() == "stop")
- {
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, 0 });
- }
- else
- {
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
+ switchCurtain = 0;
+ }
+ else if (function.trait_on_off.curValue.ToString() == "on")
+ {
+ switchCurtain = 1;
+ }
+ else
+ {
+ switchCurtain = 2;
+ }
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, switchCurtain });
+ #endregion
+ break;
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
+ if (function.trait_on_off.curValue.ToString() == "stop")
+ {
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, 0 });
+ }
+ else
+ {
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
- }
- break;
}
break;
- case FunctionCategory.AC:
- switch (function.spk)
+ case SPK.AcStandard:
+ var ac = new AC();
+ foreach (var dic in commandDictionary)
{
- 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 });
+ switch (dic.Key)
+ {
+ 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, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 6, ac.GetModeIndex(function), function.bus.LoopId });
+ break;
+ case "fan":
+ ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 5, ac.GetFanIndex(function), function.bus.LoopId });
+ break;
+ case FunctionAttributeKey.SetTemp:
+ byte modeKey = 4;
+ switch (ac.GetModeIndex(function))
+ {
+ 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;
+ }
+ 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;
+ }
+ }
+ break;
+ case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+ var fhTemp = new FloorHeating();
+ if (function.Fh_Mode_Temp.Count == 4)
+ {
+ if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
+ {
foreach (var dic in commandDictionary)
{
switch (dic.Key)
{
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 });
+ 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[] { 6, ac.GetModeIndex(function), function.bus.LoopId });
- break;
- case "fan":
- ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 5, ac.GetFanIndex(function), function.bus.LoopId });
+ ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 21, fhTemp.GetModeIndex(function), function.bus.LoopId });
break;
case FunctionAttributeKey.SetTemp:
- byte modeKey = 4;
- switch (ac.GetModeIndex(function))
+ byte modeKey = 25;
+ switch (fhTemp.GetModeIndex(function))
{
- case 3:
- modeKey = 8;
- break;
- case 0:
- modeKey = 4;
- break;
case 1:
- modeKey = 7;
- break;
- case 4:
- modeKey = 19;
+ modeKey = 25;
break;
case 2:
- modeKey = 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[] {
@@ -584,183 +636,138 @@
break;
}
}
-
- break;
- }
- break;
- case FunctionCategory.FloorHeat:
- var fhTemp = new FloorHeating();
- switch (function.spk)
- {
- case SPK.FloorHeatStandard:
- if (function.Fh_Mode_Temp.Count == 4)
+ }
+ else
+ {
+ var onoffString = function.trait_on_off.curValue.ToString();
+ byte b12 = 1;
+ if (onoffString == "off")
{
- if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
+ b12 = 0;
+ }
+ var wm = fhTemp.GetWorkModeIndex(function);
+ if (wm > 0)
+ {
+ b12 += (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)
{
- foreach (var dic in commandDictionary)
- {
- 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;
- }
- }
+ 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;
}
- 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("temp"))
- {
- var dicTempString = "";
- commandDictionary.TryGetValue("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,
+ }
+ var tt = fhTemp.GetTempUintIndex(function);
+ ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId, b12,
(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.Electric:
- switch (function.spk)
+ case SPK.HvacFan:
+ case SPK.ElectricFan:
+ #region ElectricFan
+ if (function.trait_on_off.curValue.ToString() == "on")
{
- case SPK.ElectricFan:
- if (function.trait_on_off.curValue.ToString() == "on")
- {
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.OpenLevel)) });
- }
- {
- 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;
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.OpenLevel)) });
}
- break;
- case FunctionCategory.AirFresh:
- switch(function.spk)
{
- case SPK.AirFreshJinmao:
- //1 鏂伴缂栧彿 1~200
- //2 绫诲瀷 绗笁鏂圭被鍨� 0锛氶噾鑼傛柊椋�
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, 0 });
+ }
+ #endregion
+ break;
+ case SPK.ElectricSocket:
+ case SPK.PanelSocket:
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
+ break;
+ case SPK.AirFreshJinmao:case SPK.HvacAirFreshJinmao:
+ #region AirFresh
+ //1 鏂伴缂栧彿 1~200
+ //2 绫诲瀷 绗笁鏂圭被鍨� 0锛氶噾鑼傛柊椋�
- //3 寮�鍏� 0 - 鍏虫満锛�1 - 寮�鏈�
- byte switchValue = 0;
- if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) == true
- && commandDictionary[FunctionAttributeKey.OnOff] == "on")
- {
- switchValue = 1;
- }
+ //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] == "fan")
- {
- 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 瀹ゅ唴娓╁害鍊� 鈩�
- //9 瀹ゅ唴婀垮害鍊� 鈩�
- //10 杩囨护缃戝墿浣� %
- //11 杩囨护缃戜娇鐢ㄨ秴鏃� 1 瓒呮椂 0 鏃�
- ControlBytesSend(Command.FreshAirControl_JinMao, subnetId, deviceId, new byte[] {
+ //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)),
- 0,0,0,0
- //Convert.ToByte( function.GetAttrState(FunctionAttributeKey.IndoorTemp)),
- //Convert.ToByte( function.GetAttrState(FunctionAttributeKey.IndoorHumidity)),
+ indoorTemp_airFrsh,
+ indoorHumidity_airFrsh,
//Convert.ToByte( function.GetAttrState(FunctionAttributeKey.FilterRemain)),
//function.GetAttrState(FunctionAttributeKey.FilterTimeout) =="true"?1:0,
+ 0,0
});
- break;
- }
+ #endregion
break;
}
#region 鍙戦�佸懡浠ょ珛鍗虫洿鏂癠I
@@ -787,89 +794,55 @@
var deviceId = function.bus.DeviceID;
var loopId = function.bus.LoopId;
- switch (function.Spk_Prefix)
+ switch (function.spk)
{
- case FunctionCategory.Light:
- switch (function.spk)
- {
- case SPK.LightSwitch:
- case SPK.LightDimming:
- ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
- break;
- 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;
- }
+ case SPK.LightSwitch:
+ case SPK.LightDimming:
+ ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
break;
- case FunctionCategory.Curtain:
- switch (function.spk)
- {
- case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
- ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus.LoopId });
- break;
- }
+ case SPK.LightRGB:
+ ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
- case FunctionCategory.AC:
- switch (function.spk)
- {
- case SPK.AcStandard:
- ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
- break;
- }
+ case SPK.LightCCT:
+ ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
- case FunctionCategory.FloorHeat:
- switch (function.spk)
- {
- case SPK.FloorHeatStandard:
- ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
- break;
- }
+ case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
+ ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
- case FunctionCategory.Electric:
- switch (function.spk)
- {
- case SPK.ElectricFan:
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
- break;
- case SPK.ElectricSocket:
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
- break;
- }
+ case SPK.AcStandard:
+ ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
- case FunctionCategory.Sensor:
- 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 });
+ case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+ ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { 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;
- }
+ case SPK.HvacFan:
+ case SPK.ElectricFan:
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
+ break;
+ case SPK.ElectricSocket:
+ case SPK.PanelSocket:
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
+ break;
+ case SPK.SensorTemperature:
+ ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 2, function.bus.LoopId });
+ break;
+ case SPK.SensorHumidity:
+ ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 3, function.bus.LoopId });
+ break;
+ case SPK.SensorTVOC:
+ ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 5, function.bus.LoopId });
+ break;
+ case SPK.SensorPm25:
+ ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 6, function.bus.LoopId });
+ break;
+ case SPK.SensorCO2:
+ ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 7, function.bus.LoopId });
+ break;
+ case SPK.AirFreshJinmao:
+ case SPK.HvacAirFreshJinmao:
+ ControlBytesSend(Command.FreshAirRead_JinMao, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
}
}
@@ -984,7 +957,7 @@
try
{
- //MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
+ MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
UdpSocket._BusSocket.AsyncBeginSend(packet);
packet.HaveSendCount--;
@@ -1104,14 +1077,25 @@
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);
+ var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString, false);
//缁勬挱鍙戦��
packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
- packet.HaveSendCount = 4;//ps锛氭病鏈夐噸鍙戯紝鍚庢湡鏈夋椂闂村彲浠ュ鍔犻噸鍙戝垽鏂�
+ packet.HaveSendCount = 4;
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
thread.IsBackground = true;
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)
{
--
Gitblit v1.8.0