From 0c0a436a30bc24d4cd470eea7ba980ee418018ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 四月 2021 16:36:41 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 38d8966..8e33a2b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -478,7 +478,7 @@
functionCount = FunctionList.List.GetElectricals().Count;
functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
- functionCount = 1;
+ //functionCount = 1;
break;
case ShowFunction.Environmental:
#region 鐜鏁版嵁
@@ -495,7 +495,7 @@
case ShowFunction.Panel:
break;
case ShowFunction.SecurityMonitoring:
- //functionCount = 1;
+ functionCount = 1;
break;
case ShowFunction.Sensor:
functionCount = FunctionList.List.GetArmSensorList().Count;
@@ -627,7 +627,7 @@
LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
-
+
#endregion
break;
case ShowFunction.AC:
@@ -805,16 +805,10 @@
break;
case ShowFunction.VideoIntercom:
btnName.TextID = StringId.VideoIntercom;
-
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
- videoMethod.MianView(this, FunctionList.List.videoIntercom);
-
- //var mainView = new HDL_ON.UI.UI2.FuntionControlView.Video.MainView();
- //MainPage.BasePageView.AddChidren(mainView);
- //mainView.Show();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ videoMethod.MianView(this,FunctionList.List.videoIntercom);
};
break;
--
Gitblit v1.8.0