From a2927467ebfa938a420f392deb6882b35570fd33 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 16:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 132 ++++++++++++++++++++++++++++++++++----------
1 files changed, 102 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 09934a6..fd746a4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -69,6 +69,9 @@
}).Start();
#endregion
+ //2.娉ㄩ攢鎺ㄩ��
+ new HttpServerRequest().SignOutPush();
+ //3.璺宠浆鐧诲綍椤甸潰
UserInfo.Current.LastTime = DateTime.MinValue;
UserInfo.Current.SaveUserInfo();
MainPage.GoLoginPage(UserInfo.Current);
@@ -115,23 +118,33 @@
btnTakePicture.MouseUpEventHandler = (sender, e) =>
{
btnTakePicture.IsSelected = false;
- var pid = Guid.NewGuid();
- CropImage.TakePicture((Action<string>)((imagePath) =>
+ //var pid = Guid.NewGuid();
+ //CropImage.TakePicture((Action<string>)((imagePath) =>
+ //{
+ // if (imagePath != null)
+ // {
+ // UserInfo.Current.headImagePagePath = imagePath.ToString();
+ // userHeadImageView.ImagePath = imagePath.ToString();
+ // updataHeadImage();
+ // new System.Threading.Thread(() =>
+ // {
+ // new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
+ // })
+ // { IsBackground = true }.Start();
+ // UserInfo.Current.SaveUserInfo();
+ // MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+ // }
+ //}), pid.ToString(), 1, 1);
+
+ //鎷嶇収瑁佸壀
+ var imageName = "headImage";
+ //var imageName = Guid.NewGuid().ToString();
+ CropImage.TakePicture((imagePath) =>
{
- if (imagePath != null)
- {
- UserInfo.Current.headImagePagePath = imagePath.ToString();
- userHeadImageView.ImagePath = imagePath.ToString();
- updataHeadImage();
- new System.Threading.Thread(() =>
- {
- new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
- })
- { IsBackground = true }.Start();
- UserInfo.Current.SaveUserInfo();
- MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
- }
- }), pid.ToString(), 1, 1);
+ CropImageCallBack(imagePath, imageName);
+
+ }, imageName, 1, 1);
+
pictureOptionView.RemoveFromParent();
baseView.RemoveFromParent();
};
@@ -144,29 +157,88 @@
btnAlbum.MouseUpEventHandler = (sender, e) =>
{
btnAlbum.IsSelected = false;
- var pid = Guid.NewGuid();
+ //var pid = Guid.NewGuid();
+ //CropImage.SelectPicture((imagePath) =>
+ //{
+ // if (imagePath != null)
+ // {
+ // UserInfo.Current.headImagePagePath = imagePath.ToString();
+ // userHeadImageView.ImagePath = imagePath.ToString();
+ // updataHeadImage();
+
+ // new System.Threading.Thread(() =>
+ // {
+ // new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
+ // })
+ // { IsBackground = true }.Start(); UserInfo.Current.SaveUserInfo();
+ // MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+ // }
+ //}, pid.ToString(), 1, 1);
+
+ //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+ //var imageName = Guid.NewGuid().ToString();
+ var imageName = "headImage";
CropImage.SelectPicture((imagePath) =>
{
- if (imagePath != null)
- {
- UserInfo.Current.headImagePagePath = imagePath.ToString();
- userHeadImageView.ImagePath = imagePath.ToString();
- updataHeadImage();
+ CropImageCallBack(imagePath, imageName);
+ }, imageName, 1, 1);
- new System.Threading.Thread(() =>
- {
- new DAL.Server.HttpServerRequest().UpdataUserHeadImage(imagePath);
- })
- { IsBackground = true }.Start(); UserInfo.Current.SaveUserInfo();
- MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
- }
- }, pid.ToString(), 1, 1);
pictureOptionView.RemoveFromParent();
baseView.RemoveFromParent();
};
}
/// <summary>
+ /// 瑁佸壀瀹岀収鐗囧洖璋冿紝缁熶竴澶勭悊
+ /// </summary>
+ /// <param name="imagePath">瑁佸壀鍚庣殑鐪熷疄璺緞</param>
+ /// <param name="imageName">鑷畾涔夌殑鍥剧墖鍚嶇О</param>
+ void CropImageCallBack(string imagePath, string imageName)
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ try
+ {
+ MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+
+ var headPath = imagePath;
+#if __IOS__
+
+
+#else
+ //1.浣跨敤鏂板悕瀛楋紝瑙ｅ喅鐩稿悓璺緞涓嶅埛鏂板浘鐗囬棶棰�
+ imageName = Guid.NewGuid().ToString() + ".png";
+ //1.2鍒犻櫎鍘熸潵鏈湴澶村儚
+ System.IO.File.Delete(userHeadImageView.ImagePath);
+ Utlis.WriteLine("鍒犻櫎: " + userHeadImageView.ImagePath);
+ //1.3濡傛灉鏄畨鍗撻渶瑕佹嫹璐濆洖鏉PP鏍圭洰褰�
+ FileUtils.FileCopyToRootPath(imagePath, imageName);
+ System.IO.File.Delete(imagePath);
+ headPath = imageName;
+ MainPage.Log("SelectPicture 鏈�缁堣矾寰�: " + imageName);
+#endif
+
+ //娓呯┖鍘熸潵鍥剧墖
+ userHeadImageView.ImagePath = "NULL";
+ //鐢熸垚鍥剧墖
+ UserInfo.Current.headImagePagePath = headPath;
+ userHeadImageView.ImagePath = headPath;
+ updataHeadImage();
+
+ new System.Threading.Thread(() =>
+ {
+ new DAL.Server.HttpServerRequest().UpdataUserHeadImage(headPath);
+ })
+ { IsBackground = true }.Start();
+ UserInfo.Current.SaveUserInfo();
+ }
+ catch { }
+
+ }
+
+ /// <summary>
/// 鍔犺浇淇敼鐢ㄦ埛鍚嶇О浜嬩欢
/// </summary>
void LoadEvent_EditUserName()
--
Gitblit v1.8.0