~wxr/HDL_APP_Project.git

			@@ -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;