Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

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

@@ -54,7 +54,7 @@
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            new TopViewDiv(bodyView,room.name).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
            new TopViewDiv(bodyView,room.roomName).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);

            functionListView = new VerticalScrolViewLayout()
            {
@@ -178,7 +178,7 @@
            };
            bodyDiv.AddChidren(btnCollectionIcon);
            btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
            if ((scene as Scene).sceneType == SceneType.MovieScene)
            if (scene.sceneType == SceneType.MovieScene)
            {
                var movieIcon = new Button()
                {