Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

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