From f25c6122eb7e26be5e7f036cf29b9019c4953be2 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 21 十二月 2020 19:44:02 +0800 Subject: [PATCH] Merge branch 'WJC' into NewFilePath --- HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs old mode 100644 new mode 100755 index d87f2d4..bf0f284 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs @@ -123,7 +123,12 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = light.collect }; - controlView.AddChidren(btnCollection); + //controlView.AddChidren(btnCollection); + //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳� + if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare) + { + controlView.AddChidren(btnCollection); + } dimmerBar = new WaveSeekBarOn() { -- Gitblit v1.8.0