From 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:48:35 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index c0f02a1..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();
@@ -174,6 +180,8 @@
};
break;
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
var smPage1 = new SensorEnvironmentManagerPage();
smPage1.AddForm(device);
smPage1.DelDeviceEvent = () =>
--
Gitblit v1.8.0