From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index c0aff4b..2f3552a 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -475,10 +475,9 @@
break;
case ShowFunction.EnergyMonitoring:
#region 鑳芥簮
- functionCount = FunctionList.List.GetElectricals().Count;
- functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetEnergyList().Count;
+ functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
- functionCount = 1;
break;
case ShowFunction.Environmental:
#region 鐜鏁版嵁
@@ -491,11 +490,15 @@
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;
case ShowFunction.SecurityMonitoring:
- //functionCount = 1;
+ functionCount = 1;
break;
case ShowFunction.Sensor:
functionCount = FunctionList.List.GetArmSensorList().Count;
@@ -505,6 +508,12 @@
{
functionCount = 1;
}
+ break;
+ case ShowFunction.SecurityCenter:
+ functionCount = FunctionList.List.securities.Count;
+#if DEBUG
+ functionCount = 1;
+#endif
break;
}
@@ -553,17 +562,18 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(140),
Height = Application.GetRealHeight(24),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.CenterLeft,
+ IsMoreLines = true,
};
functionView.AddChidren(btnName);
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()
@@ -811,11 +821,21 @@
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;
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
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) =>
{
@@ -837,7 +857,7 @@
#endregion
}
-#region 鍒囨崲妤煎眰
+ #region 鍒囨崲妤煎眰
/// <summary>
/// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
@@ -994,6 +1014,6 @@
{
}
-#endregion
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0