From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 45 ++++-----------------------------------------
1 files changed, 4 insertions(+), 41 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index b059398..214c33d 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", deviceKey );
+ d.Add("key", "value" );
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
@@ -74,20 +74,8 @@
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
@@ -1320,9 +1308,6 @@
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)
@@ -1850,10 +1835,7 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("productPlatform", productPlatform);
d.Add("productBrand", productBrand);
- if (productBrand != "MegaHealth")
- {
- d.Add("networkConfig", true);
- }
+ d.Add("networkConfig", true);
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
@@ -1872,29 +1854,10 @@
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