From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs | 97 ++++++++++++++++++++++++++----------------------
1 files changed, 53 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs
index d011d6d..00cdc9d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPage.cs
@@ -144,7 +144,7 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- if(pageTitleId == StringId.AddRoom)
+ if (pageTitleId == StringId.AddRoom)
{
new TopViewDiv(bodyView, Language.StringByID(pageTitleId)).LoadTopView();
}
@@ -274,7 +274,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = room.floor
+ Text = room.floorName
};
floorView.AddChidren(btnFloorInfo);
btnFloorRight = new Button()
@@ -289,41 +289,44 @@
roomInfoView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
#region 鍒嗕韩
- sharedView = new FrameLayout()
+ if (pageTitleId != StringId.AddRoom)
{
- Height = Application.GetRealHeight(50),
- };
- roomInfoView.AddChidren(sharedView);
- rowCount++;
- btnSharedTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.Shared,
- };
- sharedView.AddChidren(btnSharedTitle);
- btnSharedInfo = new Button()
- {
- X = Application.GetRealWidth(100),
- Width = Application.GetRealWidth(230),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- };
- sharedView.AddChidren(btnSharedInfo);
- btnSharedRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- sharedView.AddChidren(btnSharedRight);
- roomInfoView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+ sharedView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ roomInfoView.AddChidren(sharedView);
+ rowCount++;
+ btnSharedTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(120),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.Shared,
+ };
+ sharedView.AddChidren(btnSharedTitle);
+ btnSharedInfo = new Button()
+ {
+ X = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(230),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
+ };
+ sharedView.AddChidren(btnSharedInfo);
+ btnSharedRight = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ sharedView.AddChidren(btnSharedRight);
+ roomInfoView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+ }
#endregion
#region 鍔熻兘绠＄悊
functionManagemantView = new FrameLayout()
@@ -381,22 +384,28 @@
/// </summary>
void LoadPictureOptionView()
{
- pictureOptionView = new FrameLayout()
+ var baseView = new FrameLayout()
{
BackgroundColor = CSS_Color.DialogTransparentColor1,
};
- bodyView.AddChidren(pictureOptionView);
+ bodyView.AddChidren(baseView);
+
+ pictureOptionView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(445),
+ Height = Application.GetRealHeight(250),
+ AnimateSpeed = 0.3f,
+ Animate = Animate.DownToUp,
+ };
+ baseView.AddChidren(pictureOptionView);
optionView = new VerticalScrolViewLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(445),
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(150),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealWidth(12),
- AnimateSpeed = 0.3f,
- Animate = Animate.DownToUp,
};
pictureOptionView.AddChidren(optionView);
@@ -446,15 +455,15 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(6),
+ Radius = (uint)Application.GetRealWidth(12),
TextID = StringId.Cancel,
TextColor = CSS_Color.WarningColor,
- Animate = Animate.DownToUp
+ TextSize = CSS_FontSize.SubheadingFontSize,
};
pictureOptionView.AddChidren(btnCancel);
- LoadEvent_PictureOptionViewEventList();
+ LoadEvent_PictureOptionViewEventList(baseView);
}
}
--
Gitblit v1.8.0