From 014abc547ffd1a9f23c58fd7a471dffc5933fdd3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:27:56 +0800
Subject: [PATCH] Merge branch 'master' into NewFilePath
---
HDL_ON/Common/HDLCommon.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 21ff21f..d3f1eba 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -15,6 +15,11 @@
/// </summary>
public class HDLCommon
{
+ /// <summary>
+ /// 鏀跺埌鎺ㄩ�丄ction浜嬩欢
+ /// </summary>
+ public static Action GetPushMessageAction;
+
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 閫氱敤鏂规硶
@@ -167,7 +172,7 @@
// 1.1 娌℃湁鏇存柊 杩斿洖
if (mUpdateDialogInfo.UpdateType == 0) return;
// 1.2 鏈夋柊鐗堟湰浣嗘槸蹇界暐杩� 杩斿洖
- if (mUpdateDialogInfo.UpdateType == 1 && (UserInfo.Current.IgnoreUpdateVersion == mUpdateDialogInfo.NewVersion)) return;
+ if (mUpdateDialogInfo.UpdateType == 1 && (OnAppConfig.Instance.IgnoreUpdateVersion == mUpdateDialogInfo.NewVersion)) return;
// 2.1 鏈夋柊鐗堟湰娌℃湁蹇界暐杩� 鎻愮ず鏇存柊
if (mUpdateDialogInfo.UpdateType == 1)
{
@@ -180,8 +185,8 @@
Action cancelAction = () =>
{
- UserInfo.Current.IgnoreUpdateVersion = mUpdateDialogInfo.NewVersion;
- UserInfo.Current.SaveUserInfo();
+ OnAppConfig.Instance.IgnoreUpdateVersion = mUpdateDialogInfo.NewVersion;
+ OnAppConfig.Instance.SaveConfig();
};
//1鎻愮ず鏇存柊
@@ -256,6 +261,7 @@
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
//閫�鍑虹櫥褰曟搷浣�
CheckLogout();
+
});
return;
}
@@ -264,6 +270,7 @@
Shared.Application.RunOnMainThread(() =>
{
new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
+ GetPushMessageAction?.Invoke();
});
return;
}
@@ -281,6 +288,10 @@
{
//鏈櫥褰曚笉鐢ㄥ鐞�
if (!UserInfo.Current.IsLogin) return;
+
+#if DEBUG
+ return;
+#endif
Logout();
}
@@ -303,9 +314,8 @@
new HttpServerRequest().SignOutPush();
//3.璺宠浆鐧诲綍椤甸潰
UserInfo.Current.LastTime = DateTime.MinValue;
- UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
UserInfo.Current.SaveUserInfo();
- DB_ResidenceData.residenceData.EixtAccount();
+ DB_ResidenceData.Instance.EixtAccount();
}
catch (Exception ex)
{
--
Gitblit v1.8.0