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/AddDevciePage.cs | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs index 0b70665..b49af1a 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs @@ -70,7 +70,14 @@ } finally { - Application.RunOnMainThread(() => { waitPage.Hide(); }); + Application.RunOnMainThread(() => + { + if (waitPage != null) + { + waitPage.RemoveFromParent(); + waitPage = null; + } + }); } }) { IsBackground = true }.Start(); @@ -162,6 +169,15 @@ this.RemoveFromParent(); }; break; + case SPK.SensorEnvironment2: + case SPK.SensorEnvironment3: + var form3 = new AddQingpingSensorEnvirTipPage(); + form3.AddForm(device); + form3.AddDeviceEvent = (functionObj) => { + refreshView.BeginHeaderRefreshing(); + this.RemoveFromParent(); + }; + break; } }; } -- Gitblit v1.8.0