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/MemberManagement/MemberManagementPageBLL.cs | 125 +++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 60 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index e8b73b7..e659d9c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -58,6 +58,22 @@
}
/// <summary>
+ /// 妫�娴嬫槸鍚﹂渶瑕佷笅杞藉ご鍍忓苟淇濆瓨鍒版湰鍦�
+ /// </summary>
+ void CheckIfDownloadHeadImage(ResidenceMemberInfo residenceMemberInfo)
+ {
+ if (string.IsNullOrEmpty(residenceMemberInfo.memberHeadIcon)) return;
+
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(residenceMemberInfo.memberHeadIcon, false, residenceMemberInfo.childAccountRegionUrl);
+
+ if (headImageBytes != null && headImageBytes.Length > 0)
+ {
+ residenceMemberInfo.headImagePagePath = residenceMemberInfo.memberHeadIcon;
+ Utlis.WriteLine("瀛愯处鍙峰ご鍍忚幏鍙栨垚鍔�");
+ }
+ }
+
+ /// <summary>
/// 璋冪敤鑾峰彇浣忓畢瀛愯处鍙蜂俊鎭�
/// </summary>
bool LoadMethod_GetResidenceMemberAccount()
@@ -69,26 +85,15 @@
var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
foreach (var mInfo in responeObj)
{
- //ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.childAccountId);
- //var dataStr = JObject.FromObject(memberInfoResponePack.ResponseData);
- //FileStream fs = null;
try
{
- //var headImageString = dataStr.GetValue("HeadImage").ToString();
- //if (!string.IsNullOrEmpty(headImageString))
- //{
- // var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
- // var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
- // var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", mInfo.childAccountId + ".png");
- // fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
- // fs.Write(headImageBytes, 0, headImageBytes.Length);
- // fs.Flush();
- // mInfo.headImagePagePath = filePath;
- //}
- if(string.IsNullOrEmpty(mInfo.nickName))
+ //璁剧疆鐢ㄦ埛鏄电О
+ if (string.IsNullOrEmpty(mInfo.nickName))
{
- mInfo.nickName = mInfo.UserName;
+ mInfo.nickName = mInfo.memberName;
}
+ //璁剧疆鐢ㄦ埛澶村儚璺緞
+ CheckIfDownloadHeadImage(mInfo);
}
catch (Exception ex)
{
@@ -96,12 +101,7 @@
}
finally
{
- //if (fs != null)
- //{
- // fs.Close();
- //}
- ////-----------鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
- LoadMethod_GetMemberSharedDataList(mInfo);
+
}
residenceMemberInfos.Add(mInfo);
}
@@ -112,51 +112,51 @@
{
//鎻愮ず
IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
- //璐﹀彿鎴栬�呭瘑鐮侀敊璇�
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- });
}
Application.RunOnMainThread(() =>
{
waitPage?.Hide();
+ waitPage?.RemoveFromParent();
});
return result;
}
- /// <summary>
- /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
- /// </summary>
- /// <param name="info"></param>
- void LoadMethod_GetMemberSharedDataList(ResidenceMemberInfo info)
- {
- var responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.childAccountId);
- if (responePack.Code == StateCode.SUCCESS)
- {
- var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.Data.ToString());
- info.CurResidenceShareDate = responeObj;
- foreach (var sd in info.CurResidenceShareDate)
- {
- LoadMethod_GetMemberSharedData(sd);
- }
- }
- }
+ ///// <summary>
+ ///// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+ ///// </summary>
+ ///// <param name="info"></param>
+ //void LoadMethod_GetMemberSharedDataList(ResidenceMemberInfo info)
+ //{
+ // var responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.childAccountId);
+ // if (responePack.Code == StateCode.SUCCESS)
+ // {
+ // var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.Data.ToString());
+ // info.CurResidenceShareDate = responeObj;
+ // //foreach (var sd in info.CurResidenceShareDate)
+ // //{
+ // // LoadMethod_GetMemberSharedData(sd);
+ // //}
+ // }
+ // else
+ // {
+ // info.CurResidenceShareDate = new List<ShareData>();
+ // }
+ //}
- /// <summary>
- /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
- /// </summary>
- /// <param name="info"></param>
- bool LoadMethod_GetMemberSharedData(ShareData sd)
- {
- var shareDataBytes = new HttpServerRequest().GetShareData(sd);
- if (shareDataBytes != null)
- {
- sd.ShareDataBytes = shareDataBytes;
- return true;
- }
- return false;
- }
+ ///// <summary>
+ ///// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
+ ///// </summary>
+ ///// <param name="info"></param>
+ //bool LoadMethod_GetMemberSharedData(ShareData sd)
+ //{
+ // var shareDataBytes = new HttpServerRequest().GetShareData(sd);
+ // if (shareDataBytes != null)
+ // {
+ // sd.ShareDataBytes = shareDataBytes;
+ // return true;
+ // }
+ // return false;
+ //}
/// <summary>
/// 淇敼鏄电О绐楀彛
@@ -179,6 +179,7 @@
}
var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
new Thread(() =>
{
@@ -206,13 +207,17 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.nickName, callBack, StringId.HouseNameCannotBeEmpty, 0, new List<string>());
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.nickName, callBack, StringId.NicknameCannotBeEmpty, 0, new List<string>());
};
btn1.MouseUpEventHandler = eventHandler;
btn2.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0