From f16fd06aa226e9f97a27858624d4ea7cf8975d25 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 五月 2024 17:24:38 +0800
Subject: [PATCH] 增加了萤石摄像头
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 8d43174..09ed33d 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -361,6 +361,14 @@
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ var roomViewbgColor = new Button()
+ {
+ Height = Application.GetRealWidth(192),
+ Radius = (uint)Application.GetRealWidth(12),
+ BackgroundColor = 0x19333333,
+ };
+ roomView.AddChidren(roomViewbgColor);
+
var btnFloorAndRoomName = new Button()
{
X = Application.GetRealWidth(16),
@@ -455,13 +463,6 @@
//roomView.AddChidren(environmentalView);
#endregion
- var roomViewbgColor = new Button()
- {
- Height = Application.GetRealWidth(192),
- Radius = (uint)Application.GetRealWidth(12),
- BackgroundColor = 0x19333333,
- };
- roomView.AddChidren(roomViewbgColor);
var btnAllClose = new Button()
{
@@ -483,8 +484,7 @@
// BackgroundColor = CSS_Color.MainBackgroundColor,
//};
//roomView.AddChidren(btn);
-
- roomViewbgColor.MouseUpEventHandler += (sender, e) =>
+ EventHandler <MouseEventArgs> roomRowClick = (sender, e) =>
{
Action ReloadRoomName = () =>
{
@@ -509,6 +509,10 @@
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
+ roomViewbgColor.MouseUpEventHandler = roomRowClick;
+ btnFloorAndRoomName.MouseUpEventHandler = roomRowClick;
+
+
}
/// <summary>
/// 璁拌浇灏忓浘鎴块棿row
@@ -744,6 +748,12 @@
break;
case ShowFunction.Panel:
break;
+ case ShowFunction.SecurityMonitoring:
+ if (!MainPage.NoLoginMode)
+ {
+ functionCount = 1;
+ }
+ break;
case ShowFunction.Sensor:
functionCount = FunctionList.List.GetArmSensorList().Count;
break;
@@ -822,6 +832,7 @@
&& item != ShowFunction.Environmental
&& item != ShowFunction.Sensor
&& item != ShowFunction.VideoIntercom
+ && item != ShowFunction.SecurityMonitoring
&& item != ShowFunction.FreshAir
&& item != ShowFunction.Music
&& item != ShowFunction.EnergyMonitoring
@@ -1112,6 +1123,12 @@
case ShowFunction.Panel:
btnName.TextID = StringId.Panel;
break;
+ case ShowFunction.SecurityMonitoring:
+ btnName.TextID = StringId.EZVIZ;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ HDLCommon.Current.Go2EZvizMonitor(bodyView);
+ };
+ break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
functionPageTitleId = StringId.Sensor;
@@ -1154,6 +1171,7 @@
if ( item != ShowFunction.Aks
&& item != ShowFunction.Music
&& item != ShowFunction.Environmental
+ && item != ShowFunction.SecurityMonitoring
&& item != ShowFunction.DoorLock
//&& ShowFunction.EnergyMonitoring != item
&& ShowFunction.VideoIntercom != item
--
Gitblit v1.8.0