From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:19:13 +0800 Subject: [PATCH] 合并嘉乐lc代码 --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs index f954078..51e8ba0 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs @@ -131,29 +131,39 @@ #endregion Room room; - int pageTitleId; int rowCount = 1; Action backAction; - public RoomEditPage(Room r, int tId,Action action) + /// <summary> + /// 鍒犻櫎鎴块棿浜嬩欢 + /// 2020-12-02 瑙e喅鍒犻櫎鎴块棿鍚庯紝鐣岄潰涓嶅埛鏂板垹闄ゆ埧闂撮棶棰� + /// </summary> + Action deleteAction; + /// <summary> + /// 鍥剧墖淇敼浜嬩欢 + /// </summary> + Action modifyImageAction; + + /// <summary> + /// + /// </summary> + /// <param name="r"></param> + /// <param name="action"></param> + /// <param name="delAction">鎴块棿鍒犻櫎浜嬩欢</param> + /// <param name="modifyImageAction">鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�</param> + public RoomEditPage(Room r, Action action, Action delAction, Action modifyImageAction) { bodyView = this; room = r; - pageTitleId = tId; backAction = action; + this.deleteAction = delAction; + this.modifyImageAction = modifyImageAction; } public void LoadPage() { bodyView.BackgroundColor = CSS_Color.BackgroundColor; - if (pageTitleId == StringId.AddRoom) - { - new TopViewDiv(bodyView, Language.StringByID(pageTitleId)).LoadTopView(); - } - else - { - new TopViewDiv(bodyView, Language.StringByID(pageTitleId)).LoadTopView(backAction); - } + new TopViewDiv(bodyView, Language.StringByID(StringId.EditRoomInfo)).LoadTopView(backAction); roomBgView = new FrameLayout() { @@ -170,11 +180,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() @@ -329,7 +342,7 @@ btnFunctionManagementTitle = new Button() { X = Application.GetRealWidth(16), - Width = Application.GetRealWidth(120), + Width = Application.GetRealWidth(220), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.SubheadingFontSize, @@ -355,8 +368,8 @@ Height = Application.GetRealHeight(50), BackgroundColor = CSS_Color.MainBackgroundColor, TextAlignment = TextAlignment.Center, - TextColor = this.pageTitleId == StringId.AddRoom ? CSS_Color.MainColor : CSS_Color.WarningColor, - TextID = this.pageTitleId == StringId.AddRoom ? StringId.Save : StringId.DeleteRoom, + TextColor = CSS_Color.WarningColor, + TextID = StringId.DeleteRoom, TextSize = CSS_FontSize.SubheadingFontSize, }; bodyView.AddChidren(btnOption); -- Gitblit v1.8.0