From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Common/HDLCommon.cs | 197 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 176 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index f0295ef..d947849 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -2,6 +2,8 @@
using Shared;
using HDL_ON;
using HDL_ON.UI.CSS;
+using HDL_ON.DAL.Server;
+using HDL_ON.UI;
namespace HDL_ON
{
@@ -11,25 +13,25 @@
/// </summary>
public class HDLCommon
{
- #region 鈻� 鍙橀噺澹版槑___________________________
- /// <summary>
- /// 閫氱敤鏂规硶
- /// </summary>
- private static HDLCommon m_Current = null;
- /// <summary>
- /// 閫氱敤鏂规硶
- /// </summary>
- public static HDLCommon Current
- {
- get
- {
- if (m_Current == null)
- {
- m_Current = new HDLCommon();
- }
- return m_Current;
- }
- }
+ #region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 閫氱敤鏂规硶
+ /// </summary>
+ private static HDLCommon m_Current = null;
+ /// <summary>
+ /// 閫氱敤鏂规硶
+ /// </summary>
+ public static HDLCommon Current
+ {
+ get
+ {
+ if (m_Current == null)
+ {
+ m_Current = new HDLCommon();
+ }
+ return m_Current;
+ }
+ }
#endregion
#region 鈻� Alter寮圭獥鎻愮ず_______________________
@@ -50,7 +52,8 @@
public void ShowActionAlert(string mes, Action okAction)
{
Alert alert = new Alert("", mes, Language.StringByID(StringId.Cancel), Language.StringByID(StringId.Confirm));
- alert.ResultEventHandler += (sender2, e2) => {
+ alert.ResultEventHandler += (sender2, e2) =>
+ {
if (e2)
{
okAction?.Invoke();
@@ -62,9 +65,161 @@
#endregion
#region 鈻� 閫氱敤Dialog_______________________
-
+
#endregion
+ #region 妫�娴嬫洿鏂�
+ /// <summary>
+ /// 妫�娴嬫洿鏂扮嚎绋�
+ /// </summary>
+ public void CheckIfNeedForceUpdate()
+ {
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ try
+ {
+ var revertObj = new HttpServerRequest().CheckAppVersion();
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ if (revertObj.Data != null)
+ {
+ var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(revertObj.Data.ToString());
+ if (appVersionRes != null)
+ {
+ 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
+ {
+ Utlis.WriteLine("璇锋眰澶辫触");
+ }
+ }
+ catch (Exception ex)
+ {
+ //Shared.Utlis.WriteLine (ex.ToString ());
+ }
+ finally
+ {
+
+ }
+
+ });
+
+ }
+
+ /// <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(UpdateDialogInfo mUpdateDialogInfo)
+ {
+ // 1.1 娌℃湁鏇存柊 杩斿洖
+ if (mUpdateDialogInfo.UpdateType == 0) return;
+ // 1.2 鏈夋柊鐗堟湰浣嗘槸蹇界暐杩� 杩斿洖
+ if (mUpdateDialogInfo.UpdateType == 1 && (UserInfo.Current.IgnoreUpdateVersion == mUpdateDialogInfo.NewVersion)) return;
+ // 2.1 鏈夋柊鐗堟湰娌℃湁蹇界暐杩� 鎻愮ず鏇存柊
+ if (mUpdateDialogInfo.UpdateType == 1)
+ {
+ Action okAction = () =>
+ {
+ if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl)) return;
+
+ HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
+ };
+
+ Action cancelAction = () =>
+ {
+ UserInfo.Current.IgnoreUpdateVersion = mUpdateDialogInfo.NewVersion;
+ UserInfo.Current.SaveUserInfo();
+ };
+
+ //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.鍙戠幇鏂扮増鏈珹pp,褰撳墠鐗堟湰宸插仠鐢�,椹笂鏇存柊!\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
}
}
--
Gitblit v1.8.0