From f4c86f68b900bd506ef7214b2ae9bd23a9d2ffa8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 19 十二月 2020 17:48:11 +0800
Subject: [PATCH] 完成筛选房间的功能

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

diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
old mode 100644
new mode 100755
index 86f95da..3589474
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -54,7 +54,7 @@
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
-            new TopViewDiv(bodyView,room.name).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
+            new TopViewDiv(bodyView,room.roomName).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
 
             functionListView = new VerticalScrolViewLayout()
             {
@@ -176,9 +176,15 @@
                 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 as Scene).sceneType == SceneType.MovieScene)
+            if (scene.sceneType == SceneType.MovieScene)
             {
                 var movieIcon = new Button()
                 {
@@ -205,7 +211,7 @@
             btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
             {
                 btnCollectionIcon.IsSelected = scene.collect = !btnCollectionIcon.IsSelected;
-                scene.SaveSceneData();
+                scene.SaveSceneData(true);
             };
         }
         /// <summary>

--
Gitblit v1.8.0