Revert "20201120"

wxr

2020-11-20 e2ffb5fce53119f5cb36e3b2466becbefa096842

 HDL_ON/DriverLayer/UdpSocket.cs

File was renamed from HDL_ON/DAL/DriverLayer/UdpSocket.cs
@@ -20,6 +20,21 @@
            }
        }

      /// <summary>
      /// 监听端口
      /// </summary>
      public int port
      {
            get
            {
            if (MainPage.LoginUser != null && Entity.DB_ResidenceData.residenceData != null)
            {
               return Entity.DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585;
            }
            return 6000;
            }
      }

      //本地Socket
      private Socket busSocket;

@@ -28,14 +43,15 @@
      /// </summary>
      public void Start ()
        {
            if (IsRunning) {
            if (IsRunning || port == 0) {
                return;
            }

            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")));
         }
         catch{
@@ -45,7 +61,7 @@

            asyncBeginReceive();

            MainPage.Log ($"udp port : 6000");
            MainPage.Log ($"udp port : {port}");
        }

      /// <summary>
@@ -126,7 +142,19 @@
            //mqtt连接数据读取  A协议网络设备信息读取回复 处理
            if (((IPEndPoint)packet.RemoteEndPoint).Port == 8585)
            {
               Common.A_Protocal_Common.apc.ConvertReceiveData(bytes);
               var reString = System.Text.Encoding.UTF8.GetString(bytes);
               var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(reString);
               JToken jtc = null;
               jt.TryGetValue("command", out jtc);
               if (jtc != null && jtc.ToString() == "search_response")
               {
                  JToken jto = null;
                  jt.TryGetValue("objects", out jto);
                  if (jto != null)
                  {
                     SearchNetDeviceAction?.Invoke(jto.ToString());
                  }
               }
            }
            else if(((IPEndPoint)packet.RemoteEndPoint).Port == 6000)//处理bus 6000端口的数据
            {