From 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 19:35:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 114 ++++++++++++++++++++++++++++----------------------------
1 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index b2afe4c..5689818 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -80,65 +80,65 @@
// DB_ResidenceData.residenceData.EixtAccount();
//}
- /// <summary>
- /// 閫�鍑虹櫥褰曟搷浣�
- /// </summary>
- public void LogoutNew()
- {
- //鍔犺浇Loading鏁堟灉
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
+ ///// <summary>
+ ///// 閫�鍑虹櫥褰曟搷浣�
+ ///// </summary>
+ //public void LogoutNew()
+ //{
+ // //鍔犺浇Loading鏁堟灉
+ // var waitPage = new Loading();
+ // bodyView.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
- }
- 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();
- Shared.Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
+ // 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
+ // }
+ // 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();
+ // Shared.Application.RunOnMainThread(() =>
+ // {
+ // if (waitPage != null)
+ // {
+ // waitPage.RemoveFromParent();
+ // waitPage = null;
+ // }
- MainPage.GoLoginPage(UserInfo.Current);
- DB_ResidenceData.residenceData.EixtAccount();
+ // MainPage.GoLoginPage(UserInfo.Current);
+ // DB_ResidenceData.residenceData.EixtAccount();
- });
- }
- }).Start();
- }
+ // });
+ // }
+ // }).Start();
+ //}
/// <summary>
/// 閫�鍑鸿处鍙风櫥褰曚簨浠�
@@ -149,7 +149,7 @@
{
Action okAction = () =>
{
- LogoutNew();
+ HDLCommon.Current.Logout();
};
new ConfirmDialog().ShowDialog(StringId.Tip, StringId.IfConfirmLogout, okAction);
};
--
Gitblit v1.8.0