Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-22 bac00b1bc932d3a85f90986466757b24d9407d61

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

@@ -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, this.modifyImageAction);
            MainPage.BasePageView.AddChidren(skipPage);
            skipPage.LoadPage();
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;