From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 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..00f6588 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()
@@ -150,7 +152,7 @@
                     switch (device.spk)
                     {
                         case SPK.IrModule:
-                            new UI2.PersonalCenter.PirDevice.Method().MainView(this, device,()=> { });
+                            new UI2.PersonalCenter.PirDevice.Method().MainView(this, device,()=> {});
                             break;
                     }
                 };

--
Gitblit v1.8.0