From e66503d70f26a3109fbadf47abcb8ba31d619e3c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 10 三月 2023 16:56:03 +0800
Subject: [PATCH] 2023年03月10日16:56:00
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 6c21dc8..4e1db09 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -649,12 +649,15 @@
var lastY2 = Application.GetRealWidth(16);
var functionContentViewHeight = Application.GetRealWidth(16);
- foreach (var item in DB_ResidenceData.Instance.functionTypeList)
+ foreach (var item in DB_ResidenceData.Instance.ShowFunctionTypeList)
{
int functionCount = 0;
int functionOnCount = 0;
switch (item)
{
+ case ShowFunction.IpCam:
+ functionCount = FunctionList.List.GetIpCamImouList().Count;
+ break;
case ShowFunction.MechanicalArm:
functionCount = FunctionList.List.GetMechanicalArmList().Count;
functionOnCount = FunctionList.List.GetMechanicalArmList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
@@ -742,6 +745,14 @@
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;
+#if DEBUG
+ functionCount = 1;
+#endif
+ functionOnCount = 1;
+ break;
+
}
@@ -800,7 +811,7 @@
if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
&& item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
&& item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
- && item != ShowFunction.Acst
+ && item != ShowFunction.Acst && item != ShowFunction.IpCam
&& functionCount != 0)
{
Button btnFunctionCount = new Button()
@@ -866,6 +877,14 @@
functionPageTitleId = StringId.Lights;
#endregion
+ break;
+ case ShowFunction.IpCam:
+ btnName.TextID = StringId.SecurityMonitoring;
+
+ btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";
+
+ functionPageTitleId = StringId.SecurityMonitoring;
+
break;
case ShowFunction.MechanicalArm:
btnName.TextID = StringId.MechanicalArm;
@@ -1059,7 +1078,7 @@
btnName.TextID = StringId.Panel;
break;
case ShowFunction.SecurityMonitoring:
- btnName.TextID = StringId.SecurityMonitoring;
+ btnName.TextID = StringId.EZVIZ;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
HDLCommon.Current.Go2EZvizMonitor(bodyView);
@@ -1132,16 +1151,32 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
break;
-
+ case ShowFunction.VideoDoorLock:
+ //钀ょ煶瑙嗛闂ㄩ攣
+ btnName.TextID = StringId.yingshishipinmensuo;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var list = HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockList();
+ var form = new UI2.FuntionControlView.VideoDoorLock.VideoDoorLockListPage();
+ form.AddForm(list);
+ };
+ break;
}
- //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
- && ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
+ //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�
+ if (item != ShowFunction.VideoDoorLock
+ && item != ShowFunction.Music
+ && item != ShowFunction.Environmental
+ && item != ShowFunction.SecurityMonitoring
+ && item != ShowFunction.DoorLock
+ && ShowFunction.EnergyMonitoring != item
+ && ShowFunction.VideoIntercom != item &&
+ ShowFunction.SecurityCenter != item
&& ShowFunction.Acst != item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
+
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(functionPageTitleId);
--
Gitblit v1.8.0