From 8983da138cb92e35b0bbeaece1cf1c454a5a79d4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 01 十二月 2020 16:31:28 +0800
Subject: [PATCH] 20201201
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs
index 93f9fad..18d58cc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs
@@ -142,8 +142,8 @@
{
continue;
}
- function.roomIdList.Remove(null);
- if (scene.sceneFunctionList.Find((obj) => obj.sid == function.sid) != null)
+ function.roomIds.Remove(null);
+ if (scene.functions.Find((obj) => obj.sid == function.sid) != null)
{
allocatedList.Add(function);
}
@@ -180,7 +180,7 @@
//鎸夋ゼ灞傜瓫閫�
if (!string.IsNullOrEmpty(screen1))
{
- if (!function.roomIdList.Contains(screen1))
+ if (!function.roomIds.Contains(screen1))
{
continue;
}
@@ -463,7 +463,7 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var ssf = new SceneFunctionInfoEditPage(scene, function, refreshAction);
+ var ssf = new SceneFunctionInfoEditPage(scene, function.ConvertSceneFunction(), refreshAction);
MainPage.BasePageView.AddChidren(ssf);
ssf.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0