From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android,没调用拒接接口问题。

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index b73791d..f6824e8 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();
@@ -132,7 +138,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()
@@ -166,6 +172,7 @@
                             });
                             break;
                         case SPK.SenesorMegahealth:
+                        case SPK.SenesorMegahealth2:
                             var smPage = new SenesorMegahealthManagerPage();
                             smPage.AddForm(device);
                             smPage.DelDeviceEvent = () =>

--
Gitblit v1.8.0