From eb3799496f3419e347849073e23e5105b74000e5 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 17:41:18 +0800
Subject: [PATCH] 2021-3-26-4
---
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 320 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 259 insertions(+), 61 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index 297cb8f..a460f6c 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
@@ -31,7 +31,6 @@
}
#endregion
-
#region 鈻� 閫氱敤璇锋眰鎺ュ彛_______________________
/// <summary>
/// 鏍规鐢ㄦ埛璐﹀彿鑾峰彇娉ㄥ唽鍖哄煙 鍏嶇櫥褰� // 妫�娴嬭处鍙锋槸鍚︽敞鍐屼篃鐢ㄨ繖涓帴鍙�
@@ -67,7 +66,7 @@
}
#endregion
- #region 娉ㄥ唽銆佺櫥褰曢儴鍒�
+ #region * 娉ㄥ唽銆佺櫥褰曢儴鍒哶__________________________
/// <summary>
/// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
/// </summary>
@@ -151,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>
@@ -222,7 +221,7 @@
#endregion
- #region 涓汉淇℃伅閮ㄥ垎
+ #region * 涓汉淇℃伅閮ㄥ垎___________________________
///// <summary>
///// 鑾峰彇鐢ㄦ埛淇℃伅
///// </summary>
@@ -237,7 +236,7 @@
// MainPage.LoginUser.userEmailInfo = info.memberEmail;
// MainPage.LoginUser.userMobileInfo = info.memberPhone;
// MainPage.LoginUser.userName = info.memberName;
-
+
// if (!string.IsNullOrEmpty(info.memberPhonePrefix))
// {
// MainPage.LoginUser.areaCode = info.memberPhonePrefix;
@@ -358,7 +357,7 @@
#endregion
- #region 浣忓畢閮ㄥ垎
+ #region * 浣忓畢閮ㄥ垎___________________________
///// <summary>
///// 鑾峰彇浣忓畢鍒楄〃
///// </summary>
@@ -483,6 +482,7 @@
return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Home_Delete, requestJson);
}
+ #region 缃戝叧鐩稿叧
/// <summary>
/// 缁戝畾缃戝叧
/// </summary>
@@ -535,6 +535,7 @@
return "";
}
}
+
/// <summary>
/// 鑾峰彇缃戝叧淇℃伅
/// </summary>
@@ -558,9 +559,9 @@
}
return revertObj.Code;
}
+ #endregion
-
-
+ #region 瀛愯处鍙风浉鍏�
/// <summary>
/// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
/// </summary>
@@ -569,6 +570,21 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = UserConfig.Instance.CurrentRegion.Id });
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
+ }
+
+ /// <summary>
+ /// 缁戝畾瀛愯处鍙峰埌浣忓畢涓�
+ /// </summary>
+ /// <param name="subAccount"></param>
+ /// <param name="nickName"></param>
+ /// <returns></returns>
+ public ResponsePackNew BindResidenceMemberAccount (string subAccount, string nickName)
+ {
+ //娣诲姞瀛愯处鍙�
+ var requestObj = new ChildAddObj () { homeId = UserConfig.Instance.CurrentRegion.Id, account = subAccount, nickName = nickName };
+ var requestJson = HttpUtil.GetSignRequestJson (requestObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Child_Add, requestJson);
+
}
/// <summary>
@@ -603,6 +619,7 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
}
+
/// <summary>
/// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄�
/// </summary>
@@ -619,6 +636,7 @@
});
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
}
+ #endregion
#region 鏂版暟鎹垎浜�
/// <summary>
@@ -662,23 +680,92 @@
}
#endregion
- /// <summary>
- /// 缁戝畾瀛愯处鍙峰埌浣忓畢涓�
- /// </summary>
- /// <param name="subAccount"></param>
- /// <param name="nickName"></param>
- /// <returns></returns>
- public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)
- {
- //娣诲姞瀛愯处鍙�
- var requestObj = new ChildAddObj() { homeId = UserConfig.Instance.CurrentRegion.Id, account = subAccount, nickName = nickName };
- var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
+ #endregion
+ #region * 澶囦唤鐩稿叧閮ㄥ垎___________________________
+ /// <summary>
+ /// 鍒涘缓澶囦唤鏂囦欢澶�
+ /// </summary>
+ /// <param name="folderName"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetHomeDataBackupList ()
+ {
+ var requestObj = new HomeIdObj () {
+ homeId = UserConfig.Instance.CurrentRegion.Id,
+ };
+ var requestJson = HttpUtil.GetSignRequestJson (requestObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_FindAll, requestJson);
+ }
+
+
+ /// <summary>
+ /// 鍒涘缓澶囦唤鏂囦欢澶�
+ /// </summary>
+ /// <param name="folderName"></param>
+ /// <returns></returns>
+ public ResponsePackNew CreateBackupFolder (string folderName)
+ {
+ var requestObj = new BackupFolderCreateObj () {
+ backupClassify = BackupClassify.USER_DEFINED_BACKUP.ToString (),
+ backupDataType = BackupDataType.HDL_ON.ToString (),
+ homeId = UserConfig.Instance.CurrentRegion.Id,
+ folderName = folderName,
+ };
+ var requestJson = HttpUtil.GetSignRequestJson (requestObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_Create, requestJson);
}
+ /// <summary>
+ /// 淇敼澶囦唤鏂囦欢澶瑰悕瀛�
+ /// </summary>
+ /// <param name="newName"></param>
+ /// <param name="mBackupFile"></param>
+ /// <returns></returns>
+ public ResponsePackNew UpdateBackupFolderName (string newName, BackupListNameInfoRes mBackupFile)
+ {
+ var requestObj = new UpdateBackupObj () {
+ folderId = mBackupFile.id,
+ homeId = mBackupFile.homeId,
+ folderName = newName,
+ };
+ var requestJson = HttpUtil.GetSignRequestJson (requestObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_Update, requestJson);
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎澶囦唤鏂囦欢澶�
+ /// </summary>
+ /// <param name="folderId"></param>
+ /// <returns></returns>
+ public ResponsePackNew DeleteBackupFolder (string folderId)
+ {
+ var requestObj = new BackupFolderIdObj () {
+ homeId = UserConfig.Instance.CurrentRegion.Id,
+ folderId = folderId,
+ };
+ var requestJson = HttpUtil.GetSignRequestJson (requestObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Folder_Delete, requestJson);
+ }
+
+ /// <summary>
+ /// 鑾峰彇澶囦唤鏂囦欢澶规墍鏈夋枃浠跺垪琛�
+ /// </summary>
+ /// <param name="folderId"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetBackupFolderAllFileList (string folderId)
+ {
+ var requestObj = new BackupFolderIdObj () {
+ homeId = UserConfig.Instance.CurrentRegion.Id,
+ folderId = folderId,
+ };
+ var requestJson = HttpUtil.GetSignRequestJson (requestObj);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_File_FindAll, requestJson);
+ }
#endregion
+
+ #region * Mqtt___________________________
/// <summary>
/// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛
/// </summary>
@@ -698,7 +785,7 @@
}
else
{
- Utlis.WriteLine("GetMqttRemoteInfo error");
+ Utlis.WriteLine("GetMqttRemoteInfo error Code锛�" + revertObj.Code);
return null;
}
}
@@ -707,9 +794,9 @@
return null;
}
}
+ #endregion
-
- #region 鑾峰彇澶╂皵閮ㄥ垎
+ #region * 鑾峰彇澶╂皵閮ㄥ垎___________________________
/// <summary>
/// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅
/// </summary>
@@ -766,6 +853,95 @@
#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>
@@ -928,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>
@@ -977,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>
@@ -1078,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