From 488efb508eb0648773fe7b68e810e04bcd7ca075 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:15 +0800
Subject: [PATCH] 20201211

---
 HDL_ON/Entity/Room.cs |   34 ++++++++++++----------------------
 1 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index ea6c102..fd1094c 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -46,7 +46,7 @@
         public SpatialInfo(string spatialType)
         {
             roomType = "FLOOR";
-            parentId = DB_ResidenceData.residenceData.CurReginID;
+            parentId = UserInfo.Current.CurReginID;
         }
 
         public string roomId = "";
@@ -182,7 +182,7 @@
                     }
                 }
                 var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
-                FileUtils.WriteFileByBytes(dataSavePath, ssd);
+                Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
             }
         }
 
@@ -202,7 +202,7 @@
                 {
                     try
                     {
-                        var floorsDataBytes = FileUtils.ReadFile("FloorsData");
+                        var floorsDataBytes = Common.FileUtlis.Files.ReadFile("FloorsData");
                         if (floorsDataBytes != null)
                         {
                             var floorsDataString = System.Text.Encoding.UTF8.GetString(floorsDataBytes);
@@ -264,7 +264,7 @@
                     }
                 }
                 var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(CurrentSpatial.FloorList));
-                FileUtils.WriteFileByBytes(dataSavePath, ssd);
+                Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
             }
             return revPack.Code;
         }
@@ -279,7 +279,7 @@
             if (revPack.Code == StateCode.SUCCESS)
             {
                 var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
-                FileUtils.WriteFileByBytes(dataSavePath, ssd);
+                Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
             }
             return revPack.Code;
         }
@@ -301,7 +301,7 @@
                     CurrentSpatial.FloorList.Remove(tRoom);
                 }
                 var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FloorList));
-                FileUtils.WriteFileByBytes(dataSavePath, ssd);
+                Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
             }
             else
             {
@@ -329,13 +329,13 @@
                     try
                     {
                         rooms = new List<Room> { };
-                        var filePathList = FileUtils.ReadFiles();
+                        var filePathList = Common.FileUtlis.Files.ReadFiles();
 
                         foreach (var filePath in filePathList)
                         {
                             if (filePath.StartsWith("RoomData_"))
                             {
-                                var roomDataBytes = FileUtils.ReadFile(filePath);
+                                var roomDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
                                 var roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);
                                 var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
                                 if (room != null)
@@ -375,7 +375,7 @@
                             room = tempRoom as Room;
                             CurrentSpatial.RoomList.Add(room);
                             var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(room));
-                            FileUtils.WriteFileByBytes(dataSavePath, ssd);
+                            Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
                         }
                     }
                 }
@@ -397,7 +397,7 @@
                 {
                     CurrentSpatial.RoomList.Remove(room);
                 }
-                FileUtils.DeleteFile(room.dataSavePath);
+                Common.FileUtlis.Files.DeleteFile(room.dataSavePath);
             }
             return pack.Code;
         }
@@ -408,7 +408,7 @@
         {
             foreach(var localRoom in RoomList)
             {
-                FileUtils.DeleteFile(localRoom.dataSavePath);
+                Common.FileUtlis.Files.DeleteFile(localRoom.dataSavePath);
             }
             RoomList.Clear();
         }
@@ -450,7 +450,7 @@
             if (needSave)
             {
                 var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
-                FileUtils.WriteFileByBytes(dataSavePath, ssd);
+                Common.FileUtlis.Files.WriteFileByBytes(dataSavePath, ssd);
             }
             return packCode;
         }
@@ -503,16 +503,6 @@
                     if (f != null)
                     {
                         return f.roomName + " ";
-                    }
-                    else
-                    {
-                        foreach(var f1 in CurrentSpatial.FloorList)
-                        {
-                            if(f1.uid == parentId)
-                            {
-                                return f.roomName + " ";
-                            }
-                        }
                     }
                 }
                 return "";

--
Gitblit v1.8.0