From 3e7c0a6deda128e639abfa3b8ed9377dbd017526 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 11 十二月 2020 17:47:24 +0800
Subject: [PATCH] 2020-12-11-4
---
HDL_ON/Common/HDLCommon.cs | 87 ++++++++++++++++++++++---------------------
1 files changed, 45 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 5d7cf4d..47cc846 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -253,8 +253,8 @@
{
//璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- //2020-12-04 寰呭鍔犻��鍑虹櫥褰曟搷浣�
- Logout();
+ //閫�鍑虹櫥褰曟搷浣�
+ CheckLogout();
});
return;
}
@@ -265,7 +265,6 @@
new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
});
return;
-
}
}
catch
@@ -277,61 +276,65 @@
/// <summary>
/// 閫�鍑虹櫥褰曟搷浣�
/// </summary>
+ public void CheckLogout()
+ {
+#if DEBUG
+ return;
+#endif
+ //鏈櫥褰曚笉鐢ㄥ鐞�
+ if (!UserInfo.Current.IsLogin) return;
+
+ Logout();
+ }
+
+ /// <summary>
+ /// 閫�鍑虹櫥褰曟搷浣�
+ /// </summary>
public void Logout()
{
- try
+ new System.Threading.Thread(() =>
{
- //鏈櫥褰曚笉鐢ㄥ鐞�
- if (!UserInfo.Current.IsLogin) return;
-
- Shared.Application.RunOnMainThread(() =>
+ try
{
#region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す
string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- new System.Threading.Thread(() =>
+ //娓呯┖涔嬪墠鐨勪綇瀹呮枃浠�
+ FileUtils.DeleteRegionFiles(oldRegionRootPath);
+ var backuplist = FileUtils.ReadFiles();
+ //绉诲姩鏂囦欢
+ foreach (var fileName in backuplist)
{
- try
+ System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
+ if (fileInfo.Exists)
{
- 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);
- }
- }
+ fileInfo.MoveTo(oldRegionRootPath + fileName);
+ MainPage.Log("move file : " + fileName);
}
- catch (Exception ex)
- {
- MainPage.Log($"xxx:{ex.Message}");
- }
- finally
- {
- FileUtils.DeleteAllFile();
- }
- }).Start();
+ }
#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();
- });
-
- }
- catch (Exception ex)
- {
- MainPage.Log($"xxx:{ex.Message}");
- }
+ Shared.Application.RunOnMainThread(() =>
+ {
+ MainPage.GoLoginPage(UserInfo.Current);
+ DB_ResidenceData.residenceData.EixtAccount();
+ });
+ }
+ }).Start();
}
+
#endregion
}
--
Gitblit v1.8.0