From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/HDL/Operation/BusSocket.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
index b299965..5508ac5 100644
--- a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
+++ b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
@@ -50,7 +50,7 @@
asyncBeginReceive ();
- Console.WriteLine ("BusSocket鍚姩鎴愬姛锛�");
+ Utlis.WriteLine ("BusSocket鍚姩鎴愬姛锛�");
Control.IsEnterBackground = false;
}
@@ -70,7 +70,7 @@
catch { }
busSocket = null;
- Console.WriteLine("BusSocket鍏抽棴鎴愬姛!");
+ Utlis.WriteLine("BusSocket鍏抽棴鎴愬姛!");
Control.IsEnterBackground = true;
}
@@ -160,14 +160,15 @@
}
tempPacket.FlagDateTime = System.DateTime.Now;
tempPacket.HaveSendCount++;
-
+ byte [] messageSend;
//2020-01-14 澧炲姞鏈湴閫氳鍔犲瘑
if (UserConfig.Instance.IsLocalEncrypt) {
- var messageSend = Shared.Securitys.EncryptionService.AesEncryptPayload (tempPacket.Bytes, UserConfig.Instance.LocalEncryptKey);
- tempPacket.Bytes = messageSend;
+ messageSend = Shared.Securitys.EncryptionService.AesEncryptPayload (tempPacket.Bytes, UserConfig.Instance.LocalEncryptKey);
+ } else {
+ messageSend = tempPacket.Bytes;
}
- busSocket.BeginSendTo(tempPacket.Bytes, 0, tempPacket.Bytes.Length, SocketFlags.None, tempPacket.RemoteEndPoint, new AsyncCallback(asyncEndSend), tempPacket);
+ busSocket.BeginSendTo(messageSend, 0, messageSend.Length, SocketFlags.None, tempPacket.RemoteEndPoint, new AsyncCallback(asyncEndSend), tempPacket);
}
catch {
--
Gitblit v1.8.0