~wxr/HDL_APP_Project.git

			@@ -3,6 +3,9 @@
			using HDL_ON;
			using HDL_ON.UI.CSS;
			using HDL_ON.DAL.Server;
			using HDL_ON.UI;
			using HDL_ON.Entity;
			using System.Threading;

			namespace HDL_ON
			{
			@@ -12,6 +15,11 @@
			/// </summary>
			public class HDLCommon
			{
			/// <summary>
			/// 收到推送Action事件
			/// </summary>
			public static Action GetPushMessageAction;

			#region ■ 变量声明___________________________
			/// <summary>
			/// 通用方法
			@@ -67,36 +75,53 @@

			#endregion

			#region 检测更新
			#region ■ 检测更新_______________________
			/// <summary>
			/// 检测更新线程
			/// </summary>
			public void CheckIfNeedForceUpdate()
			{
			// //return;
			System.Threading.Tasks.Task.Run(() =>
			{
			try
			{
			var requestObj = new ForceUpdateObj()
			{


			};
			#if Android
			requestObj.DeviceType = 1;
			#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
			@@ -115,227 +140,231 @@

			});

			}

			//ForceUpdateInfo mForceUpdateInfo = new ForceUpdateInfo () {
			// IsNeedForceUpdate = true,
			// AndroidUrl = "https://shouji.baidu.com/software/26667787.html",
			// AndroidUrl_En = "https://shouji.baidu.com/software/26667787.html",
			// IosUrl = "https://apps.apple.com/cn/app/hdl-on/id1029839624",
			// ReasonStr = "1.发现新版本App,当前版本已停用,马上更新!\n2.请下载和安装新版本!",
			// ReasonStr_En = "1. Discover the new version of the App, the current version is disabled, update now! \n2. Please download and install the new version!"
			//};

			//ShowForceUpdateDialog (mForceUpdateInfo);
			/// <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)
			{

			//if (!mForceUpdateInfo.IsNeedForceUpdate) return;

			if (mForceUpdateInfo.UpdateType == 0) return;

			if (mForceUpdateInfo.UpdateType == 1 && (UserInfo.Current.IgnoreUpdateVersion == mForceUpdateInfo.NewVersion)) return;

			Dialog dialog = new Dialog();

			FrameLayout dialogBodyView = new FrameLayout()
			// 1.1 没有更新返回
			if (mUpdateDialogInfo.UpdateType == 0) return;
			// 1.2 有新版本但是忽略过返回
			if (mUpdateDialogInfo.UpdateType == 1 && (OnAppConfig.Instance.IgnoreUpdateVersion == mUpdateDialogInfo.NewVersion)) return;
			// 2.1 有新版本没有忽略过提示更新
			if (mUpdateDialogInfo.UpdateType == 1)
			{
			Gravity = Gravity.Center,
			Width = Application.GetRealWidth(500),
			Height = Application.GetRealHeight(500),
			BackgroundColor = 0xFF000000,
			Radius = (uint)Application.GetRealHeight(10),
			//BorderColor = SkinStyle.Current.Transparent,
			BorderWidth = 0,
			};
			dialog.AddChidren(dialogBodyView);

			Button btnTitle = new Button()
			{
			Height = Application.GetRealHeight(80),
			BackgroundColor = 0x00000000,
			TextAlignment = TextAlignment.Center,
			TextID = StringId.Tip,
			TextColor = 0xFFFFFFFF
			};
			dialogBodyView.AddChidren(btnTitle);


			FrameLayout centerView = new FrameLayout()
			{
			Y = Application.GetRealHeight(80),
			Height = Application.GetRealHeight(340),
			BackgroundColor = 0xFFFFFFFF,
			};
			dialogBodyView.AddChidren(centerView);

			Button btnMessage = new Button()
			{
			Gravity = Gravity.CenterHorizontal,
			Y = Application.GetRealHeight(20),
			Width = Application.GetRealWidth(400),
			//Height = Application.GetRealHeight (300),
			//Text = mForceUpdateInfo.ReasonStr,
			TextAlignment = TextAlignment.TopLeft,
			//TextColor = SkinStyle.Current.TextColor,
			IsMoreLines = true
			};
			centerView.AddChidren(btnMessage);


			FrameLayout bottomView = new FrameLayout()
			{
			Y = Application.GetRealHeight(420),
			Height = Application.GetRealHeight(80),
			BackgroundColor = 0xFFFFFFFF,

			};
			dialogBodyView.AddChidren(bottomView);

			var mAndroidUrl = mForceUpdateInfo.AndroidUrl;
			if (Language.CurrentLanguage == "Chinese")
			{
			btnMessage.Text = mForceUpdateInfo.ReasonStr;

			}
			else
			{
			btnMessage.Text = mForceUpdateInfo.ReasonStr_En;
			mAndroidUrl = mForceUpdateInfo.AndroidUrl_En;
			}


			if (mForceUpdateInfo.UpdateType == 1)
			{
			#region 提示更新
			Button btnNext = new Button()
			Action okAction = () =>
			{
			Width = Application.GetRealWidth(249),
			TextID = StringId.Ignore,
			TextAlignment = TextAlignment.Center,
			TextColor = 0xFFFFFFFF,
			BackgroundColor = 0xFF000000,
			//Text = "忽略"
			if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl)) return;

			HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
			};
			bottomView.AddChidren(btnNext);
			btnNext.MouseUpEventHandler += (sender2, e2) =>

			Action cancelAction = () =>
			{
			//UserConfig.Instance.IfIgnoreUpdate = true;
			UserInfo.Current.IgnoreUpdateVersion = mForceUpdateInfo.NewVersion;
			OnAppConfig.Instance.IgnoreUpdateVersion = mUpdateDialogInfo.NewVersion;
			OnAppConfig.Instance.SaveConfig();
			};

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

			HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
			};

			//1提示更新
			var dialog = new UpdateTipDialog();
			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), 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();
			GetPushMessageAction?.Invoke();
			});
			return;
			}
			}
			catch
			{

			}
			}

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

			#if DEBUG
			return;
			#endif

			Logout();
			}

			/// <summary>
			/// 退出登录操作
			/// </summary>
			public void Logout()
			{
			//加载Loading效果
			var waitPage = new Loading();
			MainPage.BasePageView.AddChidren(waitPage);
			waitPage.Start(Language.StringByID(StringId.PleaseWait));

			new Thread(() =>
			{
			try
			{
			//2.注销推送
			new HttpServerRequest().SignOutPush();
			//3.跳转登录页面
			UserInfo.Current.LastTime = DateTime.MinValue;
			UserInfo.Current.SaveUserInfo();
			dialog.Close();
			};

			Button btnSave = new Button()
			DB_ResidenceData.Instance.EixtAccount();
			}
			catch (Exception ex)
			{
			X = btnNext.Right + 1,
			Width = Application.GetRealWidth(250),
			TextID = StringId.Update,
			TextAlignment = TextAlignment.Center,
			TextColor = 0xFFFFFFFF,
			BackgroundColor = 0xFF000000,
			//Text = "更新"
			};
			bottomView.AddChidren(btnSave);

			btnSave.MouseUpEventHandler += (sender2, e2) =>
			MainPage.Log($"xxx:{ex.Message}");
			}
			finally
			{
			dialog.Close();
			try
			Application.RunOnMainThread(() =>
			{
			if (waitPage != null)
			{
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			MainPage.GoLoginPage(UserInfo.Current);
			});
			}
			}).Start();
			}
			#endregion

			#if __IOS__
			HDLUtils.OpenUrl(mForceUpdateInfo.IosUrl);
			//UIApplication.SharedApplication.OpenUrl (new Foundation.NSUrl ("https://apps.apple.com/cn/app/hdl-on/id1029839624"));

			#elif Android
			HDLUtils.OpenUrl(mAndroidUrl);
			SharedMethod.SharedMethod.OpenUrl (mAndroidUrl);
			//SharedMethod.SharedMethod.OpenUrl ("https://shouji.baidu.com/software/26667787.html");

			#endif
			}
			catch
			{
			//跳转下载地址失败
			Utlis.WriteLine("open url error");
			}
			};

			#endregion

			}
			else if (mForceUpdateInfo.UpdateType == 2)
			#region ■ 常用方法_______________________
			/// <summary>
			/// 设置下划线按钮状态
			/// 统一封装设置方法
			/// </summary>
			/// <param name="button">下划线按钮</param>
			/// <param name="bottomLineType">状态</param>
			public void BottomLineShowType(Button button, BottomLineType bottomLineType)
			{
			switch (bottomLineType)
			{
			#region 强制更新
			Button btnSave = new Button()
			{
			Width = Application.GetRealWidth(500),
			TextID = StringId.Confirm,
			TextAlignment = TextAlignment.Center,
			TextColor = 0xFFFFFFFF,
			BackgroundColor = 0xFF000000,
			};
			bottomView.AddChidren(btnSave);

			//var mAndroidUrl = mForceUpdateInfo.AndroidUrl;
			//if (Language.CurrentLanguage == "Chinese") {
			// btnMessage.Text = mForceUpdateInfo.ReasonStr;

			//} else {
			// btnMessage.Text = mForceUpdateInfo.ReasonStr_En;
			// mAndroidUrl = mForceUpdateInfo.AndroidUrl_En;
			//}

			btnSave.MouseUpEventHandler += (sender2, e2) =>
			{
			try
			{

			#if __IOS__
			HDLUtils.OpenUrl(mForceUpdateInfo.IosUrl);
			//UIApplication.SharedApplication.OpenUrl (new Foundation.NSUrl ("https://apps.apple.com/cn/app/hdl-on/id1029839624"));

			#elif Android
			HDLUtils.OpenUrl(mAndroidUrl);
			//SharedMethod.SharedMethod.OpenUrl ("https://shouji.baidu.com/software/26667787.html");

			#endif
			}
			catch
			{
			//跳转下载地址失败
			Utlis.WriteLine("open url error");
			}
			};
			#endregion
			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;
			}
			else
			{
			#region 提示通知
			Button btnSave = new Button()
			{
			Width = Application.GetRealWidth(500),
			TextID = StringId.Close,
			TextAlignment = TextAlignment.Center,
			TextColor = 0xFFFFFFFF,
			BackgroundColor = 0xFF000000,
			};
			bottomView.AddChidren(btnSave);

			btnSave.MouseUpEventHandler += (sender2, e2) =>
			{
			dialog.Close();
			};
			#endregion
			}
			dialog.Show();

			}
			#endregion
			}