From 849d8656a8ec66bf3472ddabdc541f98cd0f3e09 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 19:47:42 +0800
Subject: [PATCH] 2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。

---
 HDL_ON/UI/UI2/2-Classification/RoomPage.cs |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index b41b765..3589474 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -176,7 +176,13 @@
                 UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                 IsSelected = scene.collect
             };
-            bodyDiv.AddChidren(btnCollectionIcon);
+            //bodyDiv.AddChidren(btnCollectionIcon);
+            //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            {
+                bodyDiv.AddChidren(btnCollectionIcon);
+            }
+
             btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
             if (scene.sceneType == SceneType.MovieScene)
             {

--
Gitblit v1.8.0