From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 98 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index dc58537..8b4f77b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -697,6 +697,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 +1070,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 +1509,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 +1556,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)
@@ -1519,14 +1566,6 @@
}
System.Threading.Thread.Sleep(5000);
}
- Shared.Application.RunOnMainThread(() =>
- {
- try
- {
- HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
- }
- catch { }
- });
});
}
///// <summary>
@@ -3012,8 +3051,49 @@
//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
+ #endregion
#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
/// <summary>
--
Gitblit v1.8.0