From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
index c74f95b..4d72666 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
@@ -135,12 +135,26 @@
int rowCount = 1;
Action backAction;
- public RoomEditPage(Room r, int tId,Action action)
+ /// <summary>
+ /// 鍒犻櫎鎴块棿浜嬩欢
+ /// 2020-12-02 瑙ｅ喅鍒犻櫎鎴块棿鍚庯紝鐣岄潰涓嶅埛鏂板垹闄ゆ埧闂撮棶棰�
+ /// </summary>
+ Action deleteAction;
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="r"></param>
+ /// <param name="tId"></param>
+ /// <param name="action"></param>
+ /// <param name="delAction">鍒犻櫎鎴块棿浜嬩欢</param>
+ public RoomEditPage(Room r, int tId, Action action, Action delAction)
{
bodyView = this;
room = r;
pageTitleId = tId;
backAction = action;
+ this.deleteAction = delAction;
}
public void LoadPage()
@@ -170,11 +184,14 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
//UnSelectedImagePath = room.backgroundImage,
- ImagePath = room.backgroundImage,
+ //ImagePath = room.backgroundImage,
Radius = (uint)Application.GetRealWidth(12),
//Radius = (uint)Application.GetRealWidth(6),
};
roomBgView.AddChidren(btnRoomBg);
+
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, btnRoomBg);
//鎴块棿淇℃伅缂栬緫鍖哄煙
roomInfoView = new VerticalScrolViewLayout()
@@ -225,7 +242,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = room.name
+ Text = room.roomName
};
roomNameRow.AddChidren(btnRoomName);
--
Gitblit v1.8.0