From 551e82d33c9c23442e0ecd320bcfc752f300d9ef Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 22 三月 2021 09:20:03 +0800 Subject: [PATCH] Merge branch 'temp-wxr' into WJC --- HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs index 6b98376..93342c8 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,13 +21,14 @@ public void LoadPage() { - Action<string,string> action = (s,a) => { + Action<string, string> action = (s, a) => + { var page = new AddDevciePage(brand); MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; - new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty",action); + new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action); bodyView.BackgroundColor = CSS_Color.BackgroundColor; contentView = new VerticalRefreshLayout() @@ -37,10 +39,13 @@ }; bodyView.AddChidren(contentView); - - Load3tyBrandDeviceList(); + contentView.BeginHeaderRefreshingAction = () => + { + contentView.EndHeaderRefreshing(); + Load3tyBrandDeviceList(); + }; } void Load3tyBrandDeviceList() @@ -59,6 +64,10 @@ { LoadRow(revData.list); }); + } + else + { + IMessageCommon.Current.ShowErrorInfoAlter(pack.Code); } } catch (Exception ex) @@ -79,6 +88,10 @@ bool isFrist = true; foreach (var device in deviceList) { + //if (!FunctionList.List.DeviceSpk.Contains(device.spk)) + //{ + // continue; + //} FrameLayout row = new FrameLayout() { Height = Application.GetRealHeight(50), -- Gitblit v1.8.0