From f382eaff90d5126387b5616b602b4168b37ad21c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 12 一月 2021 16:54:12 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 132 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 109 insertions(+), 23 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index 297cb8f..4559761 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>
@@ -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>
@@ -765,7 +852,6 @@
}
#endregion
-
//#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
///// <summary>
--
Gitblit v1.8.0