From 33470790ac0069c7734fb1a5b8b07350950c6dfe Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 24 十一月 2020 15:51:31 +0800
Subject: [PATCH] 20201124，整理mqtt订阅
---
HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs | 64 +++++++++++++++----------------
1 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs
index d4dab74..2077630 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs
@@ -34,39 +34,37 @@
{
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();
+ //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();
contentView.EndHeaderRefreshing();
};
--
Gitblit v1.8.0