From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101

---
 HDL_ON/DriverLayer/BusSocket.cs |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/DriverLayer/BusSocket.cs b/HDL_ON/DriverLayer/BusSocket.cs
index d6a5d4d..c41e235 100644
--- a/HDL_ON/DriverLayer/BusSocket.cs
+++ b/HDL_ON/DriverLayer/BusSocket.cs
@@ -115,7 +115,7 @@
 
 			try
 			{
-                asyncBeginReceive ();
+				asyncBeginReceive();
 				Packet packet = (Packet)iar.AsyncState;
 				int len = busSocket.EndReceiveFrom(iar, ref packet.RemoteEndPoint);
 
@@ -123,21 +123,23 @@
 				packet.Bytes = new byte[len];
 				Array.Copy(bytes, 0, packet.Bytes, 0, packet.Bytes.Length);
 
+				//mqtt杩炴帴鏁版嵁璇诲彇
 				if (packet.RemoteEndPoint.ToString() == "172.16.2.237:6688")
 				{
-					var reString = DAL.CommonPage.MyEncodingUTF8.GetString(bytes);
-					var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<Newtonsoft.Json.Linq.JObject>(reString);
-					var gateway_objects = jt.GetValue("objects").ToString();
-					var jt2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Newtonsoft.Json.Linq.JObject>(gateway_objects);
-					MqttCommon.mqttClientIP = jt2.GetValue("gateway_ip").ToString();
-					MqttCommon.mqttGatewayMAC = jt2.GetValue("board_id").ToString();
+					//var reString = DAL.CommonPage.MyEncodingUTF8.GetString(bytes);
+					//var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<Newtonsoft.Json.Linq.JObject>(reString);
+					//var gateway_objects = jt.GetValue("objects").ToString();
+					//var jt2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Newtonsoft.Json.Linq.JObject>(gateway_objects);
+					//MqttCommon.mqttClientIP = jt2.GetValue("gateway_ip").ToString();
+					//MqttCommon.mqttGatewayMAC = jt2.GetValue("board_id").ToString();
 				}
 
 				packet.Manager();
 			}
-			catch (Exception ex) {
-				MainPage.Log($"寮傛鎺ユ敹鏁版嵁缁撴潫 {ex.Message}");
-            }
+			catch (Exception ex)
+			{
+				MainPage.Log($"寮傛鎺ユ敹鏁版嵁缁撴潫 {ex.Message},{((Packet)iar.AsyncState).Bytes}");
+			}
 		}
 
 		/// <summary>

--
Gitblit v1.8.0