From 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 08 十二月 2020 18:57:15 +0800 Subject: [PATCH] 20201208 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 53 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 42 insertions(+), 11 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index 09c3ea8..36f80d6 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -1826,6 +1826,20 @@ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieInfoList, requestJson); } /// <summary> + /// 鍒锋柊璁惧鐘舵�� + /// </summary> + /// <returns></returns> + public ResponsePackNew RefreshDeviceStatus(List<string> functionIds) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID); + d.Add("deviceIds", functionIds); + + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_RefreshDeviceStatus, requestJson); + } + + /// <summary> /// 鎺у埗璁惧 /// </summary> /// <returns></returns> @@ -1838,6 +1852,23 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson); + } + /// <summary> + /// 缂栬緫璁惧淇℃伅 + /// 缁戝畾鍏崇郴銆佸悕绉般�佹敹钘� + /// </summary> + /// <returns></returns> + public ResponsePackNew UpdataDevcieInfo(Function function) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID); + d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId);//DriverLayer.Control.Ins.GatewayId); + d.Add("name", function.name); + d.Add("collect", function.collect); + d.Add("roomIds", function.roomIds); + + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson); } /// <summary> /// 璁惧缁戝畾鎴块棿 @@ -1881,26 +1912,26 @@ /// <summary> /// 鏀惰棌璁惧 /// </summary> - public string CollectDevice(string deviceId) + public ResponsePackNew CollectDevice(string deviceId) { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID); - d.Add("deviceId",new List<string>() { deviceId }); + d.Add("deviceIds",new List<string>() { deviceId }); var requestJson = HttpUtil.GetSignRequestJson(d); - return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectDevice, requestJson).Code; + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectDevice, requestJson); } /// <summary> /// 鍙栨秷鏀惰棌璁惧 /// </summary> - public string CancelCollectDevice(string deviceId) + public ResponsePackNew CancelCollectDevice(string deviceId) { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID); - d.Add("deviceId", new List<string>() { deviceId }); + d.Add("deviceIds", new List<string>() { deviceId }); var requestJson = HttpUtil.GetSignRequestJson(d); - return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson).Code; + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson); } #endregion @@ -2052,11 +2083,11 @@ var requestJson = HttpUtil.GetSignRequestJson(d); var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddRoom, requestJson); - var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString()); - if (revData != null) - { - SpatialInfo.CurrentSpatial.UpdateSpatialList(revData, OptionType.Update); - } + //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