From 47afa19e3761143d2c96131d7dcc38e8f67bb299 Mon Sep 17 00:00:00 2001
From: 温居城 <wenjucheng@wenjuchengdeMacBook-Pro.local>
Date: 星期四, 18 十一月 2021 22:45:52 +0800
Subject: [PATCH] 2021-11-18-01
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 8f56b86..68ac66b 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();
@@ -112,7 +119,7 @@
Width = Application.GetRealWidth(32),
Height = Application.GetRealWidth(32),
Radius = (uint)Application.GetRealWidth(4),
- UnSelectedImagePath = $"FunctionIcon/Icon/{device.spk.Replace(".","")}.png",
+ UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png",
};
row.AddChidren(btnIcon);
Button btnRight = new Button()
@@ -147,6 +154,7 @@
};
break;
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
var form1 = new AddSenesorMegahealthDirection1Page();
form1.AddForm(device);
form1.AddDeviceEvent = (functionObj) => {
--
Gitblit v1.8.0