From f5a49299caaf1fdca7503ae682da13c6fda887c6 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 16 十二月 2020 20:55:55 +0800 Subject: [PATCH] Merge branch 'CJL' into NewFilePath --- HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs index b2a2baa..661eb0e 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs @@ -108,7 +108,12 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = curtain.collect }; - controlView.AddChidren(btnCollection); + //controlView.AddChidren(btnCollection); + //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳� + if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare) + { + controlView.AddChidren(btnCollection); + } btnCurtainBgIcon = new Button() { -- Gitblit v1.8.0