~wxr/HDL_APP_Project.git

			@@ -69,7 +69,7 @@

			#endregion

			#region 检测更新
			#region ■ 检测更新_______________________
			/// <summary>
			/// 检测更新线程
			/// </summary>
			@@ -223,22 +223,22 @@

			#endregion

			/// <summary>
			/// 恢复住宅
			/// 2020-12-03 待测试未检测
			/// </summary>
			public void RestoreHomeBackup(string RegionID)
			{
			var isExist = FileUtils.ExistRegion(RegionID);
			if (isExist)
			{
			//存在则恢复
			string newRegionRootPath = FileUtils.CreateRegionBackup(RegionID);
			FileUtils.RestoreRegionFiles(newRegionRootPath);
			}
			}
			///// <summary>
			///// 恢复住宅
			///// 2020-12-03 待测试未检测
			///// </summary>
			//public void RestoreHomeBackup(string RegionID)
			//{
			// var isExist = FileUtils.ExistRegion(RegionID);
			// if (isExist)
			// {
			// //存在则恢复
			// string newRegionRootPath = FileUtils.CreateRegionBackup(RegionID);
			// FileUtils.RestoreRegionFiles(newRegionRootPath);
			// }
			//}

			#region 推送处理
			#region ■ 推送处理_______________________
			/// <summary>
			/// 推送消息处理
			/// </summary>
			@@ -247,16 +247,14 @@
			{
			try
			{

			if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("Offline"))
			if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("OffLine"))
			{
			Shared.Application.RunOnMainThread(() =>
			{

			//账号在别处登陆，被踢下线跳转到登录页面
			new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
			//2020-12-04 待增加退出登录操作
			Logout();
			//退出登录操作
			CheckLogout();
			});
			return;
			}
			@@ -267,7 +265,6 @@
			new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
			});
			return;

			}
			}
			catch
			@@ -279,60 +276,96 @@
			/// <summary>
			/// 退出登录操作
			/// </summary>
			public void CheckLogout()
			{
			#if DEBUG
			return;
			#endif
			//未登录不用处理
			if (!UserInfo.Current.IsLogin) return;

			Logout();
			}

			/// <summary>
			/// 退出登录操作
			/// </summary>
			public void Logout()
			{
			return;
			try
			new System.Threading.Thread(() =>
			{
			Shared.Application.RunOnMainThread(() =>
			try
			{
			#region 保存本地数据至文件夹
			string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
			new System.Threading.Thread(() =>
			{
			try
			{
			var backuplist = FileUtils.ReadFiles();
			FileUtils.DeleteRegionFiles(oldRegionRootPath);
			//移动文件
			foreach (var fileName in backuplist)
			{
			System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
			if (fileInfo.Exists)
			{
			fileInfo.MoveTo(oldRegionRootPath + fileName);
			MainPage.Log("move file : " + fileName);
			}
			}
			}
			catch (Exception ex)
			{
			MainPage.Log($"xxx:{ex.Message}");
			}
			finally
			{
			FileUtils.DeleteAllFile();
			}
			}).Start();
			//string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
			////清空之前的住宅文件
			//FileUtils.DeleteRegionFiles(oldRegionRootPath);
			//var backuplist = FileUtils.ReadFiles();
			////移动文件
			//foreach (var fileName in backuplist)
			//{
			// System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
			// if (fileInfo.Exists)
			// {
			// fileInfo.MoveTo(oldRegionRootPath + fileName);
			// MainPage.Log("move file : " + fileName);
			// }
			//}
			#endregion

			////2.注销推送
			}
			catch (Exception ex)
			{
			MainPage.Log($"xxx:{ex.Message}");
			}
			finally
			{
			//FileUtils.DeleteAllFile();
			//2.注销推送
			new HttpServerRequest().SignOutPush();
			//3.跳转登录页面
			UserInfo.Current.LastTime = DateTime.MinValue;
			UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
			UserInfo.Current.SaveUserInfo();
			MainPage.GoLoginPage(UserInfo.Current);
			DB_ResidenceData.residenceData.EixtAccount();
			});
			Shared.Application.RunOnMainThread(() =>
			{
			MainPage.GoLoginPage(UserInfo.Current);
			DB_ResidenceData.residenceData.EixtAccount();
			});
			}
			}).Start();
			}

			}
			catch (Exception ex)
			#endregion

			#region ■ 常用方法_______________________
			/// <summary>
			/// 设置下划线按钮状态
			/// 统一封装设置方法
			/// </summary>
			/// <param name="button">下划线按钮</param>
			/// <param name="bottomLineType">状态</param>
			public void BottomLineShowType(Button button, BottomLineType bottomLineType)
			{
			switch (bottomLineType)
			{
			MainPage.Log($"xxx:{ex.Message}");
			case BottomLineType.GotFocus:
			button.BackgroundColor = CSS_Color.MainColor;
			button.Height = Application.GetRealHeight(2);
			break;
			case BottomLineType.Error:
			button.BackgroundColor = CSS_Color.AuxiliaryColor2;
			button.Height = Application.GetRealHeight(2);
			break;
			case BottomLineType.Normal:
			button.BackgroundColor = CSS_Color.DividingLineColor;
			button.Height = Application.GetRealHeight(1);
			break;
			default:
			button.BackgroundColor = CSS_Color.DividingLineColor;
			button.Height = Application.GetRealHeight(1);
			break;
			}
			}
			#endregion

			}
			}