From 387383a243879bf8c63a4611e2ed2c5a519e218d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:14:29 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 75 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index d26f168..e2208cb 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;
@@ -38,10 +39,39 @@
{
btnLogout.MouseUpEventHandler += (sender, e) =>
{
+ #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
+
MainPage.LoginUser.lastTime = DateTime.MinValue;
MainPage.LoginUser.SaveUserInfo();
MainPage.GoLoginPage(MainPage.LoginUser);
- FileUtils.DeleteAllFile();
DB_ResidenceData.residenceData.EixtAccount();
};
}
@@ -49,16 +79,18 @@
/// <summary>
/// 鍔犺浇鑳屾櫙鍥鹃�夋嫨鍖哄煙浜嬩欢鍒楄〃
/// </summary>
- void LoadEvent_PictureOptionViewEventList()
+ void LoadEvent_PictureOptionViewEventList(FrameLayout baseView)
{
pictureOptionView.MouseUpEventHandler = (sender, e) =>
{
- pictureOptionView.RemoveFromParent();
+ baseView.RemoveFromParent();
};
-
+ baseView.MouseUpEventHandler = (sender, e) => {
+ baseView.RemoveFromParent();
+ };
btnCancel.MouseUpEventHandler = (sender, e) =>
{
- pictureOptionView.RemoveFromParent();
+ baseView.RemoveFromParent();
};
btnTakePicture.MouseUpEventHandler = (sender, e) =>
@@ -86,6 +118,7 @@
}
}), pid.ToString(), 1, 1);
pictureOptionView.RemoveFromParent();
+ baseView.RemoveFromParent();
};
btnAlbum.MouseUpEventHandler = (sender, e) =>
@@ -114,6 +147,7 @@
}
}, pid.ToString(), 1, 1);
pictureOptionView.RemoveFromParent();
+ baseView.RemoveFromParent();
};
}
@@ -130,7 +164,7 @@
{
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.UesrNameCannotBeEmpty),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
@@ -146,8 +180,8 @@
{
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();
@@ -159,27 +193,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 = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- });
+ //澶辫触鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Member_UpdateMemberInfo, resultObj.Code);
}
}
catch (Exception ex)
@@ -196,7 +211,7 @@
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.UesrName, MainPage.LoginUser.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;
--
Gitblit v1.8.0