From 003abaf86b766eb40ef62300ab0c707774c36ba9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 30 三月 2021 20:10:16 +0800
Subject: [PATCH] 2021-3-30-2
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 96 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 3603252..5696551 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -76,6 +76,7 @@
public void LoadPage()
{
+ MainPage.CurPageIndex = 1;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
#region top
FrameLayout topView = new FrameLayout()
@@ -442,44 +443,50 @@
{
case ShowFunction.Light:
#region Light
- functionCount = FunctionList.List.lights.Count;
- functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetLightList().Count;
+ functionOnCount = FunctionList.List.GetLightList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.AC:
#region AC
- functionCount = FunctionList.List.aCs.Count;
- functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetAcList().Count;
+ functionOnCount = FunctionList.List.GetAcList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.Curtain:
#region Curtain
- functionCount = FunctionList.List.curtains.Count;
- functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetCurtainList().Count;
+ functionOnCount = FunctionList.List.GetCurtainList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.FloorHeating:
#region 鍦扮儹
- functionCount = FunctionList.List.floorHeatings.Count;
- functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetFloorHeatingList().Count;
+ functionOnCount = FunctionList.List.GetFloorHeatingList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.DoorLock:
break;
case ShowFunction.Electric:
#region 鐢靛櫒
- functionCount = FunctionList.List.electricals.Count;
- functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetElectricals().Count;
+ functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.EnergyMonitoring:
+ #region 鑳芥簮
+ functionCount = FunctionList.List.GetElectricals().Count;
+ functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ #endregion
+ functionCount = 1;
break;
case ShowFunction.Environmental:
#region 鐜鏁版嵁
- functionCount = FunctionList.List.sensorsEnvironmentalScience.Count;
+ functionCount = FunctionList.List.GetEnvirSensorsList().Count;
#endregion
break;
case ShowFunction.FreshAir:
+ functionCount = FunctionList.List.GetAirFreshList().Count;
break;
case ShowFunction.Music:
functionCount = Music.A31MusicModel.A31MusicModelList.Count;
@@ -488,13 +495,12 @@
case ShowFunction.Panel:
break;
case ShowFunction.SecurityMonitoring:
+ functionCount = 1;
break;
case ShowFunction.Sensor:
- functionCount = FunctionList.List.sensorsArm.Count;
- //functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetArmSensorList().Count;
break;
case ShowFunction.VideoIntercom:
- functionCount = 1;
break;
}
@@ -552,6 +558,8 @@
functionView.AddChidren(btnName);
if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
+ && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir
+ && item != ShowFunction.EnergyMonitoring
&& functionCount != 0)
{
Button btnFunctionCount = new Button()
@@ -597,8 +605,6 @@
case ShowFunction.Light:
#region Light
btnName.TextID = StringId.Lights;
- functionCount = FunctionList.List.lights.Count;
- functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnLightPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -623,8 +629,6 @@
case ShowFunction.AC:
#region AC
btnName.TextID = StringId.AC;
- functionCount = FunctionList.List.aCs.Count;
- functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnAcPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -647,8 +651,6 @@
case ShowFunction.Curtain:
#region Curtain
btnName.TextID = StringId.Curtain;
- functionCount = FunctionList.List.curtains.Count;
- functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnClose;
btnClose = new Button()
{
@@ -682,8 +684,6 @@
case ShowFunction.FloorHeating:
#region 鍦扮儹
btnName.TextID = StringId.FloorHeating;
- functionCount = FunctionList.List.floorHeatings.Count;
- functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnFhPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -709,8 +709,6 @@
case ShowFunction.Electric:
#region 鐢靛櫒
btnName.TextID = StringId.Electric;
- functionCount = FunctionList.List.electricals.Count;
- functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnElectricPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -731,14 +729,22 @@
#endregion
break;
case ShowFunction.EnergyMonitoring:
+ #region 鑳芥簮鐩戞祴
btnName.TextID = StringId.EnergyMonitoring;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ var skipView = new EnergyMainPage();
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ #endregion
break;
case ShowFunction.Environmental:
#region 鐜鏁版嵁
btnName.TextID = StringId.EnvironmentalData;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
- var skipView = new EnvironmentalSciencePage();
+ var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -747,11 +753,30 @@
break;
case ShowFunction.FreshAir:
btnName.TextID = StringId.FreshAir;
+ #region Light
+ Button btnFreshAirPower = new Button()
+ {
+ X = Application.GetRealWidth(120),
+ Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ SelectedImagePath = "Public/PowerOpen.png",
+ UnSelectedImagePath = "Public/PowerClose.png",
+ IsSelected = functionOnCount > 0,
+ Tag = item + "_AllControl",
+ };
+ functionView.AddChidren(btnFreshAirPower);
+
+ btnFreshAirPower.MouseUpEventHandler = (sender, e) =>
+ {
+ LoadEvent_SwitchFunction(btnFreshAirPower, item, functionView);
+ };
+ functionPageTitleId = StringId.FreshAir;
+
+ #endregion
break;
case ShowFunction.Music:
btnName.TextID = StringId.Music;
- functionCount = Music.A31MusicModel.A31MusicModelList.Count;
- functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
var musicMain = new Music.MusicMain();
@@ -765,6 +790,10 @@
break;
case ShowFunction.SecurityMonitoring:
btnName.TextID = StringId.SecurityMonitoring;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ HDLCommon.Current.Go2EZvizMonitor(bodyView);
+ };
break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
@@ -772,15 +801,12 @@
break;
case ShowFunction.VideoIntercom:
btnName.TextID = StringId.VideoIntercom;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
-
- };
break;
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.VideoIntercom)
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
+ && ShowFunction.EnergyMonitoring!= item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
@@ -799,10 +825,10 @@
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
}
- #endregion
+#endregion
}
- #region 鍒囨崲妤煎眰
+#region 鍒囨崲妤煎眰
/// <summary>
/// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
@@ -959,6 +985,6 @@
{
}
- #endregion
+#endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0