From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'

---
 HDL_ON/UI/UI2/2-Classification/RoomPage.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 86f95da..7498456 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/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()
                 {

--
Gitblit v1.8.0