From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 66f61fc..a4d3d4b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -135,6 +135,11 @@
{
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);
@@ -159,7 +164,7 @@
}
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
-
+
/// <summary>
/// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
@@ -521,6 +526,7 @@
homeRegionName = mHome.homeRegionName,
homeRegionId = mHome.homeRegionId,
Address = mHome.homeAddress,
+ isAllowCreateScene = mHome.isAllowCreateScene,
};
UserInfo.Current.regionList.Add(home);
}
@@ -616,7 +622,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;
@@ -1963,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>
/// 缂栬緫鍦烘櫙
@@ -2049,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