From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 104 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 2a667fb..a4d3d4b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -131,17 +131,40 @@
/// 缁戝畾璋冭瘯浜哄憳鎻愪氦鐨勪綇瀹�,涓�涓綇瀹呭彧鑳界粦瀹氫竴娆�
/// </summary>
/// <returns></returns>
- public ResponsePackNew BindingResidence(string key)
+ public ResponsePackNew BindingResidence(string strUrl)
{
- Dictionary<string, object> d = new Dictionary<string, object>();
- //d.Add("homeId", homeId);
- d.Add("secretKey", key);
- var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindlingResidence, requestJson, HttpUtil.GlobalRequestHttpsHost);
+ try
+ {
+ if (strUrl.Contains("app/home/deliver") == false)
+ {
+ //闈炴硶鐨刄RL 杩斿洖涓�涓嚜瀹氫箟鐨勭姸鎬佺爜
+ return new ResponsePackNew() { Code = "-100" };
+ }
+ var client = new RestSharp.RestClient(strUrl);
+
+ var request = new RestSharp.RestRequest(RestSharp.Method.GET);
+ request.Timeout = 5 * 1000;
+ request.AddHeader("content-type", "application/json");
+ request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);
+
+ var response = client.Execute(request);
+ if (response.StatusCode == HttpStatusCode.OK)
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
+ }
+ else
+ {
+ return null;
+ }
+ }
+ catch
+ {
+ return null;
+ }
}
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
-
+
/// <summary>
/// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
@@ -297,6 +320,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 +328,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 +401,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 +425,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>
///// 鏇存柊鐢ㄦ埛澶村儚
@@ -488,30 +526,48 @@
homeRegionName = mHome.homeRegionName,
homeRegionId = mHome.homeRegionId,
Address = mHome.homeAddress,
+ isAllowCreateScene = mHome.isAllowCreateScene,
};
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();
+ }
}
}
}
@@ -566,10 +622,14 @@
if (mHomeGatewayRes.Count > 0)
{
DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
- if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
+ if(mHomeGatewayRes[0].gatewayStatus)
{
- DriverLayer.Control.Ins.IsRemote = true;
+ //DriverLayer.Control.Ins.IsRemote = true;
DriverLayer.Control.Ins.GatewayOnline = true;
+ }
+ else
+ {
+ DriverLayer.Control.Ins.GatewayOnline = false;
}
DB_ResidenceData.Instance.SaveResidenceData();
return;
@@ -1896,7 +1956,7 @@
d.Add("userSceneIds",new List<string>() { seceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
}
/// <summary>
/// 娣诲姞鍦烘櫙
@@ -1909,7 +1969,11 @@
d.Add("scenes", new List<Scene>() { scene });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
+
+ MainPage.Log($"{pack.Data}");
+
+ return pack;
}
/// <summary>
/// 缂栬緫鍦烘櫙
@@ -1995,6 +2059,7 @@
{
d.Add("roomType", GetType);
}
+ d.Add("pageSize", "1000");
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
--
Gitblit v1.8.0