From cb6e11c5067ecaba4d8f9907989154167c1e8943 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:15:05 +0800
Subject: [PATCH] Merge branch 'wxr4' into dev-tzy
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 214c33d..b059398 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -51,7 +51,7 @@
d.Add("type", qType);
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", deviceId );
- d.Add("key", "value" );
+ d.Add("key", deviceKey );
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
@@ -74,8 +74,20 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ArmSensorHistoricalData, requestJson);
}
+ /// <summary>
+ /// 璇诲彇鏈�杩戜竴涓湀鐨勬暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetLastMonthHistory(string deviceId,string key)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("deviceId", deviceId);
+ d.Add("key", key);
-
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_SensorLastMonthHistoricalData, requestJson);
+ }
#endregion
@@ -1308,6 +1320,9 @@
MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString();
MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString();
MainPage.cityInfo.weather = jt.GetValue("Weather").ToString();
+ MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString();
+ MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString();
+
break;
}
catch (Exception ex)
@@ -1835,7 +1850,10 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("productPlatform", productPlatform);
d.Add("productBrand", productBrand);
- d.Add("networkConfig", true);
+ if (productBrand != "MegaHealth")
+ {
+ d.Add("networkConfig", true);
+ }
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
@@ -1854,10 +1872,29 @@
d.Add("productBrand", productBrand);
d.Add("networkConfig", true);
-
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson);
}
+ /// <summary>
+ /// 娉ㄥ唽绗笁鏂硅澶�
+ /// </summary>
+ /// <param name="productPlatform"></param>
+ /// <param name="productBrand"></param>
+ /// <returns></returns>
+ public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("spk", spk);
+ d.Add("extDevId", extDevId);
+ d.Add("name", deviceName);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson);
+ }
+
+
+
/// <summary>
/// 鑾峰彇璁惧璇︽儏
--
Gitblit v1.8.0