From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs
index 2077630..614d47d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs
+++ b/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
{
@@ -30,41 +30,43 @@
};
bodyView.AddChidren(contentView);
+
+
contentView.BeginHeaderRefreshingAction += () =>
{
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();
};
@@ -100,7 +102,7 @@
switch (device.gateway_type)
{
- case 4:
+ case "4":
btnIcon.UnSelectedImagePath = "FunctionIcon/DeviceIcon/VoicePanelIcon.png";
break;
default:
--
Gitblit v1.8.0