2019-10-14-2

WJC

2019-10-14 b78a4d0ca90416d37fcbaf5e54b00f7eaab53919

 ZigbeeApp/Shared/Common/House.cs

old mode 100755
new mode 100644
@@ -402,29 +402,35 @@
        /// GetCurrentFloorName
        /// </summary>
        /// <returns></returns>
        public string GetCurrentFloorName()
        public string GetCurrentFloorName
        {
            return GetFloorName(CurrentFloorId);
            get
            {
                return GetFloorNameById(CurrentFloorId);
            }
        }

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

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

        #endregion