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 | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 8073d56..04b6f87 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -260,21 +260,28 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- //var page = new BrandListPage();
- //MainPage.BasePageView.AddChidren(page);
- //page.LoadPage();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //鑾峰彇鍒楄〃
- HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () =>
+ HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
+ videoMethod.getVideo((device) =>
{
- Application.RunOnMainThread(() =>
- {
- var page = new UI2.PersonalCenter.PirDevice.PirMain();
- MainPage.BasePageView.AddChidren(page);
- page.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- });
+ 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;
--
Gitblit v1.8.0