From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 8218c94..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
@@ -452,6 +464,18 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code;
}
+ /// <summary>
+ /// 鏍规嵁璐﹀彿,鑾峰彇璐﹀彿淇℃伅
+ /// </summary>
+ /// <param name="i_account">鎸囧畾璐﹀彿</param>
+ /// <returns></returns>
+ public ResponsePackNew GetMemberInfoByAccount(string i_account)
+ {
+ var pra = new { account = i_account };
+ var requestJson = HttpUtil.GetSignRequestJson(pra);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfoByAccount, requestJson);
+ }
+
#endregion
#region 浣忓畢閮ㄥ垎
@@ -694,6 +718,24 @@
isAllowCreateScene = isAllow,
});
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
+ }
+
+ /// <summary>
+ /// 杩囨埛
+ /// </summary>
+ /// <param name="i_account">瀵规柟璐﹀彿</param>
+ /// <returns></returns>
+ public bool TransferResidence(string i_account)
+ {
+ var pra2 = new
+ {
+ homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.id,
+ account = i_account
+ };
+ var requestJson = HttpUtil.GetSignRequestJson(pra2);
+ var result = HttpUtil.RequestHttpsPost(NewAPI.API_Post_TransferResidence, requestJson);
+
+ return result != null && result.Code == StateCode.SUCCESS;
}
#region 鏂版暟鎹垎浜�
@@ -1278,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)
@@ -1805,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);
@@ -1824,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>
/// 鑾峰彇璁惧璇︽儏
@@ -2418,7 +2485,7 @@
}
#endregion
- #region 鈻� 闂ㄩ攣鍘嗗彶璁板綍________________________
+ #region 鈻� 闂ㄩ攣鐩稿叧____________________________
/// <summary>
/// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�)
@@ -2427,6 +2494,19 @@
/// <returns></returns>
public List<Stan.DoorHistoryLog> GetDoorHistoryLogs(Function i_device)
{
+ //var dicPra = new Dictionary<string, object>();
+ //dicPra.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ //dicPra.Add("deviceId", i_device.deviceId);
+ //dicPra.Add("logType", "OPEN_DOOR");
+ //dicPra.Add("pageSize", "200");
+ //var requestJson = HttpUtil.GetSignRequestJson(dicPra);
+ //var packData = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_DoorHistory, requestJson);
+ //if (packData.Code != StateCode.SUCCESS)
+ //{
+ // return null;
+ //}
+
+
//娴嬭瘯
var listLog = new List<Stan.DoorHistoryLog>();
for (int i = 1; i <= 3; i++)
--
Gitblit v1.8.0