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/1-HomePage/HomePage.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index b6c33ea..2886f90 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -663,7 +663,13 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- view.AddChidren(btnCollection);
+ //view.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ view.AddChidren(btnCollection);
+ }
+
LoadEvent_FunctionCollection(btnCollection, function);
if (function.functionCategory == FunctionCategory.Curtain)
@@ -897,7 +903,13 @@
SelectedImagePath = "Collection/CollectionWhiteIcon.png",
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
- view.AddChidren(btnCollection);
+ //view.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ view.AddChidren(btnCollection);
+ }
+
LoadEvent_SceneCollection(btnCollection, scene);
LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);
--
Gitblit v1.8.0