From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 110 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 46 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index f60948b..35d4bff 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -57,6 +57,25 @@
/// </summary>
Button btnCommissioningAuthoritySwitchIcon;
+ #region 杩囨埛
+ /// <summary>
+ ///
+ /// </summary>
+ FrameLayout transferRow;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTransferTitle;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTrasferExplan;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTrasferSkinIcon;
+ #endregion
+
#endregion
/// <summary>
/// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁�
@@ -79,7 +98,8 @@
#region 浣忓畢鍚嶇О
FrameLayout residenceNameRow;
- residenceNameRow = new FrameLayout() {
+ residenceNameRow = new FrameLayout()
+ {
Y = Application.GetRealHeight(72),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
@@ -98,7 +118,7 @@
btnResidenceName = new Button()
{
- X = Application.GetRealWidth(2)+ btnResidenceNameTitle.Right,
+ X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
Width = Application.GetRealWidth(200),
Text = DB_ResidenceData.residenceData.residecenInfo.Name,
TextSize = CSS_FontSize.TextFontSize,
@@ -117,6 +137,7 @@
};
residenceNameRow.AddChidren(btnEditResidenceNameIcon);
+ #endregion
residenceNameRow.AddChidren(
new Button()
{
@@ -126,54 +147,51 @@
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
});
- #endregion
-
#region 浣忓畢鍦板潃
- var residenceAddressRow = new FrameLayout()
- {
- Y = residenceNameRow.Bottom,
- Height = Application.GetRealHeight(50),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(residenceAddressRow);
+ var residenceAddressRow = new FrameLayout()
+ {
+ Y = residenceNameRow.Bottom,
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ bodyView.AddChidren(residenceAddressRow);
- var btnResidenceAddressTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(78),
- TextID = StringId.ResidenceAddress,
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- };
- residenceAddressRow.AddChidren(btnResidenceAddressTitle);
+ var btnResidenceAddressTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(78),
+ TextID = StringId.ResidenceAddress,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ residenceAddressRow.AddChidren(btnResidenceAddressTitle);
- btnLocationAddressIcon = new Button()
- {
- X = Application.GetRealWidth(333),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "Public/LocationAddressIcon.png",
- };
- residenceAddressRow.AddChidren(btnLocationAddressIcon);
+ btnLocationAddressIcon = new Button()
+ {
+ X = Application.GetRealWidth(333),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/LocationAddressIcon.png",
+ };
+ residenceAddressRow.AddChidren(btnLocationAddressIcon);
- btnResidenceAddress = new Button()
- {
- X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
- Width = Application.GetRealWidth(200),
- Text = DB_ResidenceData.residenceData.residecenInfo.Address,
- TextSize = CSS_FontSize.TextFontSize,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.TextualColor,
- };
- residenceAddressRow.AddChidren(btnResidenceAddress);
+ btnResidenceAddress = new Button()
+ {
+ X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
+ Width = Application.GetRealWidth(200),
+ Text = DB_ResidenceData.residenceData.residecenInfo.Address,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.TextualColor,
+ };
+ residenceAddressRow.AddChidren(btnResidenceAddress);
#endregion
-
#region 妤煎眰绠＄悊
floorManagementRow = new FrameLayout()
{
- Y = Application.GetRealHeight(8) + residenceAddressRow.Bottom,
+ Y = Application.GetRealHeight(8) + residenceNameRow.Bottom,// residenceAddressRow.Bottom,
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -242,6 +260,7 @@
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
#endregion
+
#region 绠＄悊鍛樻潈闄愯縼绉�
FrameLayout administratorPermissionMigrationRow;
administratorPermissionMigrationRow = new FrameLayout()
@@ -301,7 +320,7 @@
#endregion
#region 杩囨埛
- FrameLayout transferRow;
+
transferRow = new FrameLayout()
{
Y = administratorPermissionMigrationRow.Bottom,
@@ -310,7 +329,7 @@
};
bodyView.AddChidren(transferRow);
- var btnTransferTitle = new Button()
+ btnTransferTitle = new Button()
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(10),
@@ -323,7 +342,7 @@
};
transferRow.AddChidren(btnTransferTitle);
- var btnTrasferExplan = new Button()
+ btnTrasferExplan = new Button()
{
X = Application.GetRealWidth(16),
Y = btnTransferTitle.Bottom,
@@ -336,7 +355,6 @@
};
transferRow.AddChidren(btnTrasferExplan);
- Button btnTrasferSkinIcon;
btnTrasferSkinIcon = new Button()
{
X = Application.GetRealWidth(343),
--
Gitblit v1.8.0