From 0bd4d1702248641f180345a086e5b3f58e6eb04c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 17:13:23 +0800
Subject: [PATCH] 2020-12-15 1.更新
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 88 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 2a667fb..0052ff6 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -297,6 +297,7 @@
UserInfo.Current.userEmailInfo = info.memberEmail;
UserInfo.Current.userMobileInfo = info.memberPhone;
UserInfo.Current.userName = info.memberName;
+
if (!string.IsNullOrEmpty(info.memberPhonePrefix))
{
UserInfo.Current.areaCode = info.memberPhonePrefix;
@@ -304,14 +305,16 @@
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
- var imageKey = ImageUtlis.Current.GetHeadImageKey(info.memberId);
-
- var headImageBytes = ImageUtlis.Current.DownHeadImage(info.memberId);
-
- if (headImageBytes != null && headImageBytes.Length > 0)
+ //2020-12-15 淇敼澶村儚鏂规
+ if (!string.IsNullOrEmpty(info.memberHeadIcon))
{
- //UserInfo.Current.headImagePageBytes = headImageBytes;
- UserInfo.Current.headImagePagePath = imageKey;
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
+
+ if (headImageBytes != null && headImageBytes.Length > 0)
+ {
+ UserInfo.Current.headImagePagePath = info.memberHeadIcon;
+ //UserInfo.Current.headImagePagePath = imageKey;
+ }
}
}
@@ -375,11 +378,9 @@
/// 鑾峰彇鐢ㄦ埛澶村儚
/// </summary>
/// <param name="userId"></param>
- public void GetUserHeadImage(string userId)
+ public void GetUserHeadImageByKey(string imageKey)
{
- var imageKey = ImageUtlis.Current.GetHeadImageKey(userId);
-
- var headImageBytes = ImageUtlis.Current.DownHeadImage(userId);
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(imageKey);
if (headImageBytes != null && headImageBytes.Length > 0)
{
@@ -401,6 +402,20 @@
});
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
+
+ ///// <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>
///// 鏇存柊鐢ㄦ埛澶村儚
@@ -491,28 +506,45 @@
};
UserInfo.Current.regionList.Add(home);
}
- //浣忓畢琚垹闄�
- if (UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID) == null)
+ //-------濡傛灉璐﹀彿鏄娆＄櫥褰�
+ if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID))
{
- Shared.Application.RunOnMainThread(() =>
- {
- DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
- GetHomeGatewayList();
- DB_ResidenceData.Instance.SaveResidenceData();
- UserInfo.Current.SaveUserInfo();
- Action action = () =>
- {
- MainPage.GoUserPage();
- };
- new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
- });
- }
- else
- {
+ //鍒锋柊褰撳墠浣忓畢
+ DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
+ DB_ResidenceData.Instance.SaveResidenceData();
UserInfo.Current.SaveUserInfo();
//鍒锋柊涓�娆′綇瀹呯綉鍏�
GetHomeGatewayList();
}
+ else
+ {
+ //浣忓畢琚垹闄�
+ var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ if (findHome == null)
+ {
+ Shared.Application.RunOnMainThread(() =>
+ {
+ DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
+ GetHomeGatewayList();
+ DB_ResidenceData.Instance.SaveResidenceData();
+ UserInfo.Current.SaveUserInfo();
+ Action action = () =>
+ {
+ MainPage.GoUserPage();
+ };
+ new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
+ });
+ }
+ else
+ {
+ //鍒锋柊褰撳墠浣忓畢
+ DB_ResidenceData.Instance.CurrentRegion = findHome;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ UserInfo.Current.SaveUserInfo();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ GetHomeGatewayList();
+ }
+ }
}
}
--
Gitblit v1.8.0