From 23ca39219c5075d829d14137cb54896a24ae513d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 13:57:08 +0800
Subject: [PATCH] 20201204
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 7c257e3..edf40dd 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -631,6 +631,11 @@
if (mHomeGatewayRes.Count > 0)
{
DB_ResidenceData.residenceData.HomeGateway = mHomeGatewayRes[0];
+ if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
+ {
+ DriverLayer.Control.Ins.IsRemote = true;
+ DriverLayer.Control.Ins.GatewayOnline = true;
+ }
DB_ResidenceData.residenceData.SaveResidenceData();
return;
}
@@ -1809,7 +1814,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.id);
+ d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId);
//d.Add("roomId", DB_ResidenceData.residenceData.residecenInfo.RegionID);//鍙帶鍙傛暟锛屽綋闇�瑕佸垎椤佃幏鍙栵紝鎬庝箞鐭ラ亾鍒嗛〉鎬绘暟
//d.Add("searchType", DB_ResidenceData.residenceData.residecenInfo.RegionID);
//d.Add("pageSize", DB_ResidenceData.residenceData.residecenInfo.RegionID);
@@ -1950,10 +1955,11 @@
public ResponsePackNew AddScene(Scene scene)
{
Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
d.Add("scenes", new List<Scene>() { scene });
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditSecne, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
}
/// <summary>
/// 缂栬緫鍦烘櫙
@@ -2041,14 +2047,7 @@
}
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
- var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
- if (revData != null)
- {
- foreach (var spatial in revData)
- {
- spatial.UpdateSpatialInfoData();
- }
- }
+
return pack;
}
/// <summary>
@@ -2067,10 +2066,7 @@
var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
if (revData != null)
{
- foreach (var spatial in revData)
- {
- spatial.UpdateSpatialInfoData();
- }
+ SpatialInfo.CurrentSpatial.UpdateSpatialList(revData, OptionType.Update);
}
return pack;
}
@@ -2086,14 +2082,11 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UpdateRoom, requestJson);
- var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
- if (revData != null)
- {
- foreach (var spatial in revData)
- {
- spatial.UpdateSpatialInfoData();
- }
- }
+ //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
+ //if (revData != null)
+ //{
+ // SpatialInfo.CurrentSpatial.UpdateSpatialList(revData,OptionType.Update);
+ //}
return pack;
}
/// <summary>
--
Gitblit v1.8.0