From 1d25d355cb0efc9685a8ad5c870b5941b95ce9b8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 30 三月 2021 09:11:57 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 63256f0..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()
@@ -473,6 +474,11 @@
#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 鐜鏁版嵁
@@ -480,6 +486,7 @@
#endregion
break;
case ShowFunction.FreshAir:
+ functionCount = FunctionList.List.GetAirFreshList().Count;
break;
case ShowFunction.Music:
functionCount = Music.A31MusicModel.A31MusicModelList.Count;
@@ -551,7 +558,8 @@
functionView.AddChidren(btnName);
if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
- && item != ShowFunction.SecurityMonitoring
+ && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir
+ && item != ShowFunction.EnergyMonitoring
&& functionCount != 0)
{
Button btnFunctionCount = new Button()
@@ -721,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;
@@ -737,6 +753,27 @@
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;
@@ -755,12 +792,7 @@
btnName.TextID = StringId.SecurityMonitoring;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
-
-#if __IOS__
- EZSDK.IOS.EZSDK.Go2EZvizMonitor();
-#else //瀹夊崜鎽勫儚澶�
HDLCommon.Current.Go2EZvizMonitor(bodyView);
-#endif
};
break;
case ShowFunction.Sensor:
@@ -773,7 +805,8 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring)
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
+ && ShowFunction.EnergyMonitoring!= item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0