From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 14 十二月 2020 17:45:17 +0800 Subject: [PATCH] 2020-12-14 1.解锁设置问题修复,增加面容ID验证。2.错误码对接增加。 --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 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..a974595 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs @@ -57,6 +57,32 @@ /// </summary> Button btnCommissioningAuthoritySwitchIcon; + #region 绠$悊鍛樻潈闄愯縼绉� + FrameLayout administratorPermissionMigrationRow; + Button btnAdministratorPermissionMigrationTitle; + Button btnAdministratorPermissionMigrationExplan; + Button btnAdministratorPermissionMigrationSkinIcon; + #endregion + + #region 杩囨埛 + /// <summary> + /// + /// </summary> + FrameLayout transferRow; + /// <summary> + /// + /// </summary> + Button btnTransferTitle; + /// <summary> + /// + /// </summary> + Button btnTrasferExplan; + /// <summary> + /// + /// </summary> + Button btnTrasferSkinIcon; + #endregion + #endregion /// <summary> /// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁� @@ -101,7 +127,7 @@ { X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right, Width = Application.GetRealWidth(200), - Text = DB_ResidenceData.residenceData.residecenInfo.Name, + Text = DB_ResidenceData.Instance.CurrentRegion.Name, TextSize = CSS_FontSize.TextFontSize, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.TextualColor, @@ -119,7 +145,6 @@ residenceNameRow.AddChidren(btnEditResidenceNameIcon); #endregion -#if stage2 residenceNameRow.AddChidren( new Button() { @@ -163,14 +188,13 @@ { X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right, Width = Application.GetRealWidth(200), - Text = DB_ResidenceData.residenceData.residecenInfo.Address, + Text = DB_ResidenceData.Instance.CurrentRegion.Address, TextSize = CSS_FontSize.TextFontSize, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.TextualColor, }; residenceAddressRow.AddChidren(btnResidenceAddress); #endregion -#endif #region 妤煎眰绠$悊 floorManagementRow = new FrameLayout() { @@ -243,10 +267,8 @@ roomManagementRow.AddChidren(btnRoomManagementSkinIcon); #endregion -#if stage2 #region 绠$悊鍛樻潈闄愯縼绉� - FrameLayout administratorPermissionMigrationRow; administratorPermissionMigrationRow = new FrameLayout() { Y = Application.GetRealHeight(8) + roomManagementRow.Bottom, @@ -255,7 +277,7 @@ }; bodyView.AddChidren(administratorPermissionMigrationRow); - var btnAdministratorPermissionMigrationTitle = new Button() + btnAdministratorPermissionMigrationTitle = new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealHeight(10), @@ -268,7 +290,7 @@ }; administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle); - var btnAdministratorPermissionMigrationExplan = new Button() + btnAdministratorPermissionMigrationExplan = new Button() { X = Application.GetRealWidth(16), Y = btnAdministratorPermissionMigrationTitle.Bottom, @@ -281,7 +303,7 @@ }; administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan); - Button btnAdministratorPermissionMigrationSkinIcon; + btnAdministratorPermissionMigrationSkinIcon = new Button() { X = Application.GetRealWidth(343), @@ -304,7 +326,7 @@ #endregion #region 杩囨埛 - FrameLayout transferRow; + transferRow = new FrameLayout() { Y = administratorPermissionMigrationRow.Bottom, @@ -313,7 +335,7 @@ }; bodyView.AddChidren(transferRow); - var btnTransferTitle = new Button() + btnTransferTitle = new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealHeight(10), @@ -326,7 +348,7 @@ }; transferRow.AddChidren(btnTransferTitle); - var btnTrasferExplan = new Button() + btnTrasferExplan = new Button() { X = Application.GetRealWidth(16), Y = btnTransferTitle.Bottom, @@ -339,7 +361,6 @@ }; transferRow.AddChidren(btnTrasferExplan); - Button btnTrasferSkinIcon; btnTrasferSkinIcon = new Button() { X = Application.GetRealWidth(343), @@ -401,7 +422,6 @@ #endregion -#endif LoadEventList(); } -- Gitblit v1.8.0