From 51f5f7a47d394163dccf2441cd04c2a19ceeda34 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 一月 2024 09:41:59 +0800
Subject: [PATCH] Merge branch 'Dev-Google-V2.4.3' into Google-2023-11-17-1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 3d1935a..b5e6c38 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -745,6 +745,19 @@
break;
case ShowFunction.Panel:
break;
+ case ShowFunction.SecurityMonitoring:
+ if (!MainPage.NoLoginMode)
+ {
+ if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain"))
+ {
+ functionCount = 0;
+ }
+ else
+ {
+ functionCount = 1;
+ }
+ }
+ break;
case ShowFunction.Sensor:
functionCount = FunctionList.List.GetArmSensorList().Count;
break;
@@ -757,6 +770,20 @@
case ShowFunction.SecurityCenter:
functionCount = FunctionList.List.securities.Count;
break;
+ case ShowFunction.Acst:
+ functionCount = FunctionList.List.GetAcstParentList().Count;
+ functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ break;
+ case ShowFunction.VideoDoorLock:
+ functionCount = FunctionList.List.GetVideoDoorLockList().Count;
+ functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
+ || obj.GetAttrState("status").ToString() == "normal_open").Count;
+
+ break;
+ case ShowFunction.Aks:
+ functionCount = FunctionList.List.GetVideoControlsList().Count;
+ functionOnCount = 1;
+ break;
--
Gitblit v1.8.0