From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 383a189..544fcaa 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -491,6 +491,10 @@
case ShowFunction.Music:
functionCount = Music.A31MusicModel.A31MusicModelList.Count;
functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ if(functionCount == 0)
+ {
+ functionCount = FunctionList.List.GetMusicList().Count;
+ }
break;
case ShowFunction.Panel:
break;
@@ -505,6 +509,12 @@
{
functionCount = 1;
}
+ break;
+ case ShowFunction.SecurityCenter:
+ functionCount = FunctionList.List.securities.Count;
+#if DEBUG
+ functionCount = 1;
+#endif
break;
}
@@ -563,7 +573,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 +637,7 @@
LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
-
+
#endregion
break;
case ShowFunction.AC:
@@ -805,12 +815,19 @@
break;
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();
+ var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
+ videoMethod.MianView(this,FunctionList.List.videoIntercom);
+ };
+ break;
+ case ShowFunction.SecurityCenter:
+ btnName.TextID = StringId.SecurityCenter;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new ArmCenterPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
break;
@@ -818,7 +835,7 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
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) =>
{
@@ -840,7 +857,7 @@
#endregion
}
-#region 鍒囨崲妤煎眰
+ #region 鍒囨崲妤煎眰
/// <summary>
/// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
@@ -997,6 +1014,6 @@
{
}
-#endregion
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0