From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 01 十二月 2020 17:20:01 +0800 Subject: [PATCH] Merge branch 'master' into WJC --- HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs index 5346fda..67ceca9 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs @@ -9,14 +9,14 @@ { FrameLayout bodyView; VerticalScrolViewLayout contentView; - Function scene; + Scene scene; Button lastButton; Action backAction; - public SetSceneLocationPage(Function function, Action action) + public SetSceneLocationPage(Scene s, Action action) { backAction = action; bodyView = this; - scene = function; + scene = s; } public void LoadPage() @@ -67,7 +67,7 @@ Tag = "ChooseIcon" }; roomView.AddChidren(btnChoose); - if(scene.roomIdList.Contains(room.sid)) + if(scene.roomIds.Contains(room.sid)) { btnChoose.IsSelected = true; lastButton = btnChoose; @@ -104,8 +104,8 @@ } lastButton = btn; btn.IsSelected = true; - scene.roomIdList = new System.Collections.Generic.List<string>(); - scene.roomIdList.Add(room.sid); + scene.roomIds = new System.Collections.Generic.List<string>(); + scene.roomIds.Add(room.sid); this.RemoveFromParent(); backAction(); }; -- Gitblit v1.8.0