From 7004138de21a3bf09e501ed83c6daf3ab4f10de7 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 09:42:06 +0800
Subject: [PATCH] 20201221-1
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 2af49b6..df76e35
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -107,6 +107,7 @@
}
foreach (var scene in room.GetRoomScenes(false))
{
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
var sceneRow = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
@@ -176,9 +177,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 +212,7 @@
btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
{
btnCollectionIcon.IsSelected = scene.collect = !btnCollectionIcon.IsSelected;
- scene.SaveSceneData();
+ scene.SaveSceneData(true);
};
}
/// <summary>
--
Gitblit v1.8.0