From 9b44e30275621a48335fbea7b32b5065a2859c9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:54:33 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 99458f3..7a96fac 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -260,13 +260,21 @@
         {
             EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
             {
-                // var page = new ThirdPartyBrandListPage();
-                // MainPage.BasePageView.AddChidren(page);
-                // page.LoadPage();
-                var page = new UI2.PersonalCenter.PirDevice.PirMain();
+                var page = new BrandListPage();// AddThirdPartyBrandListpage(); // BrandListPage();
                 MainPage.BasePageView.AddChidren(page);
-                page.Show();
+                page.LoadPage();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                //鑾峰彇鍒楄〃
+                //HDL_ON.UI.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;
+                //    });
+                //});
             };
             btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
             btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;

--
Gitblit v1.8.0