From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 167 ++++++++++++++++++-------------------------------------
1 files changed, 56 insertions(+), 111 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index c1eab97..e2208cb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -19,7 +19,6 @@
LoadEvent_ChangeBindEmail();
LoadEvent_ChangeBindPhone();
LoadEvent_SkipModifyPassword();
- GetUserInfo();
}
/// <summary>
@@ -34,58 +33,46 @@
}
/// <summary>
- /// 閫�鍑虹櫥褰曟搷浣�
- /// </summary>
- void Logout()
- {
- #region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す
- string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- new System.Threading.Thread(() =>
- {
- try
- {
- 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);
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"xxx:{ex.Message}");
- }
- finally
- {
- FileUtils.DeleteAllFile();
- }
- }).Start();
- #endregion
-
- UserInfo.Current.lastTime = DateTime.MinValue;
- UserInfo.Current.SaveUserInfo();
- MainPage.GoLoginPage(UserInfo.Current);
- DB_ResidenceData.residenceData.EixtAccount();
- }
-
- /// <summary>
/// 閫�鍑鸿处鍙风櫥褰曚簨浠�
/// </summary>
void LoadEvent_Logout()
{
btnLogout.MouseUpEventHandler += (sender, e) =>
{
- Action okAction = () =>
+ #region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す
+ string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
+ new System.Threading.Thread(() =>
{
- Logout();
- };
- new ConfirmDialog().ShowDialog(StringId.Tip, StringId.IfConfirmLogout, okAction);
+ try
+ {
+ 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);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"xxx:{ex.Message}");
+ }
+ finally
+ {
+ FileUtils.DeleteAllFile();
+ }
+ }).Start();
+ #endregion
+
+ MainPage.LoginUser.lastTime = DateTime.MinValue;
+ MainPage.LoginUser.SaveUserInfo();
+ MainPage.GoLoginPage(MainPage.LoginUser);
+ DB_ResidenceData.residenceData.EixtAccount();
};
}
@@ -98,8 +85,7 @@
{
baseView.RemoveFromParent();
};
- baseView.MouseUpEventHandler = (sender, e) =>
- {
+ baseView.MouseUpEventHandler = (sender, e) => {
baseView.RemoveFromParent();
};
btnCancel.MouseUpEventHandler = (sender, e) =>
@@ -119,7 +105,7 @@
{
if (imagePath != null)
{
- UserInfo.Current.headImagePagePath = imagePath.ToString();
+ MainPage.LoginUser.headImagePagePath = imagePath.ToString();
userHeadImageView.ImagePath = imagePath.ToString();
updataHeadImage();
new System.Threading.Thread(() =>
@@ -127,7 +113,7 @@
new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
})
{ IsBackground = true }.Start();
- UserInfo.Current.SaveUserInfo();
+ MainPage.LoginUser.SaveUserInfo();
MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
}
}), pid.ToString(), 1, 1);
@@ -148,7 +134,7 @@
{
if (imagePath != null)
{
- UserInfo.Current.headImagePagePath = imagePath.ToString();
+ MainPage.LoginUser.headImagePagePath = imagePath.ToString();
userHeadImageView.ImagePath = imagePath.ToString();
updataHeadImage();
@@ -156,7 +142,7 @@
{
new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
})
- { IsBackground = true }.Start(); UserInfo.Current.SaveUserInfo();
+ { IsBackground = true }.Start(); MainPage.LoginUser.SaveUserInfo();
MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
}
}, pid.ToString(), 1, 1);
@@ -184,7 +170,7 @@
}.Show(bodyView);
return;
}
- if (str == UserInfo.Current.userName)
+ if(str == MainPage.LoginUser.userName)
{
return;
}
@@ -197,8 +183,8 @@
var resultObj = new HttpServerRequest().EditUserName(str);
if (resultObj.Code == StateCode.SUCCESS)
{
- UserInfo.Current.userName = str;
- UserInfo.Current.SaveUserInfo();
+ MainPage.LoginUser.userName = str;
+ MainPage.LoginUser.SaveUserInfo();
Application.RunOnMainThread(() =>
{
btnUserName.Text = str;
@@ -208,7 +194,7 @@
else
{
//澶辫触鎻愮ず
- IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Member_UpdateMemberInfo, resultObj.Code);
}
}
catch (Exception ex)
@@ -225,7 +211,7 @@
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, UserInfo.Current.userName, callBack, StringId.UesrNameCannotBeEmpty, 0, new System.Collections.Generic.List<string>());
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, MainPage.LoginUser.userName, callBack, StringId.UesrNameCannotBeEmpty, 0, new System.Collections.Generic.List<string>());
};
btnUserName.MouseUpEventHandler = eventHandler;
btnEditUserNameIcon.MouseUpEventHandler = eventHandler;
@@ -237,65 +223,36 @@
/// </summary>
void LoadEvent_ChangeBindEmail()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
Action<string> action = (email) =>
{
-
- btnUserEmailInfo.Text = GetBindAccountText(email);
+ btnUserEmailInfo.Text = email;
};
- if (CheckIfUnbound(btnUserEmailInfo.Text))
- {
- //鏈粦瀹�,璺宠浆鏂扮粦瀹氶〉闈�
- var aep = new NewBindAccountPage();
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage(action);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
- else
- {
- var aep = new AccountBindInfoPage();
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage(action, 1, StringId.EmailAddress);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
-
+ var aep = new AccountBindInfoPage();
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage(action,1,StringId.EmailAddress);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnUserEmailInfo.MouseUpEventHandler = eventHandler;
btnUserEmailRight.MouseUpEventHandler = eventHandler;
userEmailInfoView.MouseUpEventHandler = eventHandler;
}
-
/// <summary>
/// 淇敼缁戝畾鎵嬫満
/// </summary>
void LoadEvent_ChangeBindPhone()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
Action<string> action = (phone) =>
{
- btnUserPhoneInfo.Text = GetBindAccountText(phone);
+ btnUserPhoneInfo.Text = phone;
};
- if (CheckIfUnbound(btnUserPhoneInfo.Text))
- {
- //鏈粦瀹�,璺宠浆鏂扮粦瀹氶〉闈�
- var aep = new NewBindAccountPage();
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage(action, true);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
- else
- {
- var aep = new AccountBindInfoPage();
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage(action, 2, StringId.PhoneInfo);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
-
-
+ var aep = new AccountBindInfoPage();
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage(action, 2, StringId.PhoneInfo);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnUserPhoneInfo.MouseUpEventHandler = eventHandler;
btnUserPhoneRight.MouseUpEventHandler = eventHandler;
@@ -326,8 +283,7 @@
/// </summary>
void LoadEvent_SkipModifyPassword()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var page = new ResetPasswordOptionPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -338,16 +294,5 @@
resetPasswordView.MouseUpEventHandler = eventHandler;
}
- /// <summary>
- ///
- /// </summary>
- void GetUserInfo()
- {
- new System.Threading.Thread(() =>
- {
- new HttpServerRequest().GetUserInfo();
- })
- { IsBackground = true }.Start();
- }
}
}
\ No newline at end of file
--
Gitblit v1.8.0