From f1532873e3029b2fb17cb84c1b9da1e2f66247c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 02 九月 2021 10:43:38 +0800
Subject: [PATCH] 代码合并
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 9c98518..470121b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -91,7 +91,13 @@
}
finally
{
- Application.RunOnMainThread(() => { waitPage.Hide(); });
+ Application.RunOnMainThread(() => {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
}
})
{ IsBackground = true }.Start();
@@ -102,10 +108,6 @@
bool isFrist = true;
foreach (var device in deviceList)
{
- //if (!FunctionList.List.DeviceSpk.Contains(device.spk))
- //{
- // continue;
- //}
FrameLayout row = new FrameLayout()
{
Height = Application.GetRealHeight(50),
@@ -164,7 +166,10 @@
switch (device.spk)
{
case SPK.IrModule:
- new UI2.PersonalCenter.PirDevice.PirMethod().MainView(this, device,()=> {});
+ new UI2.PersonalCenter.PirDevice.PirMethod().MainView(this, device, () =>
+ {
+ contentView.BeginHeaderRefreshing();
+ });
break;
case SPK.SenesorMegahealth:
var smPage = new SenesorMegahealthManagerPage();
@@ -174,6 +179,16 @@
contentView.BeginHeaderRefreshing();
};
break;
+ case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
+ var smPage1 = new SensorEnvironmentManagerPage();
+ smPage1.AddForm(device);
+ smPage1.DelDeviceEvent = () =>
+ {
+ contentView.BeginHeaderRefreshing();
+ };
+ break;
}
};
}
--
Gitblit v1.8.0