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 | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index fa90b58..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,
@@ -118,7 +138,6 @@
residenceNameRow.AddChidren(btnEditResidenceNameIcon);
#endregion
-#if stage2
residenceNameRow.AddChidren(
new Button()
{
@@ -169,7 +188,6 @@
};
residenceAddressRow.AddChidren(btnResidenceAddress);
#endregion
-#endif
#region 妤煎眰绠＄悊
floorManagementRow = new FrameLayout()
{
@@ -209,9 +227,9 @@
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
});
-#endregion
+ #endregion
-#region 鎴块棿绠＄悊
+ #region 鎴块棿绠＄悊
roomManagementRow = new FrameLayout()
{
Y = floorManagementRow.Bottom,
@@ -240,9 +258,10 @@
UnSelectedImagePath = "Public/RightIcon.png",
};
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
-#endregion
+ #endregion
-#region 绠＄悊鍛樻潈闄愯縼绉�
+
+ #region 绠＄悊鍛樻潈闄愯縼绉�
FrameLayout administratorPermissionMigrationRow;
administratorPermissionMigrationRow = new FrameLayout()
{
@@ -298,10 +317,10 @@
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
});
-#endregion
+ #endregion
-#region 杩囨埛
- FrameLayout transferRow;
+ #region 杩囨埛
+
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),
@@ -346,9 +364,9 @@
UnSelectedImagePath = "Public/RightIcon.png",
};
transferRow.AddChidren(btnTrasferSkinIcon);
-#endregion
+ #endregion
-#region 璋冭瘯鏉冮檺
+ #region 璋冭瘯鏉冮檺
FrameLayout commissioningAuthorityRow;
commissioningAuthorityRow = new FrameLayout()
{
@@ -396,7 +414,7 @@
};
commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);
-#endregion
+ #endregion
LoadEventList();
--
Gitblit v1.8.0