From 0f5d7d18f98d6d961b3d21dc2b1b59905e261fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 23 二月 2021 17:09:17 +0800
Subject: [PATCH] 20210223-1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index c44b3d0..4dfaa92 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -490,10 +490,18 @@
case ShowFunction.SecurityMonitoring:
break;
case ShowFunction.Sensor:
+ functionCount = FunctionList.List.sensorsArm.Count;
+ //functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case ShowFunction.VideoIntercom:
+ functionCount = 1;
break;
+ }
+
+ if(functionCount == 0)
+ {
+ continue;
}
functionCategoryCount++;
@@ -543,7 +551,7 @@
};
functionView.AddChidren(btnName);
- if (item != ShowFunction.Environmental && functionCount != 0)
+ if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && functionCount != 0)
{
Button btnFunctionCount = new Button()
{
@@ -759,15 +767,19 @@
break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
-
+ functionPageTitleId = StringId.Sensor;
break;
case ShowFunction.VideoIntercom:
btnName.TextID = StringId.VideoIntercom;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+
+ };
break;
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental)
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.VideoIntercom)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0