From 1a13c963a5fb8cad92bf03667e411f46d6a6a843 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:10:33 +0800
Subject: [PATCH] Revert "Merge branch 'tzy' into NewFilePath"
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 97da5b8..6ff56cb 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -131,36 +131,13 @@
/// 缁戝畾璋冭瘯浜哄憳鎻愪氦鐨勪綇瀹�,涓�涓綇瀹呭彧鑳界粦瀹氫竴娆�
/// </summary>
/// <returns></returns>
- public ResponsePackNew BindingResidence(string strUrl)
+ public ResponsePackNew BindingResidence(string key)
{
- 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;
- }
+ 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);
}
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
@@ -622,7 +599,7 @@
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.GatewayOnline = true;
--
Gitblit v1.8.0