From d7e25d6a5960b3495cd4d8a67545410e03ca7962 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 06 六月 2021 16:42:08 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 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 db0e205..9c98518 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -62,9 +62,22 @@
if (pack.Code == DAL.Server.StateCode.SUCCESS)
{
var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Function3tyBrandObj>(pack.Data.ToString());
+
Application.RunOnMainThread(() =>
{
- LoadRow(revData.list);
+ contentView.RemoveAll();
+ if (revData.list.Count > 0)
+ {
+ LoadRow(revData.list);
+ }
+ else
+ {
+ var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices),160)
+ {
+ Gravity = Gravity.CenterHorizontal,
+ };
+ contentView.AddChidren(tipView);
+ }
});
}
else
@@ -86,7 +99,6 @@
void LoadRow(List<Function> deviceList)
{
- contentView.RemoveAll();
bool isFrist = true;
foreach (var device in deviceList)
{
@@ -154,6 +166,14 @@
case SPK.IrModule:
new UI2.PersonalCenter.PirDevice.PirMethod().MainView(this, device,()=> {});
break;
+ case SPK.SenesorMegahealth:
+ var smPage = new SenesorMegahealthManagerPage();
+ smPage.AddForm(device);
+ smPage.DelDeviceEvent = () =>
+ {
+ contentView.BeginHeaderRefreshing();
+ };
+ break;
}
};
}
--
Gitblit v1.8.0