From 5c5461b7c46aff66d24efe80062c235342e77d4c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 09:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 131 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 4e3ac72..6e178c4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -21,7 +21,8 @@
LoadEvent_ChangeBindPhone();
LoadEvent_SkipModifyPassword();
LoadEvent_MyQRcode();
- GetUserInfo();
+ //GetUserInfo();
+ RefreshUserInfo();
}
/// <summary>
@@ -566,63 +567,95 @@
}
- ///// <summary>
- ///// 鑾峰彇鐢ㄦ埛淇℃伅
- ///// </summary>
- ///// <returns></returns>
- //public void GetUserInfoNew()
- //{
+ /// <summary>
+ /// 2020-12-15 澧炲姞鍒锋柊鐢ㄦ埛淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public void RefreshUserInfo()
+ {
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
- // new System.Threading.Thread(() =>
- // {
- // try
- // {
- // var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
- // var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
- // if (resultObj.Code == StateCode.SUCCESS)
- // {
- // var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
- // UserInfo.Current.userEmailInfo = info.memberEmail;
- // UserInfo.Current.userMobileInfo = info.memberPhone;
- // UserInfo.Current.userName = info.memberName;
+ new Thread(() =>
+ {
+ try
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
+ var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
+ if (resultObj.Code == StateCode.SUCCESS)
+ {
+ var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
- // if (!string.IsNullOrEmpty(info.memberPhonePrefix))
- // {
- // UserInfo.Current.areaCode = info.memberPhonePrefix;
- // }
+ if (!string.IsNullOrEmpty(info.memberPhonePrefix))
+ {
+ UserInfo.Current.areaCode = info.memberPhonePrefix;
+ }
- // //2020-12-15 淇敼澶村儚鏂规
- // if (!string.IsNullOrEmpty(info.memberHeadIcon))
- // {
- // var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
+ var headImagePagePath = "";
+ //2020-12-15 淇敼澶村儚鏂规
+ if (!string.IsNullOrEmpty(info.memberHeadIcon))
+ {
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
- // if (headImageBytes != null && headImageBytes.Length > 0)
- // {
- // UserInfo.Current.headImagePagePath = info.memberHeadIcon;
- // }
- // }
+ if (headImageBytes != null && headImageBytes.Length > 0)
+ {
+ headImagePagePath = info.memberHeadIcon;
+ }
+ }
- // Application.RunOnMainThread(() =>
- // {
- // btnUserName.Text = str;
- // updataUserName();
- // });
+ Application.RunOnMainThread(() =>
+ {
+ if (UserInfo.Current.userEmailInfo != info.memberEmail)
+ {
+ //鏇存柊閭
+ UserInfo.Current.userEmailInfo = info.memberEmail;
+ btnUserEmailInfo.Text = GetBindAccountText(UserInfo.Current.userEmailInfo);
+ }
- // UserInfo.Current.SaveUserInfo();
- // MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
+ if (UserInfo.Current.userMobileInfo != info.memberPhone)
+ {
+ //鏇存柊鎵嬫満鍙�
+ UserInfo.Current.userMobileInfo = info.memberPhone;
+ btnUserPhoneInfo.Text = GetBindAccountText(UserInfo.Current.userMobileInfo);
+ }
- // //userHeadImageView
- // }
- // }
- // catch { }
- // finally
- // {
+ if (UserInfo.Current.userName != info.memberName)
+ {
+ //鏇存柊鐢ㄦ埛鍚嶅瓧
+ UserInfo.Current.userName = info.memberName;
+ btnUserName.Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName;
+ updataUserName();
+ }
+ if (!string.IsNullOrEmpty(headImagePagePath) && UserInfo.Current.headImagePagePath != headImagePagePath)
+ {
+ //鏇存柊澶村儚
+ UserInfo.Current.headImagePagePath = headImagePagePath;
+ userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath;
+ updataHeadImage();
+ }
- // }
+ UserInfo.Current.SaveUserInfo();
+ Utlis.WriteLine("鍒锋柊鐢ㄦ埛淇℃伅鎴愬姛銆�");
+ });
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
- // })
- // { IsBackground = true }.Start();
- //}
+ })
+ { IsBackground = true }.Start();
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0