From c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 三月 2021 17:48:32 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index 1802353..996d34e 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
@@ -855,7 +855,7 @@
#region * 涓婁紶璁惧鍒楄〃___________________________
/// <summary>
- ///
+ /// 涓婁紶Oid鍒楄〃
/// </summary>
/// <param name="mOids"></param>
/// <returns></returns>
@@ -866,9 +866,9 @@
}
/// <summary>
- ///
+ /// 涓婁紶Sid鍒楄〃
/// </summary>
- /// <param name="mOids"></param>
+ /// <param name="mSids"></param>
/// <returns></returns>
public ResponsePackNew UploadDeviceSidList (Sids mSids)
{
@@ -877,9 +877,8 @@
}
/// <summary>
- ///
+ /// 鑾峰彇璁惧鍒�
/// </summary>
- /// <param name="mOids"></param>
/// <returns></returns>
public ResponsePackNew GetDeviceList ()
{
@@ -1150,25 +1149,46 @@
// return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
//}
+ ///// <summary>
+ ///// 娣诲姞鍦烘櫙
+ ///// </summary>
+ ///// <param name="sceneList"></param>
+ ///// <returns></returns>
+ //public ResponsePackNew AddScene (List<HDLLinkScene> sceneList)
+ //{
+ // Dictionary<string, object> d = new Dictionary<string, object> ();
+ // d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
+ // d.Add ("scenes", sceneList);
+
+ // var requestJson = HttpUtil.GetSignRequestJson (d);
+ // var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_AddSecne, requestJson);
+
+ // Utlis.WriteLine ($"{pack.Data}");
+
+ // return pack;
+ //}
+
/// <summary>
- /// 娣诲姞鍦烘櫙
+ /// 鍏ㄩ噺鍚屾鍦烘櫙
/// </summary>
/// <param name="sceneList"></param>
/// <returns></returns>
- public ResponsePackNew AddScene (List<HDLLinkScene> sceneList)
+ public ResponsePackNew SecneSyncList (List<HDLLinkScene> sceneList)
{
Dictionary<string, object> d = new Dictionary<string, object> ();
d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
d.Add ("scenes", sceneList);
var requestJson = HttpUtil.GetSignRequestJson (d);
- var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_AddSecne, requestJson);
+ var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_Secne_SyncList, requestJson);
Utlis.WriteLine ($"{pack.Data}");
return pack;
}
+
+
/// <summary>
/// 鏇存柊鍦烘櫙
/// </summary>
--
Gitblit v1.8.0