2019.11.6

gxc

2019-11-06 71f1df7772feec5cf83feefa851608adac18e005

 ZigbeeApp/Shared/Common/Room.cs

@@ -266,10 +266,10 @@
        /// </summary>
        public static void InitAllRoom()
        {
            if (CanInitAllRoom == false)
            {
                return;
            }
            //if (CanInitAllRoom == false)
            //{
            //    return;
            //}
            Lists.Clear();
            if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
            {
@@ -638,6 +638,10 @@
        /// <returns></returns>
        public  List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
        {
            if(Config.Instance.Home.FloorDics.Count==0)
            {
                return Lists;
            }
            var r = Lists.FindAll((obj) => obj.FloorId == Config.Instance.Home.CurrentFloorId);
            r.Insert(0, GetLoveRoom());
            return r;