20201212-1

wei

2020-12-12 73cd2b147d98acb3a945b7b5daad39103fd4377d

 HDL_ON/Entity/Room.cs

@@ -261,6 +261,7 @@
                    if(addFloor!= null)
                    {
                        CurrentSpatial.FloorList.Add(addFloor);
                        floor = addFloor;
                    }
                }
                var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(CurrentSpatial.FloorList));
@@ -415,8 +416,14 @@

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

        /// <summary>
@@ -531,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)
                    {
@@ -573,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)
                    {