From 87e614af0fa31d7fd632136d95c0c7e584c28477 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 26 二月 2021 13:36:10 +0800
Subject: [PATCH] 20210226-1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index ef60cd5..888cec2 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -488,13 +488,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;
break;
case ShowFunction.VideoIntercom:
- functionCount = 1;
break;
}
@@ -552,6 +551,7 @@
functionView.AddChidren(btnName);
if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
+ && item != ShowFunction.SecurityMonitoring
&& functionCount != 0)
{
Button btnFunctionCount = new Button()
@@ -765,13 +765,6 @@
break;
case ShowFunction.SecurityMonitoring:
btnName.TextID = StringId.SecurityMonitoring;
- break;
- case ShowFunction.Sensor:
- btnName.TextID = StringId.Sensor;
- functionPageTitleId = StringId.Sensor;
- break;
- case ShowFunction.VideoIntercom:
- btnName.TextID = StringId.VideoIntercom;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
#if __IOS__
@@ -781,10 +774,17 @@
#endif
};
break;
+ case ShowFunction.Sensor:
+ btnName.TextID = StringId.Sensor;
+ functionPageTitleId = StringId.Sensor;
+ break;
+ case ShowFunction.VideoIntercom:
+ btnName.TextID = StringId.VideoIntercom;
+ break;
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.VideoIntercom)
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0