Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

wxr

2023-07-17 59d9f0ad6dc40b079fa1f8f514698429ead04a75

 HDL_ON/DAL/DriverLayer/UdpSocket.cs

@@ -77,7 +77,7 @@
         }
         catch { }
         busSocket = null;
            MainPage.Log("Socket关闭");
         MainPage.Log("Socket关闭");
      }

      /// <summary>
@@ -140,7 +140,6 @@
            //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端口的数据