From a70dac4349c9bb78d7be5052f371136d840b2665 Mon Sep 17 00:00:00 2001 From: lss <lsc@hdlchina.com.cn> Date: 星期四, 22 四月 2021 15:42:42 +0800 Subject: [PATCH] 2021-04-22 临时备份 --- HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs index 383a189..5804737 100644 --- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs @@ -501,10 +501,13 @@ functionCount = FunctionList.List.GetArmSensorList().Count; break; case ShowFunction.VideoIntercom: - if (FunctionList.List.videoIntercom != null) + if (FunctionList.List.videoIntercom != null && FunctionList.List.videoIntercom.Count > 0) { functionCount = 1; } + break; + case ShowFunction.SecurityCenter: + functionCount = FunctionList.List.securities.Count; break; } @@ -563,7 +566,7 @@ if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir - && item != ShowFunction.EnergyMonitoring + && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter && functionCount != 0) { Button btnFunctionCount = new Button() @@ -627,7 +630,7 @@ LoadEvent_SwitchFunction(btnLightPower, item, functionView); }; functionPageTitleId = StringId.Lights; - + #endregion break; case ShowFunction.AC: @@ -803,22 +806,19 @@ btnName.TextID = StringId.Sensor; functionPageTitleId = StringId.Sensor; break; - case ShowFunction.VideoIntercom: + case ShowFunction.VideoIntercom://鍙瀵硅 btnName.TextID = StringId.VideoIntercom; - btnFunctionViewBg.MouseUpEventHandler = (sender, e) => { - var mainView = new HDL_ON.UI.UI2.FuntionControlView.Video.MainView(); - MainPage.BasePageView.AddChidren(mainView); - mainView.Show(); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + var videoMethod = new UI2.FuntionControlView.Video.VideoMethod(); + videoMethod.MianView(this); }; break; } //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈� if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring - && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item) + && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item) { btnFunctionViewBg.MouseUpEventHandler = (sender, e) => { -- Gitblit v1.8.0