From f9de7b8e7a567d71e336965117dd9ceb22be07c0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 三月 2021 16:16:57 +0800
Subject: [PATCH] 2021-03-10 1.更新
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index c44b3d0..8c9a157 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -488,12 +488,19 @@
case ShowFunction.Panel:
break;
case ShowFunction.SecurityMonitoring:
+ functionCount = 1;
break;
case ShowFunction.Sensor:
+ functionCount = FunctionList.List.sensorsArm.Count;
break;
case ShowFunction.VideoIntercom:
break;
+ }
+
+ if(functionCount == 0)
+ {
+ continue;
}
functionCategoryCount++;
@@ -543,7 +550,9 @@
};
functionView.AddChidren(btnName);
- if (item != ShowFunction.Environmental && functionCount != 0)
+ if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
+ && item != ShowFunction.SecurityMonitoring
+ && functionCount != 0)
{
Button btnFunctionCount = new Button()
{
@@ -608,7 +617,7 @@
LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
-
+
#endregion
break;
case ShowFunction.AC:
@@ -756,10 +765,14 @@
break;
case ShowFunction.SecurityMonitoring:
btnName.TextID = StringId.SecurityMonitoring;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ HDLCommon.Current.Go2EZvizMonitor(bodyView);
+ };
break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
-
+ functionPageTitleId = StringId.Sensor;
break;
case ShowFunction.VideoIntercom:
btnName.TextID = StringId.VideoIntercom;
@@ -767,7 +780,7 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental)
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
@@ -786,10 +799,10 @@
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
}
- #endregion
+#endregion
}
- #region 鍒囨崲妤煎眰
+#region 鍒囨崲妤煎眰
/// <summary>
/// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
@@ -946,6 +959,6 @@
{
}
- #endregion
+#endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0