Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-19 4a9318077bd095fbc7c57c593e5ca8185603dac4

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

old mode 100644
new mode 100755
@@ -34,7 +34,13 @@
                ReLoadPage();
                ReloadRoomName();
            };
            var skipPage = new RoomEditPage(room, StringId.EditRoomInfo, editBackAction);

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

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