Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs

@@ -57,6 +57,13 @@
        /// </summary>
        Button btnCommissioningAuthoritySwitchIcon;

        #region 管理员权限迁移
        FrameLayout administratorPermissionMigrationRow;
        Button btnAdministratorPermissionMigrationTitle;
        Button btnAdministratorPermissionMigrationExplan;
        Button btnAdministratorPermissionMigrationSkinIcon;
        #endregion

        #region 过户
        /// <summary>
        /// 
@@ -262,7 +269,6 @@


            #region 管理员权限迁移
            FrameLayout administratorPermissionMigrationRow;
            administratorPermissionMigrationRow = new FrameLayout()
            {
                Y = Application.GetRealHeight(8) + roomManagementRow.Bottom,
@@ -271,7 +277,7 @@
            };
            bodyView.AddChidren(administratorPermissionMigrationRow);

            var btnAdministratorPermissionMigrationTitle = new Button()
            btnAdministratorPermissionMigrationTitle = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(10),
@@ -284,7 +290,7 @@
            };
            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);

            var btnAdministratorPermissionMigrationExplan = new Button()
            btnAdministratorPermissionMigrationExplan = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = btnAdministratorPermissionMigrationTitle.Bottom,
@@ -297,7 +303,7 @@
            };
            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);

            Button btnAdministratorPermissionMigrationSkinIcon;
          
            btnAdministratorPermissionMigrationSkinIcon = new Button()
            {
                X = Application.GetRealWidth(343),