From 003abaf86b766eb40ef62300ab0c707774c36ba9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 30 三月 2021 20:10:16 +0800
Subject: [PATCH] 2021-3-30-2
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index e845f57..00f6588 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -24,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);
@@ -45,6 +46,8 @@
contentView.EndHeaderRefreshing();
Load3tyBrandDeviceList();
};
+
+ //contentView.BeginHeaderRefreshing();
}
void Load3tyBrandDeviceList()
@@ -63,6 +66,10 @@
{
LoadRow(revData.list);
});
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
}
catch (Exception ex)
@@ -145,16 +152,7 @@
switch (device.spk)
{
case SPK.IrModule:
- UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () =>
- {
- Application.RunOnMainThread(() =>
- {
- var page = new UI2.PersonalCenter.PirDevice.PirMain();
- MainPage.BasePageView.AddChidren(page);
- page.Show(device);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- });
+ new UI2.PersonalCenter.PirDevice.Method().MainView(this, device,()=> {});
break;
}
};
--
Gitblit v1.8.0