From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/DAL/DriverLayer/UdpSocket.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/UdpSocket.cs b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
index 4258c9b..376e6bb 100644
--- a/HDL_ON/DAL/DriverLayer/UdpSocket.cs
+++ b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
@@ -21,20 +21,29 @@
//鏈湴Socket
private Socket busSocket;
-
+ int _port = 0;
/// <summary>
/// 鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�
/// </summary>
- public void Start ()
+ public void Start (int port)
{
- if (IsRunning ) {
- return;
- }
+ if (IsRunning)
+ {
+ if (port == _port)
+ {
+ return;
+ }
+ else
+ {
+ busSocket.Close();
+ }
+ }
+ _port = port;
busSocket = new Socket (AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
busSocket.EnableBroadcast = true;
try {
- busSocket.Bind (new IPEndPoint (IPAddress.Any, 6000));
+ busSocket.Bind (new IPEndPoint (IPAddress.Any, port));
busSocket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse("239.0.168.188")));
}
@@ -45,7 +54,7 @@
asyncBeginReceive();
- MainPage.Log ($"udp port : 6000");
+ MainPage.Log ($"udp port : {port}");
}
/// <summary>
@@ -119,10 +128,11 @@
packet.Bytes = new byte[len];
Array.Copy(bytes, 0, packet.Bytes, 0, packet.Bytes.Length);
+ //MainPage.Log($"鎺ユ敹{packet.RemoteEndPoint}鏁版嵁");
//mqtt杩炴帴鏁版嵁璇诲彇 A鍗忚缃戠粶璁惧淇℃伅璇诲彇鍥炲 澶勭悊
if (((IPEndPoint)packet.RemoteEndPoint).Port == 8585)
{
- DriverLayer.A_Protocal_Common.apc.ConvertReceiveData(bytes);
+ Control.Ins.ConvertReceiveData(bytes);
}
else if(((IPEndPoint)packet.RemoteEndPoint).Port == 6000)//澶勭悊bus 6000绔彛鐨勬暟鎹�
{
--
Gitblit v1.8.0