From 6c027ca3f13f622c59f45c42f476dd9939ad5226 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 21 五月 2020 13:49:21 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm

---
 ZigbeeApp20200519/Shared/Phone/Category/AddOrEditorSceneForm.cs |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp20200519/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp20200519/Shared/Phone/Category/AddOrEditorSceneForm.cs
index 4ff409d..0c86547 100755
--- a/ZigbeeApp20200519/Shared/Phone/Category/AddOrEditorSceneForm.cs
+++ b/ZigbeeApp20200519/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -864,6 +864,15 @@
                 //鍙樻洿鎴块棿
                 HdlSceneLogic.Current.ChangedSceneRoom(this.editorScene, this.nowRoomId);
             }
+            else
+            {
+                //绉婚櫎鍑烘埧闂�
+                var room = HdlRoomLogic.Current.GetRoomBySceneId(this.editorScene.Id);
+                if (room != null)
+                {
+                    HdlSceneLogic.Current.DeleteSceneFromRoom(room, this.editorScene);
+                }
+            }
 
             //鍥剧墖鏀瑰彉浜�
             if (isScenePictrueChanged == true)

--
Gitblit v1.8.0