Merge branch 'CJL-NEW'

wxr

2020-12-06 6b8177fe424b661687e9fb8119f990c05b054f2b

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

@@ -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()
                {