From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs
index e8e30e0..d011d6d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs
@@ -23,7 +23,7 @@
/// <summary>
/// 鎴块棿鑳屾櫙鏄剧ず鎸夐挳
/// </summary>
- Button btnRoomBg;
+ ImageView btnRoomBg;
/// <summary>
/// 鎴块棿淇℃伅缂栬緫鍖哄煙
/// </summary>
@@ -130,18 +130,28 @@
#endregion
Room room;
int pageTitleId;
+ int rowCount = 1;
+ Action backAction;
- public RoomEditPage(Room r, int tId)
+ public RoomEditPage(Room r, int tId,Action action)
{
bodyView = this;
room = r;
pageTitleId = tId;
+ backAction = action;
}
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(pageTitleId));
+ if(pageTitleId == StringId.AddRoom)
+ {
+ new TopViewDiv(bodyView, Language.StringByID(pageTitleId)).LoadTopView();
+ }
+ else
+ {
+ new TopViewDiv(bodyView, Language.StringByID(pageTitleId)).LoadTopView(backAction);
+ }
roomBgView = new FrameLayout()
{
@@ -163,14 +173,16 @@
};
roomBgView.AddChidren(btnTipRoomName);
- btnRoomBg = new Button()
+ btnRoomBg = new ImageView()
{
Gravity = Gravity.CenterHorizontal,
Y = btnTipRoomName.Bottom,
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(184),
- UnSelectedImagePath = room.backgroundImage,
- Radius = (uint)Application.GetRealWidth(6),
+ //UnSelectedImagePath = room.backgroundImage,
+ ImagePath = room.backgroundImage,
+ Radius = (uint)Application.GetRealWidth(12),
+ //Radius = (uint)Application.GetRealWidth(6),
};
roomBgView.AddChidren(btnRoomBg);
@@ -178,7 +190,7 @@
roomInfoView = new VerticalScrolViewLayout()
{
Y = roomBgView.Bottom + Application.GetRealHeight(8),
- Height = Application.GetRealHeight(51 * 5),
+ Height = Application.GetRealHeight(50 * 5),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
@@ -203,6 +215,7 @@
Height = Application.GetRealHeight(50),
};
roomInfoView.AddChidren(roomNameRow);
+ rowCount++;
btnRoomNameTile = new Button()
{
@@ -243,6 +256,7 @@
Height = Application.GetRealHeight(50),
};
roomInfoView.AddChidren(floorView);
+ rowCount++;
btnFloorTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -260,6 +274,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
+ Text = room.floor
};
floorView.AddChidren(btnFloorInfo);
btnFloorRight = new Button()
@@ -279,6 +294,7 @@
Height = Application.GetRealHeight(50),
};
roomInfoView.AddChidren(sharedView);
+ rowCount++;
btnSharedTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -315,6 +331,7 @@
Height = Application.GetRealHeight(50),
};
roomInfoView.AddChidren(functionManagemantView);
+ rowCount++;
btnFunctionManagementTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -336,19 +353,25 @@
functionManagemantView.AddChidren(btnFunctionManagementRight);
#endregion
+ roomInfoView.Height = Application.GetRealHeight(51 * rowCount);
btnOption = new Button()
{
Y = Application.GetRealHeight(617),
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.DelRoom
+ TextID = this.pageTitleId == StringId.AddRoom ? StringId.Save : StringId.DeleteRoom,
+ TextSize = CSS_FontSize.SubheadingFontSize,
};
bodyView.AddChidren(btnOption);
-
-
+ if (MainPage.Increase)
+ {
+ btnOption.Y = Application.GetRealHeight(607);
+ btnOption.Height = Application.GetRealHeight(60);
+ }
LoadEventList();
}
@@ -360,7 +383,7 @@
{
pictureOptionView = new FrameLayout()
{
- BackgroundColor = 0x99000000,
+ BackgroundColor = CSS_Color.DialogTransparentColor1,
};
bodyView.AddChidren(pictureOptionView);
@@ -372,6 +395,7 @@
Height = Application.GetRealHeight(150),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealWidth(12),
+ AnimateSpeed = 0.3f,
Animate = Animate.DownToUp,
};
pictureOptionView.AddChidren(optionView);
@@ -409,7 +433,7 @@
TextColor = CSS_Color.TextualColor,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.TakePicture,
+ TextID = StringId.Album,
};
optionView.AddChidren(btnAlbum);
--
Gitblit v1.8.0