From 320d7cc8feb394d0ce3db2ec1d01593b554d990f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 10:57:13 +0800
Subject: [PATCH] 2020-12-23 1.更新
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index b41b765..ae0c8cc 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -27,10 +27,21 @@
/// 鍒犻櫎鎴块棿浜嬩欢
/// </summary>
Action deleteAction;
+ /// <summary>
+ /// 鍥剧墖淇敼浜嬩欢
+ /// </summary>
+ Action modifyImageAction;
#endregion
- public RoomPage(Room r, Action rrn, Action delAction)
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="r"></param>
+ /// <param name="rrn">缂栬緫浜嬩欢</param>
+ /// <param name="delAction">鍒犻櫎浜嬩欢鍥炶皟</param>
+ /// <param name="modifyImageAction">鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�</param>
+ public RoomPage(Room r, Action rrn, Action delAction, Action modifyImageAction)
{
bodyView = this;
room = r;
@@ -40,6 +51,7 @@
};
ReloadRoomName = rrn;
deleteAction = delAction;
+ this.modifyImageAction = modifyImageAction;
}
/// <summary>
/// 閲嶈浇鐣岄潰
@@ -107,6 +119,7 @@
}
foreach (var scene in room.GetRoomScenes(false))
{
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
var sceneRow = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
@@ -176,7 +189,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