~wxr/HDL_APP_Project.git

			@@ -4,6 +4,7 @@
			using HDL_ON.UI.CSS;
			using HDL_ON.DAL.Server;
			using HDL_ON.UI;
			using HDL_ON.Entity;

			namespace HDL_ON
			{
			@@ -78,24 +79,43 @@
			{
			try
			{
			var requestObj = new ForceUpdateObj()
			{
			LanguageType = Utlis.GetPostLanguageType()
			};
			#if __IOS__
			requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
			#endif
			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
			var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
			var revertObj = new HttpServerRequest().CheckAppVersion();
			if (revertObj.Code == StateCode.SUCCESS)
			{
			var mForceUpdateInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ForceUpdateInfo>(revertObj.Data.ToString());
			if (mForceUpdateInfo != null)
			if (revertObj.Data != null)
			{
			Application.RunOnMainThread(() =>
			var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(revertObj.Data.ToString());
			if (appVersionRes != null)
			{
			ShowForceUpdateDialog(mForceUpdateInfo);
			});

			var mForceUpdateInfo = new UpdateDialogInfo()
			{
			UpdateType = appVersionRes.isEnforce ? 2 : 1,
			NewVersion = appVersionRes.version,
			NewVersionUrl = appVersionRes.androidUrl
			};
			#if __IOS__
			mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl;
			#endif
			//解析更新内容详情
			var reasonStrJson = GetReasonStrJson(appVersionRes.updateDescription);
			if (reasonStrJson != null)
			{
			if (Language.CurrentLanguage == "Chinese")
			{
			mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
			}
			else
			{
			mForceUpdateInfo.ReasonStr = reasonStrJson.English;
			}
			}

			Application.RunOnMainThread(() =>
			{
			ShowForceUpdateDialog(mForceUpdateInfo);
			});
			}
			}
			}
			else
			@@ -117,68 +137,205 @@
			}

			/// <summary>
			///
			/// </summary>
			/// <param name="jsonStr"></param>
			/// <returns></returns>
			public ReasonStrJson GetReasonStrJson(string jsonStr)
			{
			try
			{
			if (!string.IsNullOrEmpty(jsonStr))
			{
			return Newtonsoft.Json.JsonConvert.DeserializeObject<ReasonStrJson>(jsonStr);
			}
			return null;
			}
			catch
			{
			return null;
			}
			}

			/// <summary>
			/// 提示强制更新Dialog
			/// 点击确认跳转浏览器
			/// </summary>
			public void ShowForceUpdateDialog(ForceUpdateInfo mForceUpdateInfo)
			public void ShowForceUpdateDialog(UpdateDialogInfo mUpdateDialogInfo)
			{
			// 1.1 没有更新返回
			if (mForceUpdateInfo.UpdateType == 0) return;
			if (mUpdateDialogInfo.UpdateType == 0) return;
			// 1.2 有新版本但是忽略过返回
			if (mForceUpdateInfo.UpdateType == 1 && (UserInfo.Current.IgnoreUpdateVersion == mForceUpdateInfo.NewVersion)) return;
			if (mUpdateDialogInfo.UpdateType == 1 && (UserInfo.Current.IgnoreUpdateVersion == mUpdateDialogInfo.NewVersion)) return;
			// 2.1 有新版本没有忽略过提示更新
			if (mForceUpdateInfo.UpdateType == 1)
			if (mUpdateDialogInfo.UpdateType == 1)
			{
			Action okAction = () =>
			{
			if (string.IsNullOrEmpty(mForceUpdateInfo.NewVersionUrl)) return;
			if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl)) return;

			HDLUtils.OpenUrl(mForceUpdateInfo.NewVersionUrl);
			HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
			};

			Action cancelAction = () =>
			{
			//UserInfo.Current.IgnoreUpdateVersion = mForceUpdateInfo.NewVersion;
			//UserInfo.Current.SaveUserInfo();
			UserInfo.Current.IgnoreUpdateVersion = mUpdateDialogInfo.NewVersion;
			UserInfo.Current.SaveUserInfo();
			};

			//1提示更新
			var dialog = new UpdateTipDialog();
			var tipStr = Language.StringByID(StringId.VersionNumber) + mForceUpdateInfo.NewVersion;
			dialog.ShowUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mForceUpdateInfo.ReasonStr, okAction, cancelAction);
			var dialog = new UpdateTipDialog();
			var tipStr = Language.StringByID(StringId.VersionNumber) + mUpdateDialogInfo.NewVersion;
			dialog.ShowUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mUpdateDialogInfo.ReasonStr, okAction, cancelAction);

			}
			else if (mForceUpdateInfo.UpdateType == 2) //2.2 需要强制更新
			else if (mUpdateDialogInfo.UpdateType == 2) //2.2 需要强制更新
			{
			//2强制更新
			//"1.发现新版本App,当前版本已停用,马上更新!\n2.请下载和安装新版本!....."
			Action okAction = () =>
			{
			if (string.IsNullOrEmpty(mForceUpdateInfo.NewVersionUrl)) {
			if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl))
			{
			Utlis.ShowTip(Language.StringByID(StringId.DataExceptionPleaseTryAgain));
			return;
			};

			HDLUtils.OpenUrl(mForceUpdateInfo.NewVersionUrl);
			HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
			};


			//1提示更新
			var dialog = new UpdateTipDialog();
			var tipStr = Language.StringByID(StringId.VersionNumber) + mForceUpdateInfo.NewVersion;
			dialog.ShowForcedUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mForceUpdateInfo.ReasonStr, okAction);
			var tipStr = Language.StringByID(StringId.VersionNumber) + mUpdateDialogInfo.NewVersion;
			dialog.ShowForcedUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mUpdateDialogInfo.ReasonStr, okAction);
			}
			else //3. 只需提示
			{
			//3提示通知
			Action okAction = () =>
			{


			};
			var dialog = new UpdateTipDialog();
			dialog.ShowTipDialog(Language.StringByID(StringId.Tip), mForceUpdateInfo.ReasonStr, okAction);
			dialog.ShowTipDialog(Language.StringByID(StringId.Tip), mUpdateDialogInfo.ReasonStr, okAction);
			}
			}

			#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);
			}
			}

			#region 推送处理
			/// <summary>
			/// 推送消息处理
			/// </summary>
			/// <param name="jpushMessageInfo"></param>
			public void AdjustPushMessage(JPushMessageInfo jpushMessageInfo)
			{
			try
			{
			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();
			//退出登录操作
			CheckLogout();
			});
			return;
			}
			else
			{
			Shared.Application.RunOnMainThread(() =>
			{
			new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
			});
			return;
			}
			}
			catch
			{

			}
			}

			/// <summary>
			/// 退出登录操作
			/// </summary>
			public void CheckLogout()
			{
			#if DEBUG
			return;
			#endif
			//未登录不用处理
			if (!UserInfo.Current.IsLogin) return;

			Logout();
			}

			/// <summary>
			/// 退出登录操作
			/// </summary>
			public void Logout()
			{
			new System.Threading.Thread(() =>
			{
			try
			{
			#region 保存本地数据至文件夹
			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
			}
			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();
			Shared.Application.RunOnMainThread(() =>
			{
			MainPage.GoLoginPage(UserInfo.Current);
			DB_ResidenceData.residenceData.EixtAccount();
			});
			}
			}).Start();
			}

			#endregion

			}
			}