From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
old mode 100644
new mode 100755
index 4d72666..a43c157
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
@@ -131,7 +131,6 @@
#endregion
Room room;
- int pageTitleId;
int rowCount = 1;
Action backAction;
@@ -148,11 +147,10 @@
/// <param name="tId"></param>
/// <param name="action"></param>
/// <param name="delAction">鍒犻櫎鎴块棿浜嬩欢</param>
- public RoomEditPage(Room r, int tId, Action action, Action delAction)
+ public RoomEditPage(Room r, Action action, Action delAction)
{
bodyView = this;
room = r;
- pageTitleId = tId;
backAction = action;
this.deleteAction = delAction;
}
@@ -160,14 +158,7 @@
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()
{
@@ -372,8 +363,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