From b002d7e8709e4d6566124bdf7daa4bc3c3fd05d5 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 16 三月 2023 09:55:20 +0800
Subject: [PATCH] 1.新增大华摄像头dll及相关功能 2.更换LCVideoOnsdk.dll(跟大华摄像头有冲突) 3.修改适配版本为12.2(含有swift，需12.2以上支持)
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 8f8440a..08772f9 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -57,14 +57,19 @@
/// </summary>
public void LoadFunctionDiv()
{
- //todo 澧炲姞璁惧锛屽鍔犲姛鑳藉垪琛ㄥ崱鐗�
if (function == null)
{
this.RemoveFromParent();
return;
}
- LoadDiv();
-
+ //if (function.spk == SPK.IpCam_Imou)
+ //{
+ // InitIpCamDiv();
+ //}
+ //else
+ {
+ LoadDiv();
+ }
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
@@ -251,6 +256,10 @@
{
ClothesHangerFragment();
}
+ else if(function.spk == SPK.IpCam_Imou)
+ {
+
+ }
else
{
#region 鍔犺浇寮�鍏虫寜閽�
@@ -317,6 +326,58 @@
}
+ /// <summary>
+ /// 鍔犺浇ip鎽勫儚澶村崱鐗�
+ /// </summary>
+ private void InitIpCamDiv()
+ {
+ btnIcon = new Button()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(15),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ };
+ bodyDiv.AddChidren(btnIcon);
+
+ btnName = new Button()
+ {
+ X = Application.GetRealWidth(8 + 10 + 32),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(24),
+ Text = function.name,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ };
+ bodyDiv.AddChidren(btnName);
+
+ btnFromFloor = new Button()
+ {
+ X = Application.GetRealWidth(8 + 10 + 32),
+ Y = Application.GetRealHeight(10 + 24),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(18),
+ Text = function.GetRoomListName(),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ };
+ bodyDiv.AddChidren(btnFromFloor);
+
+ btnCollectionIcon = new Button()
+ {
+ X = Application.GetRealWidth(299),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetMinRealAverage(40),
+ Height = Application.GetMinRealAverage(40),
+ SelectedImagePath = "Collection/CollectionIcon.png",
+ UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
+ IsSelected = function.collect
+ };
+
+ }
/// <summary>
/// 鍔犺浇鎺у埗鍗＄墖鍖哄煙
--
Gitblit v1.8.0