From c0379d078e7919c9934085da038e8e3c20dee85a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 25 二月 2021 19:26:06 +0800
Subject: [PATCH] 2021-02-25 1.增加语音设备选择。2.增加场景全量更新上传。
---
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 188 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 150 insertions(+), 38 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index 4559761..996d34e 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
@@ -853,6 +853,96 @@
#endregion
+ #region * 涓婁紶璁惧鍒楄〃___________________________
+ /// <summary>
+ /// 涓婁紶Oid鍒楄〃
+ /// </summary>
+ /// <param name="mOids"></param>
+ /// <returns></returns>
+ public ResponsePackNew UploadDeviceOidList (Oids mOids)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (mOids);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Device_Oid_Add, requestJson);
+ }
+
+ /// <summary>
+ /// 涓婁紶Sid鍒楄〃
+ /// </summary>
+ /// <param name="mSids"></param>
+ /// <returns></returns>
+ public ResponsePackNew UploadDeviceSidList (Sids mSids)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (mSids);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Device_Sid_Add, requestJson);
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧鍒�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetDeviceList ()
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (new HomeIdObj {
+ homeId = UserConfig.Instance.CurrentRegion.Id,
+ });
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_GetDevcieList, requestJson);
+ }
+
+
+ #endregion
+
+ #region 闊崇璇█鎺у埗鐩稿叧___________________________
+ /// <summary>
+ /// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetSpeakerList ()
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (new GetSpeakerObj {
+ homeId = UserConfig.Instance.CurrentRegion.Id,
+ });
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_List_Get, requestJson);
+ }
+
+ /// <summary>
+ /// 缂栬緫闊崇鎺堟潈澶囨敞
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UpdateSpeakerRemark (UpdateSpeakerRemarkObj remarkObj)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (remarkObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_Remark_Update, requestJson);
+ }
+
+ /// <summary>
+ /// 鑾峰彇闊崇鍒嗛厤鐨勮澶囧拰鍦烘櫙鍒楄〃
+ /// </summary>
+ /// <param name="getType">0 鏄煡璇㈠叏閮� 1鏄煡璇㈣澶� 2鏄煡璇㈠満鏅�</param>
+ /// <param name="tokenId"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetSpeakerDeviceList (int getType, string tokenId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object> ();
+ d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
+ d.Add ("tokenId", tokenId);
+ if(getType > 0) {
+ d.Add ("isDevice", getType == 1);
+ }
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_DeviceList_Get, requestJson);
+ }
+
+ /// <summary>
+ /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew UpdateSpeakerDeviceList (UpdateSpeakerDeviceListObj updateSpeakerDeviceListObj)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (updateSpeakerDeviceListObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
+ }
+ #endregion
+
//#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
///// <summary>
///// 鑾峰彇璁惧鍒楄〃
@@ -1014,24 +1104,23 @@
//#endregion
//#region Kaede --鍦烘櫙鍔熻兘--------------------------
- ///// <summary>
- ///// 鑾峰彇鍦烘櫙鍒楄〃
- ///// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
- ///// </summary>
- ///// <param name="roomId">鎴块棿ID</param>
- ///// <returns></returns>
- //public ResponsePackNew GetSceneList(string roomId = null)
- //{
- // Dictionary<string, object> d = new Dictionary<string, object>();
- // d.Add("homeId", UserConfig.Instance.CurrentRegion.RegionID);
- // if (roomId != null)
- // {
- // d.Add("roomId", roomId);
- // }
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙鍒楄〃
+ /// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
+ /// </summary>
+ /// <param name="roomId">鎴块棿ID</param>
+ /// <returns></returns>
+ public ResponsePackNew GetSceneList (string roomId = null)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object> ();
+ d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
+ if (roomId != null) {
+ d.Add ("roomId", roomId);
+ }
- // var requestJson = HttpUtil.GetSignRequestJson(d);
- // return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
- //}
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_GetSecneList, requestJson);
+ }
///// <summary>
///// 鑾峰彇鍦烘櫙璇︽儏
///// </summary>
@@ -1063,34 +1152,57 @@
///// <summary>
///// 娣诲姞鍦烘櫙
///// </summary>
+ ///// <param name="sceneList"></param>
///// <returns></returns>
- //public ResponsePackNew AddScene(Scene scene)
+ //public ResponsePackNew AddScene (List<HDLLinkScene> sceneList)
//{
- // Dictionary<string, object> d = new Dictionary<string, object>();
- // d.Add("homeId", UserConfig.Instance.CurrentRegion.RegionID);
- // d.Add("scenes", new List<Scene>() { scene });
+ // 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 requestJson = HttpUtil.GetSignRequestJson (d);
+ // var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_AddSecne, requestJson);
- // Utlis.WriteLine($"{pack.Data}");
+ // Utlis.WriteLine ($"{pack.Data}");
// return pack;
//}
- ///// <summary>
- ///// 缂栬緫鍦烘櫙
- ///// </summary>
- ///// <param name="scene"></param>
- ///// <returns></returns>
- //public ResponsePackNew EditScene(Scene scene)
- //{
- // Dictionary<string, object> d = new Dictionary<string, object>();
- // d.Add("homeId", UserConfig.Instance.CurrentRegion.RegionID);
- // d.Add("scenes", new List<Scene>() { scene });
- // var requestJson = HttpUtil.GetSignRequestJson(d);
- // return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditSecne, requestJson);
- //}
+ /// <summary>
+ /// 鍏ㄩ噺鍚屾鍦烘櫙
+ /// </summary>
+ /// <param name="sceneList"></param>
+ /// <returns></returns>
+ 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_Secne_SyncList, requestJson);
+
+ Utlis.WriteLine ($"{pack.Data}");
+
+ return pack;
+ }
+
+
+
+ /// <summary>
+ /// 鏇存柊鍦烘櫙
+ /// </summary>
+ /// <param name="sceneList"></param>
+ /// <returns></returns>
+ public ResponsePackNew EditScene (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);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_EditSecne, requestJson);
+ }
///// <summary>
///// 鍒犻櫎鍦烘櫙
///// </summary>
@@ -1164,7 +1276,7 @@
// d.Add("pageSize", "1000");
// var requestJson = HttpUtil.GetSignRequestJson(d);
// var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
-
+
// return pack;
//}
///// <summary>
--
Gitblit v1.8.0