From 4f2dbd1f6a1ec2d9c3c39b4a37b0b7c9ddece4aa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 23 九月 2021 15:24:01 +0800
Subject: [PATCH] 主页刷新优化
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 8bb2fcd..470121b 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
@@ -78,7 +91,13 @@
}
finally
{
- Application.RunOnMainThread(() => { waitPage.Hide(); });
+ Application.RunOnMainThread(() => {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
}
})
{ IsBackground = true }.Start();
@@ -86,14 +105,9 @@
void LoadRow(List<Function> deviceList)
{
- contentView.RemoveAll();
bool isFrist = true;
foreach (var device in deviceList)
{
- //if (!FunctionList.List.DeviceSpk.Contains(device.spk))
- //{
- // continue;
- //}
FrameLayout row = new FrameLayout()
{
Height = Application.GetRealHeight(50),
@@ -152,7 +166,28 @@
switch (device.spk)
{
case SPK.IrModule:
- new UI2.PersonalCenter.PirDevice.Method().MainView(this, device,()=> {});
+ new UI2.PersonalCenter.PirDevice.PirMethod().MainView(this, device, () =>
+ {
+ contentView.BeginHeaderRefreshing();
+ });
+ break;
+ case SPK.SenesorMegahealth:
+ var smPage = new SenesorMegahealthManagerPage();
+ smPage.AddForm(device);
+ smPage.DelDeviceEvent = () =>
+ {
+ contentView.BeginHeaderRefreshing();
+ };
+ break;
+ case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
+ var smPage1 = new SensorEnvironmentManagerPage();
+ smPage1.AddForm(device);
+ smPage1.DelDeviceEvent = () =>
+ {
+ contentView.BeginHeaderRefreshing();
+ };
break;
}
};
--
Gitblit v1.8.0