Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

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

@@ -43,7 +43,7 @@
        /// <summary>
        /// 跳转到编辑房间的界面
        /// </summary>
        void LoadEvent_SkipEditRoomPage(Room r,Button btnRoomName,Button btnBg)
        void LoadEvent_SkipEditRoomPage(Room r, Button btnRoomName, ImageView btnBg)
        {
            editBackAction = () =>
            {
@@ -64,7 +64,7 @@
                else
                {
                    btnRoomName.Text = r.floorName + r.name;
                    btnBg.UnSelectedImagePath = r.backgroundImage;
                    btnBg.ImagePath = r.backgroundImage;
                }
            };
            var skipPage = new RoomEditPage(r, StringId.EditRoomInfo,editBackAction);