Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/DAL/DriverLayer/UdpSocket.cs

@@ -50,8 +50,10 @@

            busSocket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse("239.0.168.188")));
         }
         catch{
                busSocket = null;
         catch (Exception ex){
            MainPage.Log ($"udp port bind error : {ex.Message}");

            busSocket = null;
                return;
            }

@@ -120,9 +122,12 @@
         {
            return;
         }

         try
         {
            if (busSocket == null)
            {
               return;
            }
            asyncBeginReceive();
            Packet packet = (Packet)iar.AsyncState;
            int len = busSocket.EndReceiveFrom(iar, ref packet.RemoteEndPoint);
@@ -135,12 +140,14 @@
            //mqtt连接数据读取  A协议网络设备信息读取回复 处理
            if (((IPEndPoint)packet.RemoteEndPoint).Port == 8585)
            {
               MainPage.Log($"局域网udp信息");
               Control.Ins.ConvertReceiveData(bytes, ((IPEndPoint)packet.RemoteEndPoint).Address.ToString());
            }
            else if(((IPEndPoint)packet.RemoteEndPoint).Port == 6000)//处理bus 6000端口的数据
            else if (((IPEndPoint)packet.RemoteEndPoint).Port == 6000)//处理bus 6000端口的数据
            {
               packet.Manager();
            }

         }
         catch (Exception ex)
         {