个人中心添加楼层和创建房间，实装二级验证

黄学彪

2019-10-10 4f92fe4e4397b05bc97d17e8ad02818a689acdb8

 ZigbeeApp/Shared/Common/Room.cs

@@ -36,14 +36,24 @@
        /// 楼层Id
        /// 新增时使用Guid
        /// </summary>
        public string FloorId = string.Empty;
        public string FloorId = "Floor1";
        /// <summary>
        /// 楼层名称
        /// </summary>
        public string FloorName
        {
            get
            {
               return GetFloorNameById(FloorId);
            }
        }
        /// <summary>
        /// 房间名
        /// </summary>
        public string Name = string.Empty;

        /// <summary>
        /// 房间的时候背景图
        /// 房间背景图
        /// </summary>
        public string BackgroundImage = string.Empty;

@@ -73,6 +83,11 @@
        public readonly List<string> DeviceUIFilePathList = new List<string>();

        /// <summary>
        /// 喜爱房间id
        /// </summary>
        public const string LoveRoomId= "Favorite";

        /// <summary>
        /// 是否是默认喜爱房间
        /// </summary>
        /// <value><c>true</c> if is love; otherwise, <c>false</c>.</value>
@@ -81,7 +96,7 @@
        {
            get
            {
                return Id == "Favorite";
                return Id == LoveRoomId;
            }
        }

@@ -110,8 +125,7 @@
                {
                    return new List<string> { };
                }
                var loveRoom = Lists[0];
                return loveRoom.DeviceUIFilePathList;
                return GetLoveRoom().DeviceUIFilePathList;
            }
        }

@@ -204,7 +218,7 @@
            if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
            {
                //默认添加喜爱的房间--禁止修改房间名
                var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "Room/r0.png", Id = "Favorite" };
                var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "Room/r0.png", Id = LoveRoomId };
                love.Save(true);
                //添加到house 房间路径列表
                var currentHome = Config.Instance.Home;
@@ -321,6 +335,15 @@
        #endregion

        #region ◆ 获取房间________________________

        /// <summary>
        /// 获取喜爱房间
        /// </summary>
        /// <returns></returns>
        public static Room GetLoveRoom()
        {
            return CurrentRoom.GetRoomById(LoveRoomId);
        }

        /// <summary>
        /// 通过路径获取房间
@@ -897,6 +920,28 @@

        #endregion

        #region ◆ 设备是否收藏______________________

        /// <summary>
        /// 是否是收藏设备
        /// </summary>
        /// <param name="room"></param>
        /// <param name="filePath"></param>
        /// <returns></returns>
        public bool IsCollectInRoom(Room room,string filePath)
        {
            if(room.IsLove)
            {
                return true;
            }
            if (GetLoveRoom().DeviceUIFilePathList.Find((obj) => obj == filePath) == null)
            {
                return false;
            }
            return true;
        }
        #endregion

        #region ◆ 修改场景________________________

        /// <summary>
@@ -1121,7 +1166,7 @@
            var dicRoom = new Dictionary<string, Common.Room>();

            foreach (var room in Common.Room.Lists)

            {

                if (room.FloorId != i_floorKeys)

                if (room.FloorId != i_floorKeys || room.IsLove == true)

                {

                    //不是同一个楼层

                    continue;

@@ -1245,5 +1290,33 @@
        }



        #endregion

        #region ◆ 楼层___________________________

        /// <summary>
        /// 获取楼层名称
        /// </summary>
        /// <param name="floorId"></param>
        /// <returns></returns>
        public string GetFloorNameById(string floorId)
        {
            if (Config.Instance.Home.FloorDics.Count == 0)
            {
                return null;
            }

            foreach (var floor in Config.Instance.Home.FloorDics)
            {
                if (floorId == floor.Key)
                {
                    return floor.Value;
                }
            }
            return null;
        }

        #endregion

       
    }
}