From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 8209237..99e296c 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -78,9 +78,10 @@
}
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
- if(function.spk == SPK.GroupControl)
+ if(function.spk == SPK.GroupControl || function.spk == SPK.CommonSeries)
{
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/lightswitch.png";
+ //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/lightswitch.png";
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/groupControl.png";
}
if (SPK.CurtainSpkList().Contains(function.spk))
{//绐楀笜娌℃湁寮�鍏虫寜閽�
@@ -197,8 +198,14 @@
}
else if (function.spk == SPK.VideoDoorLock)
{
- btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
+ btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
}
+ else if (function.spk == SPK.AvZkAiks)
+ {
+ //闅愯棌寮�鍏虫寜閽�
+ btnIcon.UnSelectedImagePath = "AksIcon/aks.png";
+ }
+ else if(function.spk == SPK.GroupControl) { }
else if (function.spk == SPK.HvacCac)
{
var btnHumidityIcon = new Button()
@@ -269,7 +276,7 @@
{
ClothesHangerFragment();
}
- else if(function.spk == SPK.IpCam_Imou)
+ else if(function.spk == SPK.IpCam_Imou || function.spk == SPK.ElectricEnergy || function.spk ==SPK.AirSwitch || function.spk == SPK.AirSwitchP3)
{
}
@@ -281,7 +288,7 @@
/// 寮�鍏虫寜閽�
/// </summary>
Button btnSwitch;
- if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+ if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
btnSwitch = new Button()
{
@@ -444,6 +451,7 @@
};
if ( !SPK.ArmSensorSpkList().Contains(function.spk)
&& function.spk != SPK.DoorLock
+ && function.spk != SPK.GroupControl
&& !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
{
bodyDiv.AddChidren(btnCollectionIcon);
@@ -454,7 +462,7 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
- if (!function.online)
+ if (!function.isOnline())
{
bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
btnOffline = new Button()
@@ -494,6 +502,7 @@
case SPK.LightDimming:
case SPK.LightRGBW:
case SPK.LightRGB:
+ case SPK.LightCCT:
#region Dimmer
var btnDimmerMinValues = new Button()
{
--
Gitblit v1.8.0