From 4a83749337096aae6dd5ec4f44f16653fbc7268a Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 10 三月 2021 16:19:52 +0800 Subject: [PATCH] 2021-03-10 1.合并 --- HDL_ON/Entity/Room.cs | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs index 055a4c6..e932b22 100644 --- a/HDL_ON/Entity/Room.cs +++ b/HDL_ON/Entity/Room.cs @@ -74,10 +74,11 @@ { var roomUpdateList = spatials.FindAll((obj) => obj.roomType == "ROOM"); var floorUpdateList = spatials.FindAll((obj) => obj.roomType == "FLOOR"); + CurrentSpatial.DeleteAllRoom(); + FloorList.Clear(); //澶勭悊鎴块棿鍒楄〃 if (roomUpdateList != null && roomUpdateList.Count > 0) { - CurrentSpatial.DeleteAllRoom(); foreach (var newRoom in roomUpdateList) { newRoom.SaveRoomFile(); @@ -88,7 +89,6 @@ //妤煎眰鎴块棿鍒楄〃 if (floorUpdateList != null && floorUpdateList.Count > 0) { - FloorList.Clear(); foreach (var updateTemp in floorUpdateList) { FloorList.Add(updateTemp); @@ -325,9 +325,10 @@ /// </summary> public void DeleteAllRoom() { - foreach(var localRoom in RoomList) + for(int i=0;i< RoomList.Count;) { - Common.FileUtlis.Files.DeleteFile(localRoom.dataSavePath); + Common.FileUtlis.Files.DeleteFile(RoomList[i].dataSavePath); + RoomList.RemoveAt(i); } rooms = null; } -- Gitblit v1.8.0