From f676a4c180fc54cc82eecbfcd24d32fe7d8581db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 18:16:58 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index f824674..5c6cd7a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -255,24 +255,30 @@
#endregion
- #region F3闃舵
#region 娣诲姞璁惧
void LoadEvent_SkipbtnAddFunctionPage()
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var page = new ThirdPartyBrandListPage();
- var page = new HDL_ON.UI.UI2.Intelligence.Automation.EmptyClass();
+ var page = new BrandListPage();// AddThirdPartyBrandListpage(); // BrandListPage();
MainPage.BasePageView.AddChidren(page);
- page.Show(new System.Collections.Generic.List<string>(),null,(str)=> {
-
- });
+ 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
#endregion
#region 鍏充簬On銆佽幏鍙栨敮鎸�
--
Gitblit v1.8.0