From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
index 9940cf9..ea56b01 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()
{
@@ -155,7 +160,7 @@
controlView.AddChidren(btnCurtainOpen);
LoadEventList();
- new TopViewDiv(bodyView,curtain.name).LoadTopView_FunctionTop(curtain, actionRefresh);
+ new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
}
}
--
Gitblit v1.8.0