From fd1f19e8479c764fa28b0da3a2f9b34a3debe772 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 03 八月 2023 21:47:04 +0800
Subject: [PATCH] 2023年08月03日21:47:02
---
HDL_ON/DAL/DriverLayer/Packet.cs | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Packet.cs b/HDL_ON/DAL/DriverLayer/Packet.cs
index 3e07ff2..0e8f8dc 100644
--- a/HDL_ON/DAL/DriverLayer/Packet.cs
+++ b/HDL_ON/DAL/DriverLayer/Packet.cs
@@ -14,8 +14,9 @@
{
/// <summary>
/// 缂撳啿鍖哄ぇ灏�
+ /// Link鍗忚鐜板湪涓�涓寘鐨勬暟鎹瘮杈冨ぇ锛岀紦鍐插尯澶皬瀛樹笉瀹屽叏閮ㄦ暟鎹� 2023-07-14 16:03:56 wxr
/// </summary>
- public const int Size = 1024 + 200;
+ public const int Size = 1024 * 10;
/// <summary>
/// 鎺ユ敹鍒扮殑鏁版嵁
@@ -53,8 +54,11 @@
/// </summary>
public virtual void Manager()
{
+#if DEBUG
+#else
try
- {
+ {
+#endif
//瀵逛簬鎿嶄綔鏁版嵁搴撶殑鏃堕棿姣旇緝闀跨殑锛屽彲浠ュ垱寤哄彟涓�涓嚎绋嬪鐞�
if (!"HDLMIRACLE".Equals(Encoding.ASCII.GetString(Bytes, 4, 10)))
{
@@ -102,16 +106,19 @@
#endif
//澶勭悊鏄惁瑕侀噸鍙戞暟鎹�
ManagerReceive(subnetID, deviceID, command, usefulBytes);
- }
+
+#if DEBUG
+#else
+ }
catch (Exception ex)
{
MainPage.Log($"packet {ex.Message} ");
}
+#endif
}
/// <summary>
/// 鏁版嵁鍖呭鐞�
- /// ps:鐢眂ommonpage杞Щ杩囨潵锛岃繕闇�瑕佽浆绉诲悎閫傜殑浣嶇疆绠＄悊
/// </summary>
/// <param name="subnetID"></param>
/// <param name="deviceID"></param>
@@ -119,8 +126,11 @@
/// <param name="receiveBytes"></param>
void UdpPacket_DataProcessing(byte subnetID, byte deviceID, Command command, byte[] receiveBytes)
{
+#if DEBUG
+#else
try
{
+#endif
switch (command)
{
case Command.SetSingleLightACK:
@@ -324,17 +334,27 @@
case SPK.CurtainRoller:
RollingShutterPage.UpdataState(curtain);
break;
+ case SPK.CurtainShades:
+ VenetianBlindsPage.UpdataState(curtain);
+ break;
}
}
}
break;
case Command.SetACModeACK:
case Command.ReadACModeACK:
- foreach (var function in FunctionList.List.GetAcList())
+ foreach (var function in FunctionList.List.Functions)
{
+ if (function.bus == null || function.spk != SPK.AcStandard)
+ {
+ continue;
+ }
var acFunction = new AC();
- if (function.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ if (function.bus.SubnetID == subnetID &&
+ function.bus.DeviceID == deviceID &&
+ function.bus.LoopId == receiveBytes[0])
{
+ Console.WriteLine(function.GetBusId());
function.SetAttrState(FunctionAttributeKey.TempType, receiveBytes[1].ToString());
function.SetAttrState(FunctionAttributeKey.RoomTemp, receiveBytes[2].ToString());
function.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[8] == 1 ? "on" : "off");
@@ -380,7 +400,7 @@
FunctionPage.UpdataStates(function);
HomePage.UpdataFunctionStates(function);
ClassificationPage.UpdataInfo(function);
- Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(function.sid, function.status);
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(function);
}
}
@@ -653,7 +673,9 @@
}
function.lastState = "";
- function.lastState += " " + function.GetAttrState(FunctionAttributeKey.SetTemp) + acFunction.GetTempUnitString(function);
+ function.lastState += acFunction.GetModeAttrText(function.GetAttrState(FunctionAttributeKey.Mode)) +
+ acFunction.GetModeAttrText(function.GetAttrState(FunctionAttributeKey.FanSpeed)) +
+ " " + function.GetAttrState(FunctionAttributeKey.SetTemp) + acFunction.GetTempUnitString(function);
RoomPage.UpdataStates(function);
FunctionPage.UpdataStates(function);
HomePage.UpdataFunctionStates(function);
@@ -727,11 +749,16 @@
}
break;
}
- }
+
+#if DEBUG
+#else
+ }
catch (Exception ex)
{
MainPage.Log($"Bus Rev Erorr : {ex.Message}");
}
+#endif
+
}
/// <summary>
/// byte杞�16杩涘埗瀛楃涓�
--
Gitblit v1.8.0