From fd0bbcd6e475754d88cedb798000ebeb375d07e4 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 19 七月 2023 11:18:48 +0800 Subject: [PATCH] Merge branch 'wjc' into Dev-1.9 --- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index 7cb16f3..5f3b656 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)) {//绐楀笜娌℃湁寮�鍏虫寜閽� @@ -199,6 +200,7 @@ { btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function); } + else if(function.spk == SPK.GroupControl) { } else if (function.spk == SPK.HvacCac) { var btnHumidityIcon = new Button() -- Gitblit v1.8.0