Merge branch 'master' into NewFilePath

wxr

2020-12-17 014abc547ffd1a9f23c58fd7a471dffc5933fdd3

 HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs

@@ -4,7 +4,7 @@
using Newtonsoft.Json;
using HDL_ON.Entity;
using System.Collections.Generic;

using HDL_ON.DriverLayer;

namespace HDL_ON.UI
{
@@ -35,36 +35,36 @@
                deviceIpList.Clear();
                contentView.RemoveAll();
                //DriverLayer.Control.ins.ChangeCommunicationMode(DriverLayer.CommunicationMode.local_BusUdp);
//                UdpSocket._BusSocket.SearchNetDeviceAction = (jto) =>
//                {
//                    var device = JsonConvert.DeserializeObject<DeviceModule>(jto.ToString());
//                    if (device != null)
//                    {
//                        lock (deviceIpList)
//                        {
//                            if (!deviceIpList.Contains(device.ip_address))
//                            {
//                                deviceIpList.Add(device.ip_address);
//                                MainPage.Log($"搜索到网络设备：{device.ip_address}");
//                                Application.RunOnMainThread(() =>
//                                {
//#if DEBUG
//#else
//                                    if(device.gateway_type== 4)
//#endif
//                                    {
//                                        LoadRow(device);
//                                    }
//                                });
//                            }
//                            else
//                            {
//                                MainPage.Log($"已加载该IP设备:{device.ip_address}");
//                            }
//                        }
//                    }
//                };
                DriverLayer.Control.Ins.myUdp.SearchLocalGateway();
                //                UdpSocket._BusSocket.SearchNetDeviceAction = (jto) =>
                //                {
                //                    var device = JsonConvert.DeserializeObject<DeviceModule>(jto.ToString());
                //                    if (device != null)
                //                    {
                //                        lock (deviceIpList)
                //                        {
                //                            if (!deviceIpList.Contains(device.ip_address))
                //                            {
                //                                deviceIpList.Add(device.ip_address);
                //                                MainPage.Log($"搜索到网络设备：{device.ip_address}");
                //                                Application.RunOnMainThread(() =>
                //                                {
                //#if DEBUG
                //#else
                //                                    if(device.gateway_type== 4)
                //#endif
                //                                    {
                //                                        LoadRow(device);
                //                                    }
                //                                });
                //                            }
                //                            else
                //                            {
                //                                MainPage.Log($"已加载该IP设备:{device.ip_address}");
                //                            }
                //                        }
                //                    }
                //                };
                new Control_Udp().SearchLocalGateway();
                contentView.EndHeaderRefreshing();
            };