From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'

---
 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 25511ec..b995002 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -364,7 +364,7 @@
                 view.AddChidren(btnCollection);
                 btnCollection.MouseUpEventHandler = (sender, e) => {
                     scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
-                    scene.SaveSceneData(true);
+                    scene.CollectScene();
                 };
                 LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);
                 btnSettingIcon.MouseUpEventHandler = (sender, e) => {
@@ -374,13 +374,12 @@
                     Action refreshAction = () => {
                         btnName.Text = scene.name;
                         btnZone.Text = scene.GetRoomListName();
-                        //view.BackgroundImagePath = scene.ImagePath;
                         //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
                         ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
                     };
                     var aep = new SceneEditPage(scene, backAction);
                     MainPage.BasePageView.AddChidren(aep);
-                    aep.LoadPage(StringId.EditScene, refreshAction);
+                    aep.LoadPage(refreshAction);
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 };
             }

--
Gitblit v1.8.0