From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index 31d59cd..99e296c 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs @@ -200,6 +200,11 @@ { 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) { @@ -271,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) { } @@ -283,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() { @@ -457,7 +462,7 @@ bodyDiv.AddChidren(btnCollectionIcon); } - if (!function.online) + if (!function.isOnline()) { bodyDiv.BackgroundColor = CSS_Color.PromptingColor2; btnOffline = new Button() @@ -497,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