From b3abfd30576871c32f2839a322fa3bb783f96498 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:10:10 +0800
Subject: [PATCH] 2020-12-12 1.解锁逻辑优化
---
HDL_ON/Common/HDLCommon.cs | 78 +++++++++++++++++----------------------
1 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 7656e26..21ff21f 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -5,6 +5,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.Entity;
+using System.Threading;
namespace HDL_ON
{
@@ -223,20 +224,20 @@
#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);
- }
- }
+ ///// <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>
@@ -278,9 +279,6 @@
/// </summary>
public void CheckLogout()
{
-#if DEBUG
- return;
-#endif
//鏈櫥褰曚笉鐢ㄥ鐞�
if (!UserInfo.Current.IsLogin) return;
@@ -292,26 +290,22 @@
/// </summary>
public void Logout()
{
- new System.Threading.Thread(() =>
+ //鍔犺浇Loading鏁堟灉
+ var waitPage = new Loading();
+ MainPage.BasePageView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+ new 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
+ //2.娉ㄩ攢鎺ㄩ��
+ new HttpServerRequest().SignOutPush();
+ //3.璺宠浆鐧诲綍椤甸潰
+ UserInfo.Current.LastTime = DateTime.MinValue;
+ UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
+ UserInfo.Current.SaveUserInfo();
+ DB_ResidenceData.residenceData.EixtAccount();
}
catch (Exception ex)
{
@@ -319,22 +313,18 @@
}
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(() =>
+ Application.RunOnMainThread(() =>
{
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
MainPage.GoLoginPage(UserInfo.Current);
- DB_ResidenceData.residenceData.EixtAccount();
});
}
}).Start();
}
-
#endregion
#region 鈻� 甯哥敤鏂规硶_______________________
--
Gitblit v1.8.0