Merge branch 'WJC' into temp-wxr

wxr

2021-06-23 7addb1dc6d80cc48c0478aa7ac9820363d4eebf6

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

@@ -100,7 +100,10 @@
                            if (row.Tag.ToString() == btn.Tag.ToString())
                            {
                                row.RemoveFromParent();
                                floorsListView.Height = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
                                int count = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
                                var contentViewHeight = (count + 1) * Application.GetRealHeight(50);
                                contentView.Height = contentViewHeight;
                                floorsListView.Height = count * Application.GetRealHeight(50);
                            }
                        }
                    }