From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 06 七月 2023 22:43:05 +0800 Subject: [PATCH] 门锁功能 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 161 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 130 insertions(+), 31 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index e46d548..d07ef71 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -80,6 +80,30 @@ return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ArmSensorHistoricalData, requestJson); } /// <summary> + /// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍 + /// </summary> + /// <param name="deviceId"></param> + /// <param name="pageSize"></param> + /// <param name="pageNo"></param> + /// <returns></returns> + public ResponsePackNew GetVideoDoorlockHistory(string deviceId, string pageSize, string pageNo) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + 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); + } + + + + + + + /// <summary> /// 璇诲彇鏈�杩戜竴涓湀鐨勬暟鎹� /// </summary> /// <returns></returns> @@ -697,6 +721,34 @@ } } /// <summary> + /// 鑾峰彇浣忓畢浜や粯閾炬帴 + /// </summary> + /// <returns></returns> + public ResponsePackNew GetHouseDeliveryUrl() + { + var d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + var jsonString = HttpUtil.GetSignRequestJson(d); + var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.APi_Post_GetHoserDeliverUrl, jsonString); + return revertObj; + } + /// <summary> + /// 浣忓畢浜や粯鍥炴粴 + /// </summary> + /// <returns></returns> + public ResponsePackNew RollBack() + { + var d = new Dictionary<string, object>(); + d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("communityId", DB_ResidenceData.Instance.CurrentRegion.communityId); + d.Add("flowRecordContent", "onPro浜や粯鍥炴粴"); + d.Add("projectFlowRecordActionEnum", "DELIVERY_ROLLBACK"); + var jsonString = HttpUtil.GetSignRequestJson(d); + var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.APi_Post_UpdateProjectDebugStatus, jsonString); + return revertObj; + } + + /// <summary> /// 鑾峰彇缃戝叧淇℃伅 /// </summary> public string GetGatewayInfo() @@ -1042,6 +1094,22 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_UpdateFace, requestJson); } + /// <summary> + /// 瀹跺涵鎴愬憳缁戝畾璐﹀彿 + /// </summary> + /// <param name="childId"></param> + /// <param name="faceUrl"></param> + /// <returns></returns> + public ResponsePackNew SubChildBindAccount(string childId, string account) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("childId", childId); + d.Add("account", account); + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_BindAccount, requestJson); + } + /// <summary> /// 淇敼浣忓畢璋冭瘯鏉冮檺 @@ -1465,6 +1533,8 @@ /// </summary> public void GetCityWeatherInfo(string lon, string lat) { + if (lon == "0" || lat == "0") + return; MainPage.cityInfo.lon = lon; MainPage.cityInfo.lat = lat; @@ -1510,6 +1580,7 @@ MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString(); MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString(); MainPage.CityWeatherAction?.Invoke(); + HDL_ON.UI.HomePage.LoadEvent_RefreshAir(); break; } catch (Exception ex) @@ -1517,16 +1588,8 @@ MainPage.Log($"get weather error : {ex.Message}"); } } - System.Threading.Thread.Sleep(1000); + System.Threading.Thread.Sleep(5000); } - Shared.Application.RunOnMainThread(() => - { - try - { - HDL_ON.UI.HomePage.LoadEvent_RefreshAir(); - } - catch { } - }); }); } ///// <summary> @@ -2387,7 +2450,7 @@ #endregion -#region Kaede --鍦烘櫙鍔熻兘-------------------------- + #region Kaede --鍦烘櫙鍔熻兘-------------------------- /// <summary> /// 鑾峰彇鍦烘櫙鍒楄〃 /// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂� @@ -2519,9 +2582,9 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code; } -#endregion + #endregion -#region Kaede --鎴块棿鍔熻兘-------------------------- + #region Kaede --鎴块棿鍔熻兘-------------------------- /// <summary> /// 鑾峰彇鎴块棿鍒楄〃 /// </summary> @@ -2596,10 +2659,10 @@ return pack; } -#endregion + #endregion -#region Kaede -- 瀹夐槻鎺ュ彛____________________________ + #region Kaede -- 瀹夐槻鎺ュ彛____________________________ /// <summary> /// 鑾峰彇瀹夐槻鍒楄〃 /// </summary> @@ -2763,10 +2826,10 @@ return pack; } -#endregion + #endregion -#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�-------------------------- + #region Kaede --绗笁鏂瑰搧鐗屽姛鑳�-------------------------- /// <summary> /// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛� /// </summary> @@ -2796,13 +2859,11 @@ /// <returns></returns> public ResponsePackNew Search3tyIotDevice(string companyId) { - Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("companyId", companyId); var requestJson = HttpUtil.GetSignRequestJson(d); var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Search3tyIotDevice, requestJson); - return pack; } @@ -2878,9 +2939,9 @@ return pack; } -#endregion + #endregion -#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________ + #region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________ /// <summary> /// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙� /// 2021-07-07 鏂版柟妗堟帴鍙h皟鏁村鎺� @@ -2893,10 +2954,10 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson); } -#endregion + #endregion -#region 鈻� 鍙瀵硅_________________________ + #region 鈻� 鍙瀵硅_________________________ /// <summary> /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋� /// </summary> @@ -3014,9 +3075,51 @@ //IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code); return listSortLog; } + /// <summary> + /// 鑾峰彇闂ㄩ攣涓存椂瀵嗙爜 + /// </summary> + /// <param name="deviceId"></param> + /// <returns></returns> + public ResponsePackNew GetDoorTempPassword(string deviceId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetTempPasswrod, requestJson); + } + /// <summary> + /// 鍒涘缓闂ㄩ攣涓存椂瀵嗙爜 + /// </summary> + /// <param name="deviceId"></param> + /// <returns></returns> + public ResponsePackNew CreateDoorTempPassword(string deviceId,string beginTime,string endTime) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); + d.Add("beginTime", beginTime); + d.Add("endTime", endTime); + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CreateTempPasswrod, requestJson); + } + /// <summary> + /// 鍒犻櫎闂ㄩ攣涓存椂瀵嗙爜 + /// </summary> + /// <returns></returns> + public ResponsePackNew DelDoorTempPassword(string deviceId, string pwdId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); + d.Add("pwdId", pwdId); + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DelTempPasswrod, requestJson); + } -#endregion -#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________ + #endregion + + #region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________ /// <summary> /// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃 /// </summary> @@ -3080,7 +3183,7 @@ var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson); } -#endregion + #endregion /// <summary> /// 缁戝畾source闈㈡澘 @@ -3141,11 +3244,6 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson); } - - - - - #region 鍏変紡鍌ㄨ兘 @@ -3270,9 +3368,10 @@ { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + //d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId); d.Add("infos", groupControls); var requestJson = HttpUtil.GetSignRequestJson(d); - var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddGroupControl, requestJson); + var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UpdateGroupControl, requestJson); return pack; } -- Gitblit v1.8.0