2019.11.15-1

gxc

2019-11-15 05ce435c3b58e53eeab04c672affdeeab75f3036

 ZigbeeApp/Shared/Common/House.cs

old mode 100755
new mode 100644
@@ -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,11 +319,6 @@
                            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);

                        }
                    }
                }
            }