Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

 HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs

@@ -26,18 +26,26 @@
        /// <summary>
        /// 跳转到编辑房间的界面
        /// </summary>
        void LoadEvent_SkipEditRoomPage()//Room r, Button btnRoomName, Button btnBg)
        void LoadEvent_SkipEditRoomPage()
        {

            Action editBackAction = () =>
            {
                
                room.UpdataRoomInfo();
                ReLoadPage();
                ReloadRoomName();
            };
            var skipPage = new RoomEditPage(room, StringId.EditRoomInfo, editBackAction);

            Action delAction = () => {
                this.RemoveFromParent();
                deleteAction?.Invoke();
            };

            var skipPage = new RoomEditPage(room, editBackAction, delAction, this.modifyImageAction);
            MainPage.BasePageView.AddChidren(skipPage);
            skipPage.LoadPage();
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
        }


    }
}