From b1b3f47f3eeff8536b1a2851781da0b04f346fef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:04:14 +0800
Subject: [PATCH] Merge branch 'wxr1215' into dev
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 126 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 8efd6e5..2cfcd7d 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -46,13 +46,17 @@
/// <param name="deviceId">璁惧ID</param>
/// <param name="deviceKey">鍔熻兘鏌ヨ绫诲瀷锛歱m25</param>
/// <returns></returns>
- public ResponsePackNew GetSensorHistory(string qType, string deviceId, string deviceKey)
+ public ResponsePackNew GetSensorHistory(string qType, string deviceId, string deviceKey,string time = "")
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("type", qType);
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", deviceId);
d.Add("key", deviceKey);
+ if(time!= "")
+ {
+ d.Add("time", time);
+ }
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
@@ -400,7 +404,11 @@
}
}
}
-
+//#if __IOS__
+// //鐧诲綍鍏ㄨ閫�
+// Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);
+// //Shared.IOS.HDLFVSDK.Video.Init("", "466196456122637");
+//#endif
UserInfo.Current.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
@@ -511,9 +519,9 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfoByAccount, requestJson);
}
- #endregion
+#endregion
- #region 浣忓畢閮ㄥ垎
+#region 浣忓畢閮ㄥ垎
/// <summary>
/// 鑾峰彇浣忓畢鍒楄〃
/// </summary>
@@ -786,7 +794,7 @@
return result != null && result.Code == StateCode.SUCCESS;
}
- #region 鏂版暟鎹垎浜�
+#region 鏂版暟鎹垎浜�
/// <summary>
/// 娣诲姞鍒嗕韩
/// </summary>
@@ -827,7 +835,7 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
}
- #endregion
+#endregion
///// <summary>
///// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
@@ -983,7 +991,7 @@
- #endregion
+#endregion
/// <summary>
/// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛
/// </summary>
@@ -1013,7 +1021,7 @@
}
}
- #region 鎺ㄩ��
+#region 鎺ㄩ��
/// <summary>
/// 鎻愪氦鎺ㄩ�侀渶瑕佺殑鍏抽敭鏍囪瘑淇℃伅
/// </summary>
@@ -1030,10 +1038,16 @@
#endif
//鏄惁鐢熶骇妯″紡
bool isProduce = true;
-#if DEBUG
- isProduce = true;
-#endif
+ if (HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ {
+#if __IOS__
+ isProduce = true;
+#else
+ isProduce = false;
+
+#endif
+ }
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken))
{
Utlis.WriteLine("PushDeviceToken 涓虹┖");
@@ -1332,9 +1346,9 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_GetNoticeInfo, requestJson);
}
- #endregion
+#endregion
- #region 妫�娴嬫洿鏂�
+#region 妫�娴嬫洿鏂�
/// <summary>
///
/// </summary>
@@ -1352,9 +1366,9 @@
- #endregion
+#endregion
- #region 鑾峰彇澶╂皵閮ㄥ垎
+#region 鑾峰彇澶╂皵閮ㄥ垎
/// <summary>
/// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅澶╂皵淇℃伅
/// </summary>
@@ -1475,10 +1489,10 @@
//}
- #endregion
+#endregion
- #region 澶囦唤閮ㄥ垎
+#region 澶囦唤閮ㄥ垎
///// <summary>
///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
///// </summary>
@@ -1949,10 +1963,10 @@
}
*/
- #endregion
+#endregion
- #region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
/// <summary>
/// 鑾峰彇璁惧鍒楄〃
/// </summary>
@@ -2187,9 +2201,9 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
}
- #endregion
+#endregion
- #region Kaede --鍦烘櫙鍔熻兘--------------------------
+#region Kaede --鍦烘櫙鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鍦烘櫙鍒楄〃
/// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
@@ -2321,9 +2335,9 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
}
- #endregion
+#endregion
- #region Kaede --鎴块棿鍔熻兘--------------------------
+#region Kaede --鎴块棿鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鎴块棿鍒楄〃
/// </summary>
@@ -2398,10 +2412,10 @@
return pack;
}
- #endregion
+#endregion
- #region Kaede -- 瀹夐槻鎺ュ彛____________________________
+#region Kaede -- 瀹夐槻鎺ュ彛____________________________
/// <summary>
/// 鑾峰彇瀹夐槻鍒楄〃
/// </summary>
@@ -2565,10 +2579,10 @@
return pack;
}
- #endregion
+#endregion
- #region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
+#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
/// <summary>
/// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛�
/// </summary>
@@ -2593,9 +2607,9 @@
return pack;
}
- #endregion
+#endregion
- #region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
+#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
/// <summary>
/// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
/// 2021-07-07 鏂版柟妗堟帴鍙ｈ皟鏁村鎺�
@@ -2608,10 +2622,10 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
}
- #endregion
+#endregion
- #region 鈻� 鍙瀵硅_________________________
+#region 鈻� 鍙瀵硅_________________________
/// <summary>
/// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
/// </summary>
@@ -2624,9 +2638,28 @@
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Check, requestJson);
return pack;
}
- #endregion
+ /// <summary>
+ /// 鑾峰彇闂ㄥ彛鏈哄緲寰婃姤璀︽暟鎹�
+ /// </summary>
+ /// <param name="deviceId"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetAlarmRecords(string deviceId, int pageSize, int pageNo, string alarmType = "PROWLER_ALARM")
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("deviceId", deviceId);
+ d.Add("alarmType", alarmType);
+ d.Add("pageSize", pageSize);
+ d.Add("pageNo", pageNo);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_ALARM_RECORDS, requestJson);
+ return pack;
- #region 鈻� 闂ㄩ攣鐩稿叧____________________________
+ }
+
+#endregion
+
+#region 鈻� 闂ㄩ攣鐩稿叧____________________________
/// <summary>
/// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�)
@@ -2695,8 +2728,8 @@
return listSortLog;
}
- #endregion
- #region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
+#endregion
+#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
/// <summary>
/// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃
/// </summary>
@@ -2760,7 +2793,7 @@
var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
}
- #endregion
+#endregion
/// <summary>
/// 缁戝畾source闈㈡澘
@@ -2821,5 +2854,26 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);
}
+
+ /// <summary>
+ /// 鑾峰彇涓夋柟璐︽埛璇︽儏锛堝彲瑙嗗璁诧級
+ /// </summary>
+ /// <returns></returns>
+ public string GetVideoThirdPartUserInfo()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var resultObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_Third_Account, requestJson);
+ if (resultObj.Code == StateCode.SUCCESS)
+ {
+ var info = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfoThirdPartVideo>(resultObj.Data.ToString());
+ return info.extUserId;
+ }
+ else {
+ return "";
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0