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 | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs index f70d227..7a96fac 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs @@ -22,9 +22,7 @@ { LoadEvent_SkipResdentialManagePage(); LoadEvent_GoMemberManagement(); - #region F3闃舵 - //LoadEvent_SkipbtnAddFunctionPage(); - #endregion + LoadEvent_SkipbtnAddFunctionPage(); } } @@ -257,21 +255,30 @@ #endregion - #region F3闃舵 #region 娣诲姞璁惧 - //void LoadEvent_SkipbtnAddFunctionPage() - //{ - // EventHandler<MouseEventArgs> eventHandler = (sender, e) => - // { - // var page = new SearchDevicePage(); - // MainPage.BasePageView.AddChidren(page); - // page.LoadPage(); - // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - // }; - // btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler; - // btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler; - //} - #endregion + void LoadEvent_SkipbtnAddFunctionPage() + { + EventHandler<MouseEventArgs> eventHandler = (sender, e) => + { + var page = new BrandListPage();// AddThirdPartyBrandListpage(); // BrandListPage(); + MainPage.BasePageView.AddChidren(page); + 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; + } #endregion #region 鍏充簬On銆佽幏鍙栨敮鎸� -- Gitblit v1.8.0