最新代码

黄学彪

2020-04-02 9904031f5291daaf56985146bb671f25e18ebbdf

 ZigbeeApp/Shared/Common/House.cs

@@ -55,6 +55,10 @@
        /// 纬度

        /// </summary>

        public double Latitude = 0;
        /// <summary>

        /// 住宅所在的地理位置的名称

        /// </summary>
        public string ResidenceAddressName = string.Empty;

        /// <summary>
        /// 房间列表(房间的ID)
@@ -278,11 +282,7 @@
                    {
                        //清空当前住宅列表
                        Config.Instance.HomeFilePathList.Clear();
                        if (Config.Instance.HomeId == string.Empty && responseDataObj.PageData.Count > 0)
                        {
                            //赋一个初始值
                            Config.Instance.HomeId = responseDataObj.PageData[0].Id;
                        }
                        var listHouse = new List<House>();
                        foreach (var residence in responseDataObj.PageData)
                        {
                            Config.Instance.HomeFilePathList.Add($"House_{residence.Id}.json");
@@ -312,11 +312,23 @@
                            }
                            Global.CreateHomeDirectory(residence.Id);
                            house.Save(false);
                            listHouse.Add(house);
                        }
                        //匹配当前住宅
                        if (Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
                        //如果切换了账号,或者原来的id不存在,则重置住宅ID
                        if (UserCenterResourse.ResidenceOption.TheSameLoginAccount == false ||
                            Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
                        {
                            Config.Instance.HomeId = GetHouseIdByFilePath(Config.Instance.HomeFilePathList[0]);
                            Config.Instance.HomeId = listHouse[0].Id;
                            foreach (var house in listHouse)

                            {

                                //初始选择它自己的住宅

                                if (house.IsOthreShare == false)

                                {

                                    Config.Instance.HomeId = house.Id;

                                    Config.Instance.Home = House.GetHouseByHouseId(house.Id);

                                    break;

                                }

                            }
                        }
                        Config.Instance.Save();
                    }
@@ -431,7 +443,7 @@
        {
            if (Config.Instance.Home.FloorDics.Count == 0)
            {
                return null;
                return string.Empty;
            }

            foreach (var floor in Config.Instance.Home.FloorDics)
@@ -440,8 +452,8 @@
                {
                    return floor.Value;
                }
            }
            return null;
            }

            return string.Empty;
        }

        /// <summary>