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 | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index 7764829..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>
/// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁�
@@ -119,7 +138,6 @@
residenceNameRow.AddChidren(btnEditResidenceNameIcon);
#endregion
-#if stage2
residenceNameRow.AddChidren(
new Button()
{
@@ -170,7 +188,6 @@
};
residenceAddressRow.AddChidren(btnResidenceAddress);
#endregion
-#endif
#region 妤煎眰绠＄悊
floorManagementRow = new FrameLayout()
{
@@ -243,7 +260,6 @@
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
#endregion
-#if stage2
#region 绠＄悊鍛樻潈闄愯縼绉�
FrameLayout administratorPermissionMigrationRow;
@@ -304,7 +320,7 @@
#endregion
#region 杩囨埛
- FrameLayout transferRow;
+
transferRow = new FrameLayout()
{
Y = administratorPermissionMigrationRow.Bottom,
@@ -313,7 +329,7 @@
};
bodyView.AddChidren(transferRow);
- var btnTransferTitle = new Button()
+ btnTransferTitle = new Button()
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(10),
@@ -326,7 +342,7 @@
};
transferRow.AddChidren(btnTransferTitle);
- var btnTrasferExplan = new Button()
+ btnTrasferExplan = new Button()
{
X = Application.GetRealWidth(16),
Y = btnTransferTitle.Bottom,
@@ -339,7 +355,6 @@
};
transferRow.AddChidren(btnTrasferExplan);
- Button btnTrasferSkinIcon;
btnTrasferSkinIcon = new Button()
{
X = Application.GetRealWidth(343),
@@ -401,7 +416,6 @@
#endregion
-#endif
LoadEventList();
}
--
Gitblit v1.8.0