合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

 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>
        /// 房间里所有的设备列表
@@ -114,12 +130,6 @@
        /// 注：分享过来的房间不能删除，不能编辑该房间，不能对设备（功能）、场景进行增删改
        /// </summary>
        public bool IsSharedRoom = false;

        /// <summary>
        /// 是否可以刷新房间数据了
        /// 需要等初始化本地设备数据后在可以初始化房间数据
        /// </summary>
        public static bool CanInitAllRoom;

        /// <summary>
        /// 获取喜爱房间的所有设备路径
@@ -266,10 +276,6 @@
        /// </summary>
        public static void InitAllRoom()
        {
            if (CanInitAllRoom == false)
            {
                return;
            }
            Lists.Clear();
            if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
            {
@@ -289,7 +295,7 @@
                {
                    if (room.IsSharedRoom)
                    {
                        room.Name = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){room.Name}";
                        room.Name = $"{room.Name}";
                    }
                    Lists.Add(room);
                }
@@ -323,7 +329,6 @@
                }

            }

            homeTemp.Save(false);

            CanInitAllRoom = true;

            InitAllRoom();

        }

@@ -622,6 +627,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;