From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲；
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 5059746..3d94957 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -269,6 +269,10 @@
{
btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
}
+ else if (function.spk == SPK.VideoDoorLock)
+ {
+ btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(Comerom.function);
+ }
else if (function.spk == SPK.AvZkAiks)
{
//闅愯棌寮�鍏虫寜閽�
@@ -345,7 +349,7 @@
{
ClothesHangerFragment();
}
- else if(function.spk == SPK.ElectricEnergy || function.spk ==SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
+ else if(function.spk == SPK.IpCam_Imou || function.spk == SPK.ElectricEnergy || function.spk ==SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
{
}
@@ -491,7 +495,7 @@
Text = function.name,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
+ TextSize = CSS_FontSize.TextFontSize + OnAppConfig.Instance.FontAmplify,
};
bodyDiv.AddChidren(btnName);
@@ -504,7 +508,7 @@
Text = function.GetRoomListName(),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel + OnAppConfig.Instance.FontAmplify,
};
bodyDiv.AddChidren(btnFromFloor);
@@ -789,7 +793,7 @@
TextAlignment = TextAlignment.CenterLeft,
SelectedTextColor = CSS_Color.PromptingColor1,
TextColor = 0x00000000,
- TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel + OnAppConfig.Instance.FontAmplify,
Tag = function.spk + "_laststates_" + function.sid,
IsSelected = function.trait_on_off.curValue.ToString() == "on"
};
--
Gitblit v1.8.0