合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Common/House.cs

@@ -307,6 +307,11 @@
                            Config.Instance.HomeId = GetHouseIdByFilePath(Config.Instance.HomeFilePathList[0]);
                        }
                        Config.Instance.Save();
                        //检测住宅对象
                        if (Config.Instance.Home.Id == string.Empty)

                        {

                            Config.Instance.Home = House.GetHouseByHouseId(Config.Instance.HomeId);

                        }
                    }
                }
            }
@@ -406,28 +411,31 @@
        {
            get
            {
                return GetFloorName(CurrentFloorId);
                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