From 9137222ece9b978eb97b5598f2eee6e070bcf9d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 二月 2020 15:22:16 +0800
Subject: [PATCH] 2020-02-28 更新

---
 Crabtree/SmartHome/HDL/Operation/BusSocket.cs |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
index 9d1a284..a7a95f4 100644
--- a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
+++ b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
@@ -51,6 +51,7 @@
             asyncBeginReceive ();
 
             Console.WriteLine ("BusSocket鍚姩鎴愬姛锛�");
+            Control.IsEnterBackground = false;
         }
 
 		/// <summary>
@@ -70,7 +71,8 @@
 			busSocket = null;
 
 			Console.WriteLine("BusSocket鍏抽棴鎴愬姛!");
-		}
+            Control.IsEnterBackground = true;
+        }
 
 		/// <summary>
 		/// 褰撳墠鐨凷ocket鏄惁杩愯
@@ -158,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