From 3532db3610381f37eca1a6ac783d882517847c91 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 31 三月 2021 15:28:49 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index aac2c6a..04b6f87 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -255,23 +255,37 @@
#endregion
- #region F3闃舵
#region 娣诲姞璁惧
void LoadEvent_SkipbtnAddFunctionPage()
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var page = new HDL_ON.UI.UI2.Intelligence.Automation.EmptyClass();
- MainPage.BasePageView.AddChidren(page);
- page.Show(new System.Collections.Generic.List<string>(),null,(str)=> {
+ HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
+ videoMethod.getVideo((device) =>
+ {
+ videoMethod.MianView(this, device);
+ }, this, true);
+ return;
- });
+ 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
#endregion
#region 鍏充簬On銆佽幏鍙栨敮鎸�
--
Gitblit v1.8.0