IOS使用新的项目名称

黄学彪

2019-11-25 5727cf0b9b54da0a191dd1e23cb5abf21320fbff

 ZigbeeApp/Shared/Common/House.cs

@@ -46,7 +46,15 @@
        /// <summary>
        /// 仅子账号登陆的时候使用,当【IsOthreShare】为"true"，并且【AccountType】为"1"时，该账号拥有管理员权限
        /// </summary>
        public int AccountType;
        public int AccountType;

        /// <summary>

        /// 经度

        /// </summary>

        public double Longitude = 0;

        /// <summary>

        /// 纬度

        /// </summary>

        public double Latitude = 0;

        /// <summary>
        /// 房间路径列表
@@ -287,7 +295,9 @@
                                    Name = residence.Name,
                                    IsOthreShare = residence.IsOthreShare,
                                    AccountType = residence.AccountType,
                                    MainUserDistributedMark = residence.MainUserDistributedMark
                                    MainUserDistributedMark = residence.MainUserDistributedMark,
                                    Longitude = residence.Longitude,
                                    Latitude = residence.Latitude
                                };
                            }
                            else
@@ -296,7 +306,9 @@
                                house.Name = residence.Name;
                                house.IsOthreShare = residence.IsOthreShare;
                                house.AccountType = residence.AccountType;
                                house.MainUserDistributedMark = residence.MainUserDistributedMark;
                                house.MainUserDistributedMark = residence.MainUserDistributedMark;

                                house.Longitude = residence.Longitude;

                                house.Latitude = residence.Latitude;
                            }
                            Global.CreateHomeDirectory(residence.Id);
                            house.Save();
@@ -307,6 +319,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);

                        }
                    }
                }
            }
@@ -402,29 +419,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