From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 10:04:58 +0800
Subject: [PATCH] 1
---
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 320 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 273 insertions(+), 47 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index 4559761..4735acc 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
@@ -150,7 +150,7 @@
requestObj.memberEmail = account;
}
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson, "", "", HttpUtil.TIME_OUT_LONG);
}
/// <summary>
@@ -292,6 +292,26 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
+ /// <summary>
+ /// 鏍囪2.0骞冲彴鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ public bool Mark (string newHomeId)
+ {
+ Dictionary<string, object> dic = new Dictionary<string, object> ();
+ dic.Add ("homeId", newHomeId);
+ dic.Add ("mark", true);
+ var requestJson = HttpUtil.GetSignRequestJson (dic);
+ var revertObj = HttpUtil.RequestHttpsPost (NewAPI.API_Post_Mark, requestJson);
+ if (revertObj != null) {
+ if (revertObj.Code == "0") {
+ UserConfig.Instance.CurrentRegion.indiaIsAsyncDeviceMark = true;
+ return true;
+ }
+ }
+ return false;
+ }
+
///// <summary>
///// 鏇存柊鐢ㄦ埛澶村儚
///// </summary>
@@ -358,14 +378,14 @@
#endregion
#region * 浣忓畢閮ㄥ垎___________________________
- ///// <summary>
- ///// 鑾峰彇浣忓畢鍒楄〃
- ///// </summary>
- //public ResponsePackNew GetHomeList (HomeTypeEnum homeType = HomeTypeEnum.BUSPRO)
- //{
- // var requestJson = HttpUtil.GetSignRequestJson (new GetHomeListObj () { homeType = homeType.ToString () });
- // return HttpUtil.RequestHttpsPost (NewAPI.API_POST_Gethomepager, requestJson);
- //}
+ /// <summary>
+ /// 鑾峰彇浣忓畢鍒楄〃
+ /// </summary>
+ public ResponsePackNew GetHomeList (HomeTypeEnum homeType = HomeTypeEnum.BUSPRO)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (new GetHomeListObj () { homeType = homeType.ToString () });
+ return HttpUtil.RequestHttpsPost (NewAPI.API_POST_Gethomepager, requestJson);
+ }
/// <summary>
/// 鑾峰彇浣忓畢鍒楄〃
/// </summary>
@@ -426,6 +446,9 @@
isRemoteControl = mHome.isRemoteControl,
isBindGateway = mHome.isBindGateway,
regionUrl = mHome.regionUrl,
+ debugStaffUserId = mHome.debugStaffUserId,
+ debugPerm = mHome.debugPerm,
+ indiaIsAsyncDeviceMark = mHome.indiaIsAsyncDeviceMark
};
}
@@ -636,6 +659,53 @@
});
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
}
+ #endregion
+
+ #region 璋冭瘯浜哄憳绠＄悊
+ /// <summary>
+ /// 娣诲姞璋冭瘯浜哄憳
+ /// </summary>
+ /// <param name="account">娣诲姞璋冭瘯浜哄憳璐﹀彿</param>
+ /// <returns></returns>
+ public ResponsePackNew AddDebugStaff (string account)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object> ();
+ d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
+ d.Add ("account", account);
+
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_DebugStaff_ADD, requestJson);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎璋冭瘯浜哄憳
+ /// </summary>
+ /// <param name="account">娣诲姞璋冭瘯浜哄憳璐﹀彿</param>
+ /// <returns></returns>
+ public ResponsePackNew DelDebugStaff ()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object> ();
+ d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
+
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_DebugStaff_DELETE, requestJson);
+ }
+
+ /// <summary>
+ /// 娣诲姞璋冭瘯浜哄憳
+ /// </summary>
+ /// <param name="account">娣诲姞璋冭瘯浜哄憳璐﹀彿</param>
+ /// <returns></returns>
+ public ResponsePackNew UpdateDebugPerm (bool debugPerm)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object> ();
+ d.Add ("homeId", UserConfig.Instance.CurrentRegion.Id);
+ d.Add ("debugPerm", debugPerm);
+
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_DebugStaff_UPDATE, requestJson);
+ }
+
#endregion
#region 鏂版暟鎹垎浜�
@@ -853,6 +923,122 @@
#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>
+ /// <returns></returns>
+ public ResponsePackNew UnbindSpeaker (string tokenId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object> ();
+ d.Add ("tokenId", tokenId);
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Speaker_Unbind, 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
+
+ /// <summary>
+ /// 鐢宠璁惧瀵嗛挜
+ /// </summary>
+ /// <param name="mac"></param>
+ /// <returns></returns>
+ public ResponsePackNew ApplyDeviceSecret (string mac)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object> ();
+ d.Add ("supplier", "HDL");
+ d.Add ("mac", mac);
+ d.Add ("spk", "BUSUDPGATEWAY");
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_ApplyDeviceSecret, requestJson);
+ }
+
//#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
///// <summary>
///// 鑾峰彇璁惧鍒楄〃
@@ -1014,24 +1200,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 +1248,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 +1372,7 @@
// d.Add("pageSize", "1000");
// var requestJson = HttpUtil.GetSignRequestJson(d);
// var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
-
+
// return pack;
//}
///// <summary>
@@ -1223,5 +1431,23 @@
//}
//#endregion
+
+ /// <summary>
+ /// 淇敼璁惧澶囨敞
+ /// </summary>
+ /// <param name="deviceId"></param>
+ /// <param name="homeId"></param>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public ResponsePackNew EditDeviceName (string deviceId,string homeId,string name)
+ {
+ var d = new Dictionary<string, object> ();
+ d.Add ("deviceId", deviceId);
+ d.Add ("homeId", homeId);
+ d.Add ("name", name);
+ var requestJson = HttpUtil.GetSignRequestJson (d);
+ var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_EditDeviceName, requestJson);
+ return pack;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0