From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 9c98518..8bb2fcd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -62,22 +62,9 @@
if (pack.Code == DAL.Server.StateCode.SUCCESS)
{
var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Function3tyBrandObj>(pack.Data.ToString());
-
Application.RunOnMainThread(() =>
{
- 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);
- }
+ LoadRow(revData.list);
});
}
else
@@ -99,6 +86,7 @@
void LoadRow(List<Function> deviceList)
{
+ contentView.RemoveAll();
bool isFrist = true;
foreach (var device in deviceList)
{
@@ -164,15 +152,7 @@
switch (device.spk)
{
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();
- };
+ new UI2.PersonalCenter.PirDevice.Method().MainView(this, device,()=> {});
break;
}
};
--
Gitblit v1.8.0