2020-12-12 1.修改退出登录方法。

JLChen

2020-12-12 25afbc347932821c7b8bc4d9a6a7acb73eb3f969

 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);
@@ -261,10 +261,11 @@
                    if(addFloor!= null)
                    {
                        CurrentSpatial.FloorList.Add(addFloor);
                        floor = addFloor;
                    }
                }
                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 +280,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 +302,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 +330,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 +376,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 +398,7 @@
                {
                    CurrentSpatial.RoomList.Remove(room);
                }
                FileUtils.DeleteFile(room.dataSavePath);
                Common.FileUtlis.Files.DeleteFile(room.dataSavePath);
            }
            return pack.Code;
        }
@@ -408,10 +409,23 @@
        {
            foreach(var localRoom in RoomList)
            {
                FileUtils.DeleteFile(localRoom.dataSavePath);
                Common.FileUtlis.Files.DeleteFile(localRoom.dataSavePath);
            }
            RoomList.Clear();
            rooms = null;
        }

        public void ClearRooms()
        {
            if (floors != null)
            {
                floors.Clear();
            }
            if (rooms != null)
            {
                rooms.Clear();
            }
        }

        /// <summary>
        /// 初始化每个房间的功能数据
        /// </summary>
@@ -450,7 +464,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;
        }
@@ -504,16 +518,6 @@
                    {
                        return f.roomName + " ";
                    }
                    else
                    {
                        foreach(var f1 in CurrentSpatial.FloorList)
                        {
                            if(f1.uid == parentId)
                            {
                                return f.roomName + " ";
                            }
                        }
                    }
                }
                return "";
            }
@@ -534,7 +538,7 @@
            }
            if (functions.Count == 0)
            {
                foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
                foreach (var f in FunctionList.List.GetDeviceFunctionList())
                {
                    if (f.roomIds.Contains(roomId) && roomId != null)
                    {
@@ -576,7 +580,7 @@
            }
            if (scenes.Count == 0)
            {
                foreach (var s in DB_ResidenceData.functionList.scenes)
                foreach (var s in FunctionList.List.scenes)
                {
                    if (s.roomIds.Contains(roomId) && roomId != null)
                    {