From 3069c032027eeea7a14fa9f462440bb2d802d9a9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:25:09 +0800
Subject: [PATCH] 20210111-合并代码
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index c644bdc..c27acef 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -571,15 +571,14 @@
if (mHomeGatewayRes.Count > 0)
{
DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
- if (mHomeGatewayRes[0].gatewayStatus)
- {
- //DriverLayer.Control.Ins.IsRemote = true;
- DriverLayer.Control.Ins.GatewayOnline = true;
- }
- else
- {
- DriverLayer.Control.Ins.GatewayOnline = false;
- }
+ //if (mHomeGatewayRes[0].gatewayStatus)
+ //{
+ // DriverLayer.Control.Ins.GatewayOnline = true;
+ //}
+ //else
+ //{
+ // DriverLayer.Control.Ins.GatewayOnline = false;
+ //}
DB_ResidenceData.Instance.SaveResidenceData();
return revertObj.Code;
}
@@ -608,15 +607,17 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
- string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ var jsonString = HttpUtil.GetSignRequestJson(d);
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGatewayInfo, jsonString);
if (revertObj.Code == StateCode.SUCCESS)
{
var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<HomeGatewayInfo>(revertObj.Data.ToString());
if (mHomeGatewayRes != null)
{
- DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes;
- DB_ResidenceData.Instance.SaveResidenceData();
+ if(mHomeGatewayRes.gatewayStatus)
+ {
+ DriverLayer.Control.Ins.GatewayOnline = true;
+ }
}
}
return revertObj.Code;
@@ -1946,6 +1947,21 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
}
+
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙璇︽儏鍒楄〃
+ /// </summary>
+ /// <param name="seceneId">鍦烘櫙ID</param>
+ /// <returns></returns>
+ public ResponsePackNew GetSceneListInfo(List<string> seceneIds)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("userSceneIds", seceneIds);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
+ }
+
/// <summary>
/// 娣诲姞鍦烘櫙
/// </summary>
--
Gitblit v1.8.0