20201201

wei

2020-12-01 8983da138cb92e35b0bbeaece1cf1c454a5a79d4

 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;