~wxr/HDL_APP_Project.git

			@@ -21,7 +21,8 @@
			LoadEvent_ChangeBindPhone();
			LoadEvent_SkipModifyPassword();
			LoadEvent_MyQRcode();
			GetUserInfo();
			//GetUserInfo();
			RefreshUserInfo();
			}

			/// <summary>
			@@ -80,65 +81,65 @@
			// DB_ResidenceData.residenceData.EixtAccount();
			//}

			/// <summary>
			/// 退出登录操作
			/// </summary>
			public void LogoutNew()
			{
			//加载Loading效果
			var waitPage = new Loading();
			bodyView.AddChidren(waitPage);
			waitPage.Start(Language.StringByID(StringId.PleaseWait));
			///// <summary>
			///// 退出登录操作
			///// </summary>
			//public void LogoutNew()
			//{
			// //加载Loading效果
			// var waitPage = new Loading();
			// bodyView.AddChidren(waitPage);
			// waitPage.Start(Language.StringByID(StringId.PleaseWait));

			new Thread(() =>
			{
			try
			{
			#region 保存本地数据至文件夹
			string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
			//清空之前的住宅文件
			FileUtils.DeleteRegionFiles(oldRegionRootPath);
			var backuplist = FileUtils.ReadFiles();
			//移动文件
			foreach (var fileName in backuplist)
			{
			System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
			if (fileInfo.Exists)
			{
			fileInfo.MoveTo(oldRegionRootPath + fileName);
			MainPage.Log("move file : " + fileName);
			}
			}
			#endregion
			}
			catch (Exception ex)
			{
			MainPage.Log($"xxx:{ex.Message}");
			}
			finally
			{
			FileUtils.DeleteAllFile();
			//2.注销推送
			new HttpServerRequest().SignOutPush();
			//3.跳转登录页面
			UserInfo.Current.LastTime = DateTime.MinValue;
			UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
			UserInfo.Current.SaveUserInfo();
			Shared.Application.RunOnMainThread(() =>
			{
			if (waitPage != null)
			{
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			// new Thread(() =>
			// {
			// try
			// {
			// #region 保存本地数据至文件夹
			// //string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
			// ////清空之前的住宅文件
			// //FileUtils.DeleteRegionFiles(oldRegionRootPath);
			// //var backuplist = FileUtils.ReadFiles();
			// ////移动文件
			// //foreach (var fileName in backuplist)
			// //{
			// // System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
			// // if (fileInfo.Exists)
			// // {
			// // fileInfo.MoveTo(oldRegionRootPath + fileName);
			// // MainPage.Log("move file : " + fileName);
			// // }
			// //}
			// #endregion
			// }
			// catch (Exception ex)
			// {
			// MainPage.Log($"xxx:{ex.Message}");
			// }
			// finally
			// {
			// //FileUtils.DeleteAllFile();
			// //2.注销推送
			// new HttpServerRequest().SignOutPush();
			// //3.跳转登录页面
			// UserInfo.Current.LastTime = DateTime.MinValue;
			// UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
			// UserInfo.Current.SaveUserInfo();
			// Shared.Application.RunOnMainThread(() =>
			// {
			// if (waitPage != null)
			// {
			// waitPage.RemoveFromParent();
			// waitPage = null;
			// }

			MainPage.GoLoginPage(UserInfo.Current);
			DB_ResidenceData.residenceData.EixtAccount();
			// MainPage.GoLoginPage(UserInfo.Current);
			// DB_ResidenceData.residenceData.EixtAccount();

			});
			}
			}).Start();
			}
			// });
			// }
			// }).Start();
			//}

			/// <summary>
			/// 退出账号登录事件
			@@ -149,7 +150,7 @@
			{
			Action okAction = () =>
			{
			LogoutNew();
			HDLCommon.Current.Logout();
			};
			new ConfirmDialog().ShowDialog(StringId.Tip, StringId.IfConfirmLogout, okAction);
			};
			@@ -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 (!imageView.ImagePath.Contains("LoginIcon/2.png"))
			//3.更新最新图片路径到云端成功
			Application.RunOnMainThread(() =>
			{
			Utlis.WriteLine("删除: " + imageView.ImagePath);
			System.IO.File.Delete(imageView.ImagePath);
			}
			//重命名保存
			FileUtils.WriteFileByBytes(imageUrl, imageBytes);
			imageView.ImagePath = null;
			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();
			}
			}


			}