From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 154 insertions(+), 21 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs index 5689818..4d984e0 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> @@ -180,7 +181,7 @@ btnTakePicture.MouseUpEventHandler = (sender, e) => { btnTakePicture.IsSelected = false; - + //鎷嶇収瑁佸壀 //var imageName = "headImage"; var imageName = Guid.NewGuid().ToString(); @@ -257,34 +258,58 @@ var waitPage = new Loading(); bodyView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); - //寮�濮嬩笂浼� + //1.寮�濮嬩笂浼� new Thread(() => { try { - var uploadImageObj = ImageUtlis.Current.GetHeadImageUploadKeyObj(userId); - uploadImageObj.content = imageBytes; + //鐢熸垚涓婁紶澶村儚鍙傛暟 + var uploadImageObj = new UploadImageObj() + { + prefix = "Icon" + Utlis.GetTimestamp(), + uid = userId, + fileName = ImageUtlis.HEADIMAGE, + content = imageBytes, + }; + var imageUrl = ImageUtlis.Current.UploadImage(uploadImageObj); if (!string.IsNullOrEmpty(imageUrl) && imageUrl.Contains(userId)) { - //涓婁紶鎴愬姛 - Application.RunOnMainThread(() => + //2.涓婁紶鎴愬姛 + //2.1鏇存柊鏈�鏂板浘鐗囪矾寰勫埌浜戠 + var resultObj = UpdateMemberHeadIcon(imageUrl); + if (resultObj.Code == StateCode.SUCCESS) { - //Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl); - //1.2濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨� - if (!string.IsNullOrEmpty(imageView.ImagePath) && !imageView.ImagePath.Contains("LoginIcon/2.png")) + //3.鏇存柊鏈�鏂板浘鐗囪矾寰勫埌浜戠鎴愬姛 + Application.RunOnMainThread(() => { - //Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath); - System.IO.File.Delete(imageView.ImagePath); - } - //閲嶅懡鍚嶄繚瀛� - ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes); - imageView.ImagePath = imageUrl; - imageView.ImageBytes = imageBytes; - //涓婁紶鎴愬姛 - Utlis.ShowTip(Language.StringByID(StringId.UploadSuccessfully)); - uploadSuccessAction?.Invoke(imageUrl); - }); + //Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl); + //1.2濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨� + if (!string.IsNullOrEmpty(imageView.ImagePath) && !imageView.ImagePath.Contains("LoginIcon/2.png")) + { + //Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath); + System.IO.File.Delete(imageView.ImagePath); + } + //閲嶅懡鍚嶄繚瀛� + ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes); + imageView.ImagePath = imageUrl; + imageView.ImageBytes = imageBytes; + //涓婁紶鎴愬姛 + Utlis.ShowTip(Language.StringByID(StringId.UploadSuccessfully)); + uploadSuccessAction?.Invoke(imageUrl); + }); + } + else + { + //鏇存柊鏈�鏂板浘鐗囪矾寰勫埌浜戠澶辫触 + Application.RunOnMainThread(() => + { + //淇濆瓨鐢ㄦ埛澶村儚澶辫触 + Utlis.ShowTip(Language.StringByID(StringId.FailedToSaveUserImage)); + }); + + } + } else { @@ -315,6 +340,20 @@ { IsBackground = true }.Start(); } catch { } + } + + /// <summary> + /// 鏇存柊鐢ㄦ埛澶村儚 + /// </summary> + /// <param name="userName"></param> + /// <returns></returns> + public ResponsePackNew UpdateMemberHeadIcon(string memberHeadIcon) + { + var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberHeadIconRes() + { + memberHeadIcon = memberHeadIcon + }); + return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson); } /// <summary> @@ -526,5 +565,99 @@ }) { IsBackground = true }.Start(); } + + + /// <summary> + /// 2020-12-15 澧炲姞鍒锋柊鐢ㄦ埛淇℃伅 + /// </summary> + /// <returns></returns> + public void RefreshUserInfo() + { + var waitPage = new Loading(); + bodyView.AddChidren(waitPage); + waitPage.Start(Language.StringByID(StringId.PleaseWait)); + + 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; + } + + var headImagePagePath = ""; + //2020-12-15 淇敼澶村儚鏂规 + if (!string.IsNullOrEmpty(info.memberHeadIcon)) + { + var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon); + + if (headImageBytes != null && headImageBytes.Length > 0) + { + headImagePagePath = info.memberHeadIcon; + } + } + + Application.RunOnMainThread(() => + { + if (UserInfo.Current.userEmailInfo != info.memberEmail) + { + //鏇存柊閭 + UserInfo.Current.userEmailInfo = info.memberEmail; + btnUserEmailInfo.Text = GetBindAccountText(UserInfo.Current.userEmailInfo); + } + + if (UserInfo.Current.userMobileInfo != info.memberPhone) + { + //鏇存柊鎵嬫満鍙� + UserInfo.Current.userMobileInfo = info.memberPhone; + btnUserPhoneInfo.Text = GetBindAccountText(UserInfo.Current.userMobileInfo); + } + + 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(); + } } + + } \ No newline at end of file -- Gitblit v1.8.0