From 8edf8fd9f5f7c29cc6302a8d46de06d391ed3657 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 16 一月 2020 13:03:57 +0800
Subject: [PATCH] 2020-01-16 Version 2.50115-B3 1.优化MQTT连接。 2.增加本地通信加密。 3.增加配置网关提示语。 4.编辑定时器增加重复名字提示 5.更新规范翻译。
---
Crabtree/SmartHome/HDL/Operation/BusSocket.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
old mode 100755
new mode 100644
index 3a9410b..9d1a284
--- a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
+++ b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
@@ -21,6 +21,7 @@
//鏈湴Socket
private static Socket busSocket;
+
/// <summary>
/// 鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�
/// </summary>
@@ -98,6 +99,7 @@
busSocket.BeginReceiveFrom (packet.Bytes, 0, packet.Bytes.Length, SocketFlags.None, ref packet.RemoteEndPoint, new AsyncCallback (asyncEndReceive), packet);
+
}
catch (Exception e) {
System.Threading.Thread.Sleep (1);
@@ -137,6 +139,7 @@
byte[] bytes = packet.Bytes;
packet.Bytes = new byte[len];
System.Array.Copy(bytes, 0, packet.Bytes, 0, packet.Bytes.Length);
+
packet.Manager();
}
catch { }
@@ -155,7 +158,14 @@
}
tempPacket.FlagDateTime = System.DateTime.Now;
tempPacket.HaveSendCount++;
- busSocket.BeginSendTo(tempPacket.Bytes, 0, tempPacket.Bytes.Length, SocketFlags.None, tempPacket.RemoteEndPoint, new AsyncCallback(asyncEndSend), tempPacket);
+
+ //2020-01-14 澧炲姞鏈湴閫氳鍔犲瘑
+ if (UserConfig.Instance.IsLocalEncrypt) {
+ var messageSend = Shared.Securitys.EncryptionService.AesEncryptPayload (tempPacket.Bytes, UserConfig.Instance.LocalEncryptKey);
+ tempPacket.Bytes = messageSend;
+ }
+
+ busSocket.BeginSendTo(tempPacket.Bytes, 0, tempPacket.Bytes.Length, SocketFlags.None, tempPacket.RemoteEndPoint, new AsyncCallback(asyncEndSend), tempPacket);
}
catch {
--
Gitblit v1.8.0