From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 214 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 136 insertions(+), 78 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 41b9bcd..09934a6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -18,6 +19,8 @@
LoadEvent_ChangeBindEmail();
LoadEvent_ChangeBindPhone();
LoadEvent_SkipModifyPassword();
+ LoadEvent_MyQRcode();
+ GetUserInfo();
}
/// <summary>
@@ -32,46 +35,58 @@
}
/// <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) =>
{
- #region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す
- string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- new System.Threading.Thread(() =>
+ Action 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();
+ Logout();
+ };
+ new ConfirmDialog().ShowDialog(StringId.Tip, StringId.IfConfirmLogout, okAction);
};
}
@@ -84,7 +99,8 @@
{
baseView.RemoveFromParent();
};
- baseView.MouseUpEventHandler = (sender, e) => {
+ baseView.MouseUpEventHandler = (sender, e) =>
+ {
baseView.RemoveFromParent();
};
btnCancel.MouseUpEventHandler = (sender, e) =>
@@ -104,7 +120,7 @@
{
if (imagePath != null)
{
- MainPage.LoginUser.headImagePagePath = imagePath.ToString();
+ UserInfo.Current.headImagePagePath = imagePath.ToString();
userHeadImageView.ImagePath = imagePath.ToString();
updataHeadImage();
new System.Threading.Thread(() =>
@@ -112,7 +128,7 @@
new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
})
{ IsBackground = true }.Start();
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
}
}), pid.ToString(), 1, 1);
@@ -133,7 +149,7 @@
{
if (imagePath != null)
{
- MainPage.LoginUser.headImagePagePath = imagePath.ToString();
+ UserInfo.Current.headImagePagePath = imagePath.ToString();
userHeadImageView.ImagePath = imagePath.ToString();
updataHeadImage();
@@ -141,7 +157,7 @@
{
new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
})
- { IsBackground = true }.Start(); MainPage.LoginUser.SaveUserInfo();
+ { IsBackground = true }.Start(); UserInfo.Current.SaveUserInfo();
MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
}
}, pid.ToString(), 1, 1);
@@ -169,7 +185,7 @@
}.Show(bodyView);
return;
}
- if(str == MainPage.LoginUser.userName)
+ if (str == UserInfo.Current.userName)
{
return;
}
@@ -179,11 +195,11 @@
{
try
{
- var responsePack = new DAL.Server.HttpServerRequest().EditUserName(str);
- if (responsePack.StateCode.ToUpper() == "SUCCESS")
+ var resultObj = new HttpServerRequest().EditUserName(str);
+ if (resultObj.Code == StateCode.SUCCESS)
{
- MainPage.LoginUser.userName = str;
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.userName = str;
+ UserInfo.Current.SaveUserInfo();
Application.RunOnMainThread(() =>
{
btnUserName.Text = str;
@@ -192,27 +208,8 @@
}
else
{
- var tipStr = "Server erorr";
- switch (responsePack.StateCode)
- {
- case "NoLogin":
- tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
- break;
- case "AccountNoExists":
- tipStr = "";
- break;
- }
- Application.RunOnMainThread(() =>
- {
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- });
+ //澶辫触鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
}
}
catch (Exception ex)
@@ -229,10 +226,30 @@
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, MainPage.LoginUser.userName, callBack, StringId.UesrNameCannotBeEmpty, 0, new System.Collections.Generic.List<string>());
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, UserInfo.Current.userName, callBack, StringId.UesrNameCannotBeEmpty, 0, new System.Collections.Generic.List<string>());
};
btnUserName.MouseUpEventHandler = eventHandler;
btnEditUserNameIcon.MouseUpEventHandler = eventHandler;
+ }
+
+ /// <summary>
+ /// 鍔犺浇鎴戠殑浜岀淮鐮佷簨浠�
+ /// </summary>
+ void LoadEvent_MyQRcode()
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ //鎴戠殑浜岀淮鐮�
+ var aep = new MyQRCodePage();
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ };
+ _QRcodeView.MouseUpEventHandler = eventHandler;
+ btnQRcode.MouseUpEventHandler = eventHandler;
+ btnQRcodeIcon.MouseUpEventHandler = eventHandler;
+ btnQRcodeRight.MouseUpEventHandler = eventHandler;
}
#region 淇敼缁戝畾閭
@@ -241,36 +258,65 @@
/// </summary>
void LoadEvent_ChangeBindEmail()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
Action<string> action = (email) =>
{
- btnUserEmailInfo.Text = email;
+
+ btnUserEmailInfo.Text = GetBindAccountText(email);
};
- var aep = new AccountBindInfoPage();
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage(action,1,StringId.EmailAddress);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ 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;
+ }
+
};
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 = phone;
+ btnUserPhoneInfo.Text = GetBindAccountText(phone);
};
- var aep = new AccountBindInfoPage();
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage(action, 2, StringId.PhoneInfo);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ 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;
+ }
+
+
};
btnUserPhoneInfo.MouseUpEventHandler = eventHandler;
btnUserPhoneRight.MouseUpEventHandler = eventHandler;
@@ -301,7 +347,8 @@
/// </summary>
void LoadEvent_SkipModifyPassword()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
var page = new ResetPasswordOptionPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -312,5 +359,16 @@
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