Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

 HDL_ON/Entity/Room.cs

@@ -46,9 +46,10 @@
        public SpatialInfo(string spatialType)
        {
            roomType = "FLOOR";
            parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
            parentId = DB_ResidenceData.Instance.CurrentRegion.id;
        }

        public string homeId = "";
        public string roomId = "";
        public string roomName = "";
        //public string roomImage = "";
@@ -56,6 +57,7 @@
        public string roomType = "";
        public string parentId = "";
        public string uid = Guid.NewGuid().ToString();
        public string floorRoomName = "";
        public string createTime = "";
        public string modifyTime = "";
        ///// <summary>
@@ -74,10 +76,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 +91,6 @@
            //楼层房间列表
            if (floorUpdateList != null && floorUpdateList.Count > 0)
            {
                FloorList.Clear();
                foreach (var updateTemp in floorUpdateList)
                {
                    FloorList.Add(updateTemp);
@@ -110,6 +112,15 @@
        {
            get
            {
                if (MainPage.NoLoginMode)
                {
                    if (floors == null)
                    {
                        floors = new List<SpatialInfo>();
                    }
                    return floors;
                }

                if (floors == null)
                {
                    try
@@ -121,13 +132,14 @@
                            MainPage.Log(floorsDataString);
                            floors = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(floorsDataString);
                        }
                        if (floors == null)
                        if(floors == null)
                        {
                            floors = new List<SpatialInfo>();
                        }
                    }
                    catch (Exception ex)
                    {
                            floors = new List<SpatialInfo>();
                        MainPage.Log($"楼层数据初始化失败：{ex.Message}");
                    }
                }
@@ -242,6 +254,14 @@
        {
            get
            {
                if(MainPage.NoLoginMode )
                {
                    if (rooms == null)
                    {
                        rooms = new List<Room>();
                    }
                    return rooms;
                }
                if (rooms == null)
                {
                    try
@@ -325,9 +345,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;
        }
@@ -461,10 +482,10 @@
            }
        }

        /// <summary>
        /// 房间功能列表
        /// </summary>
        List<Function> functions = new List<Function>();
        ///// <summary>
        ///// 房间功能列表
        ///// </summary>
        //List<Function> functions = new List<Function>();
        /// <summary>
        /// 获取房间功能列表
        /// </summary>
@@ -472,8 +493,8 @@
        {
            if (needRefresh)
            {
                functions = new List<Function>();
            }
            var functions = new List<Function>();
            if (functions.Count == 0)
            {
                foreach (var f in FunctionList.List.GetDeviceFunctionList())
@@ -486,22 +507,22 @@
            }
            return functions;
        }
        /// <summary>
        /// 增加房间功能
        /// 操作的是缓存数据，不用保存
        /// </summary>
        public void AddRoomFunction(Function function)
        {
            functions.Add(function);
        }
        /// <summary>
        /// 删除房间功能
        /// 操作的是缓存数据，不用保存
        /// </summary>
        public void RemoveRoomFunction(Function function)
        {
            functions.Remove(functions.Find((obj) => obj.sid == function.sid));
        }
        ///// <summary>
        ///// 增加房间功能
        ///// 操作的是缓存数据，不用保存
        ///// </summary>
        //public void AddRoomFunction(Function function)
        //{
        //    functions.Add(function);
        //}
        ///// <summary>
        ///// 删除房间功能
        ///// 操作的是缓存数据，不用保存
        ///// </summary>
        //public void RemoveRoomFunction(Function function)
        //{
        //    functions.Remove(functions.Find((obj) => obj.sid == function.sid));
        //}
        /// <summary>
        /// 房间场景列表
        /// </summary>