From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 23 十一月 2021 09:11:30 +0800 Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC --- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index 1786290..9a7fe8d 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs @@ -212,9 +212,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; - //bodyDiv.AddChidren(btnCollectionIcon); - //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳� - if ( !SPK.ArmSensorSpkList().Contains(function.spk) || !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && + if ( !SPK.ArmSensorSpkList().Contains(function.spk) && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && { bodyDiv.AddChidren(btnCollectionIcon); } -- Gitblit v1.8.0