From 19d0e070e128daf855beaf72e00f55334be9f87b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 28 八月 2021 13:47:25 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 93342c8..470121b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -25,7 +25,7 @@
{
var page = new AddDevciePage(brand);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
+ page.LoadPage(contentView);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
@@ -46,6 +46,8 @@
contentView.EndHeaderRefreshing();
Load3tyBrandDeviceList();
};
+
+ //contentView.BeginHeaderRefreshing();
}
void Load3tyBrandDeviceList()
@@ -55,14 +57,27 @@
new System.Threading.Thread(() => {
try
{
- var pm = new DAL.Server.HttpServerRequest();
+ var pm = new HttpServerRequest();
var pack = pm.Get3TyBrandBindDeviceList(brand.productPlatform, brand.productBrand);
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
@@ -76,7 +91,13 @@
}
finally
{
- Application.RunOnMainThread(() => { waitPage.Hide(); });
+ Application.RunOnMainThread(() => {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
}
})
{ IsBackground = true }.Start();
@@ -84,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),
@@ -150,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