From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index df95071..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;
@@ -20,7 +21,14 @@
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
+ Action<string, string> action = (s, a) =>
+ {
+ var page = new AddDevciePage(brand);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage(contentView);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new VerticalRefreshLayout()
@@ -31,10 +39,15 @@
};
bodyView.AddChidren(contentView);
-
-
Load3tyBrandDeviceList();
+ contentView.BeginHeaderRefreshingAction = () =>
+ {
+ contentView.EndHeaderRefreshing();
+ Load3tyBrandDeviceList();
+ };
+
+ //contentView.BeginHeaderRefreshing();
}
void Load3tyBrandDeviceList()
@@ -54,6 +67,10 @@
LoadRow(revData.list);
});
}
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
}
catch (Exception ex)
{
@@ -69,12 +86,14 @@
void LoadRow(List<Function> deviceList)
{
- deviceList.Add(new Function() { name ="娴嬭瘯绾㈠瀹�",spk = SPK.IrModule});
-
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),
@@ -133,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();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- });
+ new UI2.PersonalCenter.PirDevice.Method().MainView(this, device,()=> {});
break;
}
};
--
Gitblit v1.8.0