From 4f2dbd1f6a1ec2d9c3c39b4a37b0b7c9ddece4aa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 23 九月 2021 15:24:01 +0800
Subject: [PATCH] 主页刷新优化
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 383 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 281 insertions(+), 102 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 35e8539..37ee1e3 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>
@@ -288,50 +298,72 @@
case SPK.LightRGB:
break;
case SPK.FloorHeatStandard:
- byte onoff_1 = 0;
- byte setTemp_1 = 0;
- byte mode_1 = 0;
- foreach (var attr in f.status)
+ if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
{
- switch (attr.key)
+ foreach (var dic in f.status)
{
- 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;
+ 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;
+ }
}
}
- ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
+ 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)
@@ -392,7 +424,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
{
@@ -406,14 +438,21 @@
switch (function.spk)
{
case SPK.LightCCT:
- byte b0 = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
- if (function.trait_on_off.curValue.ToString() == "off")
+ byte b0 = 100;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
{
- b0 = 0;
+ 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)) == 0 ? (byte)100 : Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+ b0 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
}
var bytes0 = new byte[] { function.bus.LoopId,
b0,
@@ -425,22 +464,21 @@
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")
+ byte b = 100;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
{
- b = 0;
- }
- else
- {
- byte lightBri1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
- if (lightBri1 == 0)
+ if (function.trait_on_off.curValue.ToString() == "off")
{
- b = 100;
+ b = 0;
}
else
{
- b = lightBri1;
+ 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,
@@ -454,21 +492,20 @@
break;
case SPK.LightDimming:
byte b1 = 100;
- if (function.trait_on_off.curValue.ToString() == "off")
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
{
- b1 = 0;
- }
- else
- {
- byte lightBri = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
- if (lightBri == 0)
+ if (function.trait_on_off.curValue.ToString() == "off")
{
- b = 100;
+ b1 = 0;
}
else
{
- b = lightBri;
+ 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,
@@ -518,9 +555,9 @@
{
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 });
+ //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)
@@ -534,7 +571,7 @@
case "fan":
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.GetModeIndex(function))
{
@@ -573,42 +610,83 @@
case SPK.FloorHeatStandard:
if (function.Fh_Mode_Temp.Count == 4)
{
- var onoffString = function.trait_on_off.curValue.ToString();
- byte b1 = 1;
- if(onoffString == "off")
+ if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
{
- 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)
+ foreach (var dic in commandDictionary)
{
- 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;
+ 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;
+ }
}
}
- var tt = fhTemp.GetTempUintIndex(function);
- ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId, b1,
+ 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;
}
@@ -627,6 +705,84 @@
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.AirFresh:
+ switch(function.spk)
+ {
+ 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;
@@ -730,6 +886,14 @@
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;
}
}
@@ -844,7 +1008,7 @@
try
{
- //MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
+ MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
UdpSocket._BusSocket.AsyncBeginSend(packet);
packet.HaveSendCount--;
@@ -890,6 +1054,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:
@@ -963,11 +1131,22 @@
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.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