Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

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

@@ -34,7 +34,14 @@
                ReLoadPage();
                ReloadRoomName();
            };
            var skipPage = new RoomEditPage(room, StringId.EditRoomInfo, editBackAction);

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

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