~xm/HomeApp.git

			@@ -510,18 +510,8 @@
			/// </summary>
			public static void RefreshAllMemory()
			{
			//备份的数据，有可能是主人自己上传的，如果管理员登陆时，他获取的备份数据有点特殊
			//比如下面这三个东西在主账号那里是不需要的
			bool isOthreShare = Config.Instance.Home.IsOthreShare;
			int accountType = Config.Instance.Home.AccountType;
			string mainMark = Config.Instance.Home.MainUserDistributedMark;
			//还原住宅对象
			Config.Instance.Home = House.GetHouseByHouseId(Config.Instance.Home.Id);
			Config.Instance.Home.IsOthreShare = isOthreShare;
			Config.Instance.Home.AccountType = accountType;
			Config.Instance.Home.MainUserDistributedMark = mainMark;
			Config.Instance.Home.Save(false);

			//刷新住宅对象
			RefreshHomeObject();
			//刷新本地网关文件
			HdlGatewayLogic.Current.ReFreshByLocal();
			//刷新本地设备
			@@ -530,6 +520,28 @@
			HdlGatewayLogic.Current.SynchronizeDbGateway();
			//从本地重新加载全部的房间
			Common.Room.RefreshAllRoomByLocation();
			}

			/// <summary>
			/// 刷新住宅对象
			/// </summary>
			public static void RefreshHomeObject()
			{
			//备份的数据，有可能是主人自己上传的，如果管理员登陆时，他获取的备份数据有点特殊
			//比如下面这三个东西在主账号那里是不需要的
			bool isOthreShare = Config.Instance.Home.IsOthreShare;
			int accountType = Config.Instance.Home.AccountType;
			string mainMark = Config.Instance.Home.MainUserDistributedMark;
			double Longitude = Config.Instance.Home.Longitude;
			double Latitude = Config.Instance.Home.Latitude;
			//还原住宅对象
			Config.Instance.Home = House.GetHouseByHouseId(Config.Instance.Home.Id);
			Config.Instance.Home.IsOthreShare = isOthreShare;
			Config.Instance.Home.AccountType = accountType;
			Config.Instance.Home.MainUserDistributedMark = mainMark;
			Config.Instance.Home.Longitude = Longitude;
			Config.Instance.Home.Latitude = Latitude;
			Config.Instance.Home.Save(false);
			}

			#endregion
			@@ -648,18 +660,24 @@
			/// <summary>
			/// 关闭所有打开了的界面
			/// </summary>
			public static void CloseAllOpenForm()
			/// <param name="tagetFrom">目标界面,如果指定了的话,则关闭目标界面上层的全部界面(它自身不关闭)</param>
			public static void CloseAllOpenForm(string tagetFrom = "")
			{
			while (UserView.HomePage.Instance.ChildrenCount > 0)
			{
			var view = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
			if (view is CommonFormBase)
			{
			if (((CommonFormBase)view).FormID == tagetFrom)
			{
			//只关闭到指定目标界面
			return;
			}
			((CommonFormBase)view).CloseForm();
			}
			else if (view is UserView.UserPage)
			{
			break;
			return;
			}
			else
			{
			@@ -807,15 +825,16 @@
			UserCenterResourse.Option.UserPictruePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, DirNameResourse.UserPictrueDirectory);

			//初始化登陆账号的信息
			await InitUserAccoutInfo();
			//初始化管理员权限信息
			await InitAdminConnectMqttInfo(true);
			var hadNet = await InitUserAccoutInfo();
			//如果有网络的话
			if (hadNet == true)
			{
			//重新发送命令去绑定断网情况下备份的网关
			HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
			}

			//初始化缓存成员的信息
			InitLocalMemberListInfo();

			//重新发送命令去绑定断网情况下备份的网关
			HdlGatewayLogic.Current.ResetComandToBindBackupGateway();

			//预创建个人中心全部的文件夹
			CreatAllUserCenterDirectory();
			@@ -832,15 +851,22 @@
			UserCenterResourse.Option.OldAccountId = Common.Config.Instance.Account;

			//同步数据(二次调用没关系)
			var result = await HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
			int result = -1;
			if (hadNet == true)
			{
			result = await HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
			}

			//初始化本地的网关信息
			HdlGatewayLogic.Current.ReFreshByLocal();
			//初始化本地的设备信息
			Common.LocalDevice.Current.ReFreshByLocal();

			//同步云端的网关id，如果本地拥有云端不存在的id，则表示应该被换绑了，直接删除
			HdlGatewayLogic.Current.SynchronizeDbGateway();
			if (hadNet == true)
			{
			//同步云端的网关id，如果本地拥有云端不存在的id，则表示应该被换绑了，直接删除
			HdlGatewayLogic.Current.SynchronizeDbGateway();
			}

			//初始化住宅对象
			Common.Config.Instance.Home = House.GetHouseByHouseId(Common.Config.Instance.HomeId);
			@@ -1046,44 +1072,6 @@
			var info = JsonConvert.DeserializeObject<MemberAdministratorResult>(result);
			Config.Instance.AdminRequestBaseUrl = info.RequestBaseUrl;
			Config.Instance.AdminRequestToken = info.RequestToken;

			return true;
			}

			/// <summary>
			/// 初始化管理员权限的远程连接信息
			/// </summary>
			/// <param name="stopRemote">是否中断远程</param>
			/// <returns></returns>
			public static async Task<bool> InitAdminConnectMqttInfo(bool stopRemote = false)
			{
			if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)
			{
			//只有成员分身才能调用这个函数
			return true;
			}
			var praMqtt = new
			{
			CommonPage.RequestVersion,
			LoginAccessToken = Config.Instance.Token,
			Config.Instance.Home.MainUserDistributedMark,
			HomeId = Config.Instance.Home.Id
			};

			var listNotShow = new List<string>() { "NotSetAgain" };
			var result2 = await GetResponseDataByRequestHttps("App/GetConnectMainUserMqttInfo", false, praMqtt, listNotShow);
			if (string.IsNullOrEmpty(result2) == true)
			{
			return false;
			}

			//远程Mqtt
			var info2 = JsonConvert.DeserializeObject<MemberAdministratorMqttResult>(result2);
			Config.Instance.AdminConnectZigbeeMqttBrokerPwd = info2.ConnectZigbeeMqttBrokerPwd;
			Config.Instance.AdminConnectZigbeeMqttClientId = info2.ConnectZigbeeMqttClientId;
			Config.Instance.AdminMqttKey = info2.MqttKey;
			Config.Instance.AdminZigbeeMqttBrokerLoadSubDomain = info2.ZigbeeMqttBrokerLoadSubDomain;
			Config.Instance.AdminConnectZigbeeMqttBrokerName = info2.ConnectZigbeeMqttBrokerName;

			return true;
			}