From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"
---
HDL_ON/DAL/DriverLayer/UdpSocket.cs | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/UdpSocket.cs b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
index 2af43f3..39b3dfd 100644
--- a/HDL_ON/DAL/DriverLayer/UdpSocket.cs
+++ b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
@@ -1,9 +1,8 @@
锘縰sing System;
using System.Net.Sockets;
using System.Net;
-using Newtonsoft.Json.Linq;
-namespace HDL_ON
+namespace HDL_ON.DriverLayer
{
public class UdpSocket
{
@@ -26,7 +25,7 @@
/// <summary>
/// 鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�
/// </summary>
- public void Start ()
+ public void Start (int port)
{
if (IsRunning ) {
return;
@@ -46,7 +45,7 @@
asyncBeginReceive();
- MainPage.Log ($"udp port : 6000");
+ MainPage.Log ($"udp port : {port}");
}
/// <summary>
@@ -98,10 +97,6 @@
Console.WriteLine($"asyncBeginReceive {e.Message}");
}
}
- /// <summary>
- /// 鎼滅储缃戠粶璁惧瑙﹀彂鐨勫洖璋冧簨浠�
- /// </summary>
- public Action<string> SearchNetDeviceAction;
/// <summary>
/// 寮傛鎺ユ敹鏁版嵁缁撴潫
@@ -124,10 +119,11 @@
packet.Bytes = new byte[len];
Array.Copy(bytes, 0, packet.Bytes, 0, packet.Bytes.Length);
+ MainPage.Log($"鎺ユ敹IP{packet.RemoteEndPoint}鏁版嵁");
//mqtt杩炴帴鏁版嵁璇诲彇 A鍗忚缃戠粶璁惧淇℃伅璇诲彇鍥炲 澶勭悊
if (((IPEndPoint)packet.RemoteEndPoint).Port == 8585)
{
- Common.A_Protocal_Common.apc.ConvertReceiveData(bytes);
+ Control.Ins.ConvertReceiveData(bytes);
}
else if(((IPEndPoint)packet.RemoteEndPoint).Port == 6000)//澶勭悊bus 6000绔彛鐨勬暟鎹�
{
--
Gitblit v1.8.0