From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
old mode 100755
new mode 100644
index 369d632..63a7ec2
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -37,34 +37,48 @@
{
}
+ #region kaede ___________浼犳劅鍣ㄥ巻鍙叉暟鎹甠_________________
/// <summary>
/// 鑾峰彇浼犳劅鍣ㄥ巻鍙叉暟鎹�
/// </summary>
- /// <param name="subnetId"></param>
- /// <param name="deviceId"></param>
- /// <param name="bigClass"></param>
- /// <param name="minClass"></param>
- /// <param name="queryType"></param>
- /// <param name="loopId"></param>
- /// <param name="nowMonth"></param>
- /// <param name="mac"></param>
+ /// <param name="qType">鏃堕棿鏌ヨ绫诲瀷锛歨our=杩�24灏忔椂銆亀eek=杩戜竴鍛ㄣ�乵onth = 杩戜竴鏈� </param>
+ /// <param name="deviceId">璁惧ID</param>
+ /// <param name="deviceKey">鍔熻兘鏌ヨ绫诲瀷锛歱m25</param>
/// <returns></returns>
- public ResponsePack GetSensorHistory(int subnetId, int deviceId, int bigClass, int minClass, int queryType, int loopId, int nowMonth, string mac)
+ public ResponsePackNew GetSensorHistory(string qType, string deviceId,string deviceKey)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("SubnetID", subnetId);
- d.Add("DeviceID", deviceId);
- d.Add("LargeType", bigClass);
- d.Add("SmallType", minClass);
- d.Add("QueryType", queryType);
- d.Add("loopId", loopId);
- d.Add("NowMonth", nowMonth);
- d.Add("MAC", DB_ResidenceData.Instance.residenceGatewayMAC);
- d.Add("LocalTimeZone", 8);
- var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString, true);
+ d.Add("type", qType);
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceId", new List<string>() { deviceId });
+ d.Add("key", new List<string>() { deviceKey });
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
}
+ /// <summary>
+ /// 鑾峰彇瀹夐槻浼犳劅鍣ㄥ巻鍙叉暟鎹�
+ /// </summary>
+ /// <param name="deviceId">璁惧ID</param>
+ /// <param name="pageSize">椤甸潰澶у皬</param>
+ /// <param name="pageNo">椤靛彿</param>
+ /// <returns></returns>
+ public ResponsePackNew GetArmSensorHistory( string deviceId,string pageSize, string pageNo)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("deviceId", deviceId);
+ d.Add("pageSize", pageSize);
+ d.Add("pageNo", pageNo);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ArmSensorHistoricalData, requestJson);
+ }
+
+
+
+
+ #endregion
//public string GetRequestResultMsg(string resultCode)
//{
@@ -571,14 +585,7 @@
if (mHomeGatewayRes.Count > 0)
{
DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
- //if (mHomeGatewayRes[0].gatewayStatus)
- //{
- // DriverLayer.Control.Ins.GatewayOnline = true;
- //}
- //else
- //{
- // DriverLayer.Control.Ins.GatewayOnline = false;
- //}
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = mHomeGatewayRes[0].gatewayStatus;
DB_ResidenceData.Instance.SaveResidenceData();
return revertObj.Code;
}
@@ -604,6 +611,8 @@
/// </summary>
public string GetGatewayInfo()
{
+ if (DB_ResidenceData.Instance.HomeGateway == null)
+ return StateCode.NETWORK_ERROR;
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
@@ -614,10 +623,7 @@
var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<HomeGatewayInfo>(revertObj.Data.ToString());
if (mHomeGatewayRes != null)
{
- if(mHomeGatewayRes.gatewayStatus)
- {
- DriverLayer.Control.Ins.GatewayOnline = true;
- }
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = mHomeGatewayRes.gatewayStatus;
}
}
return revertObj.Code;
--
Gitblit v1.8.0