From 88b9c9dbae4f0f28529cd3b3ffe53cd26f19f738 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 21:55:50 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into Dev-Branch
---
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 6c9a2e3..31d59cd 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))
{//绐楀笜娌℃湁寮�鍏虫寜閽�
@@ -445,6 +446,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);
--
Gitblit v1.8.0