合并了全部的代码，IOS 图片需要从新引入工程

黄学彪

2019-11-07 82a773d1783549caca563831aac8affc059deedf

 ZigbeeApp/Shared/Common/Room.cs

@@ -76,10 +76,26 @@
        /// </summary>
        public string HumidityDevice = string.Empty;

        /// <summary>

        /// 当前选择的房间

        /// </summary>
        private static Room m_CurrentRoom = null;
        /// <summary>
        /// 当前选择的房间
        /// </summary>
        public static Room CurrentRoom;
        [Newtonsoft.Json.JsonIgnore]
        public static Room CurrentRoom

        {

            get

            {

                if (m_CurrentRoom == null && Lists.Count > 0)

                {

                    return Lists[0];

                }

                return m_CurrentRoom;

            }

            set { m_CurrentRoom = value; }

        }

        /// <summary>
        /// 房间里所有的设备列表
@@ -266,10 +282,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)
            {
@@ -622,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;