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

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

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

@@ -33,7 +33,9 @@
                    LoadRoomRow(newRoom);
                };

                var skipPage = new RoomEditPage(newRoom, StringId.AddRoom,editBackAction);
              

                var skipPage = new RoomEditPage(newRoom, StringId.AddRoom, editBackAction, null);
                MainPage.BasePageView.AddChidren(skipPage);
                skipPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -43,7 +45,7 @@
        /// <summary>
        /// 跳转到编辑房间的界面
        /// </summary>
        void LoadEvent_SkipEditRoomPage(Room r, Button btnRoomName, ImageView btnBg)
        void LoadEvent_SkipEditRoomPage(Room r, Button btnRoomName, ImageView btnBg, FrameLayout roomRow)
        {
            editBackAction = () =>
            {
@@ -67,7 +69,12 @@
                    btnBg.ImagePath = r.backgroundImage;
                }
            };
            var skipPage = new RoomEditPage(r, StringId.EditRoomInfo,editBackAction);

            Action deleteAction = () => {
                roomRow.RemoveFromParent();
            };

            var skipPage = new RoomEditPage(r, StringId.EditRoomInfo, editBackAction, deleteAction);
            MainPage.BasePageView.AddChidren(skipPage);
            skipPage.LoadPage();
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;