From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs | 210 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 133 insertions(+), 77 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs
index 748464e..bb6be2d 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/API.cs
@@ -7,21 +7,21 @@
# region ZigbeeUsers 閮ㄥ垎
//***************************ZigbeeUsers 閮ㄥ垎********************************
public static string API_ZigbeeUsers = "/ZigbeeUsers/";
- /// <summary>
- /// 杩炴帴鏈嶅姟鍣�
- /// Connection
- /// </summary>
- public static string Connection = API_ZigbeeUsers + "/Connection";
- /// <summary>
- /// Users - 浣跨敤甯愬彿瀵嗙爜鐧诲綍
- /// ZigbeeUsers/Login
- /// </summary>
- public static string Login = API_ZigbeeUsers + "Login";
+ ///// <summary>
+ ///// 杩炴帴鏈嶅姟鍣�
+ ///// Connection
+ ///// </summary>
+ //public static string Connection = API_ZigbeeUsers + "/Connection";
+ ///// <summary>
+ ///// Users - 浣跨敤甯愬彿瀵嗙爜鐧诲綍
+ ///// ZigbeeUsers/Login
+ ///// </summary>
+ //public static string Login = API_ZigbeeUsers + "Login";
- /// <summary>
- /// 鐢ㄦ埛鏄惁瀛樺湪
- /// </summary>
- public static string IsExistingAccount = API_ZigbeeUsers + "IsExistingAccount";
+ ///// <summary>
+ ///// 鐢ㄦ埛鏄惁瀛樺湪
+ ///// </summary>
+ //public static string IsExistingAccount = API_ZigbeeUsers + "IsExistingAccount";
///// <summary>
///// HomeList
@@ -29,23 +29,23 @@
//public static string HomeList = "HangZhouHdlCloudApi/ZigbeeUsers/HomeList";
- /// <summary>
- /// 淇敼鐢ㄦ埛瀵嗙爜
- /// </summary>
- public static string UpdatePassword = API_ZigbeeUsers + "UpdatePassword";
+ ///// <summary>
+ ///// 淇敼鐢ㄦ埛瀵嗙爜
+ ///// </summary>
+ //public static string UpdatePassword = API_ZigbeeUsers + "UpdatePassword";
- /// <summary>
- /// 鍒ゆ柇璐﹀彿鏄惁瀛樺湪
- /// </summary>
- public static string DetectionAccount = API_ZigbeeUsers + "DetectionAccount";
- /// <summary>
- /// 娉ㄥ唽璐﹀彿 鍙戦�侀偖浠剁‘璁ょ殑鏂瑰紡
- /// </summary>
- public static string YdRegisterAccount = API_ZigbeeUsers + "YdRegisterAccount";
- /// <summary>
- /// 蹇樿瀵嗙爜
- /// </summary>
- public static string YdForgetPassword = API_ZigbeeUsers + "YdForgetPassword";
+ ///// <summary>
+ ///// 鍒ゆ柇璐﹀彿鏄惁瀛樺湪
+ ///// </summary>
+ //public static string DetectionAccount = API_ZigbeeUsers + "DetectionAccount";
+ ///// <summary>
+ ///// 娉ㄥ唽璐﹀彿 鍙戦�侀偖浠剁‘璁ょ殑鏂瑰紡
+ ///// </summary>
+ //public static string YdRegisterAccount = API_ZigbeeUsers + "YdRegisterAccount";
+ ///// <summary>
+ ///// 蹇樿瀵嗙爜
+ ///// </summary>
+ //public static string YdForgetPassword = API_ZigbeeUsers + "YdForgetPassword";
/// <summary>
/// 缁戝畾瀛愯处鍙峰埌椤圭洰 need Authorization
/// </summary>
@@ -60,10 +60,10 @@
public static string GetSubAccountByDistributedMark = API_ZigbeeUsers + "GetSubAccountByDistributedMark";
- /// <summary>
- /// UpdateRemoteSwitchPassword
- /// </summary>
- public static string UpdateRemoteSwitchPassword = API_ZigbeeUsers + "UpdateRemoteSwitchPassword";
+ ///// <summary>
+ ///// UpdateRemoteSwitchPassword
+ ///// </summary>
+ //public static string UpdateRemoteSwitchPassword = API_ZigbeeUsers + "UpdateRemoteSwitchPassword";
#endregion
#region APP 閮ㄥ垎
@@ -78,10 +78,12 @@
/// 1.22 涓婁紶[椤圭洰(浣忓畢(App(缃戝叧)鎵嬪姩澶囦唤]瀛愭枃浠�
/// </summary>
public static string UploadHomeAppGatewaySubFiles = API_APP + "UploadHomeAppGatewaySubFiles";
- /// <summary>
- /// 1.23 鍒犻櫎App澶囦唤[鎵嬪姩澶囦唤浣忓畢銆佹墜鍔ㄥ浠界綉鍏炽�佽嚜鍔ㄥ浠戒綇瀹呫�佸叕鍏卞浠絔鐨勬煇浜涙枃浠�
- /// </summary>
- public static string DeleteAppBackupFile = API_APP + "DeleteAppBackupFile";
+ public static string UploadHomeAppGatewaySingleSubFile = API_APP + "UploadHomeAppGatewaySingleSubFile";
+
+ ///// <summary>
+ ///// 1.23 鍒犻櫎App澶囦唤[鎵嬪姩澶囦唤浣忓畢銆佹墜鍔ㄥ浠界綉鍏炽�佽嚜鍔ㄥ浠戒綇瀹呫�佸叕鍏卞浠絔鐨勬煇浜涙枃浠�
+ ///// </summary>
+ //public static string DeleteAppBackupFile = API_APP + "DeleteAppBackupFile";
/// <summary>
/// 1.24 鑾峰彇浣忓畢澶囦唤鏁版嵁_鍒嗛〉
/// </summary>
@@ -98,60 +100,75 @@
/// 1.27 鍒犻櫎椤圭洰(浣忓畢)鍚勭澶囦唤鏂囦欢澶�(鏂囦欢澶逛笅鎵�鏈夋枃浠朵篃浼氬垹闄�)
/// </summary>
public static string DelHomeAppGatewayName = API_APP + "DelHomeAppGatewayName";
- /// <summary>
- /// 1.28 鏇存柊椤圭洰(浣忓畢)[App(缃戝叧)鎵嬪姩澶囦唤]澶囨敞鍚�
- /// </summary>
- public static string UpdateHomeAppGatewayName = API_APP + "UpdateHomeAppGatewayName";
- /// <summary>
- /// 1.29 椤圭洰(浣忓畢)涓婣pp鑷姩澶囦唤
- /// </summary>
- public static string HomeAppAutoDataBackup = API_APP + "HomeAppAutoDataBackup";
+ ///// <summary>
+ ///// 1.28 鏇存柊椤圭洰(浣忓畢)[App(缃戝叧)鎵嬪姩澶囦唤]澶囨敞鍚�
+ ///// </summary>
+ //public static string UpdateHomeAppGatewayName = API_APP + "UpdateHomeAppGatewayName";
+ ///// <summary>
+ ///// 1.29 椤圭洰(浣忓畢)涓婣pp鑷姩澶囦唤
+ ///// </summary>
+ //public static string HomeAppAutoDataBackup = API_APP + "HomeAppAutoDataBackup";
- /// <summary>
- /// 1.61 缁戝畾缃戝叧鍒伴」鐩�(浣忓畢)
- /// </summary>
- public static string BindGatewayToHome = API_APP + "BindGatewayToHome";
- /// <summary>
- /// 1.62 瑙ｇ粦瀹氱綉鍏冲埌椤圭洰(浣忓畢)
- /// </summary>
- public static string ReleaseGatewayToHome = API_APP + "ReleaseGatewayToHome";
+ ///// <summary>
+ ///// 1.61 缁戝畾缃戝叧鍒伴」鐩�(浣忓畢)
+ ///// </summary>
+ //public static string BindGatewayToHome = API_APP + "BindGatewayToHome";
+ ///// <summary>
+ ///// 1.62 瑙ｇ粦瀹氱綉鍏冲埌椤圭洰(浣忓畢)
+ ///// </summary>
+ //public static string ReleaseGatewayToHome = API_APP + "ReleaseGatewayToHome";
- /// <summary>
- /// 1.63 鑾峰緱鏌愪釜甯愬彿鎵�鏈夊凡缁戝畾鐨勭綉鍏冲垎椤�
- /// </summary>
- public static string GetAllBindGatewarysPagger = API_APP + "GetAllBindGatewarysPagger";
+
+
+ ///// <summary>
+ ///// 1.63 鑾峰緱鏌愪釜甯愬彿鎵�鏈夊凡缁戝畾鐨勭綉鍏冲垎椤�
+ ///// </summary>
+ //public static string GetAllBindGatewarysPagger = API_APP + "GetAllBindGatewarysPagger";
/// <summary>
/// 1.64 鑾峰彇鏌愪釜浣忓畢鐨勭綉鍏冲垎椤�
/// </summary>
public static string GetSingleHomeGatewayPagger = API_APP + "GetSingleHomeGatewayPagger";
+ ///// <summary>
+ ///// 1.65 UpdateMac 鏇存柊Mac(鍗板害)
+ ///// </summary>
+ //public static string UpdateMac = API_APP + "UpdateMac";
+
/// <summary>
- /// 1.65 UpdateMac 鏇存柊Mac(鍗板害)
+ /// 1.66 BindMac 鏇存柊缁戝畾Mac(鍗板害)
/// </summary>
- public static string UpdateMac = API_APP + "UpdateMac";
+ public static string BindMac = API_APP + "BindMac";
+
- /// <summary>
- /// 1.81 娣诲姞椤圭洰(浣忓畢)
- /// </summary>
- public static string AddHome = API_APP + "AddHome";
- /// <summary>
- /// 1.82鍒犻櫎椤圭洰 (浣忓畢)
- /// </summary>
- public static string DelHome = API_APP + "DelHome";
+ ///// <summary>
+ ///// 1.81 娣诲姞椤圭洰(浣忓畢)
+ ///// </summary>
+ //public static string AddHome = API_APP + "AddHome";
+
+ ///// <summary>
+ ///// 1.82鍒犻櫎椤圭洰 (浣忓畢)
+ ///// </summary>
+ //public static string DelHome = API_APP + "DelHome";
- /// <summary>
- /// 1.83 缂栬緫椤圭洰(浣忓畢)
- /// </summary>
- public static string EditHome = API_APP + "EditHome";
+ ///// <summary>
+ ///// 1.83 缂栬緫椤圭洰(浣忓畢)
+ ///// </summary>
+ //public static string EditHome = API_APP + "EditHome";
- /// <summary>
- /// 1.84 鑾峰彇椤圭洰 (浣忓畢)鍒嗛〉
- /// </summary>
- public static string GetHomePager = API_APP + "GetHomePager";
+ ///// <summary>
+ ///// 1.84 鑾峰彇椤圭洰 (浣忓畢)鍒嗛〉
+ ///// </summary>
+ //public static string GetHomePager = API_APP + "GetHomePager";
+
+ ///// <summary>
+ ///// 1.85 鑾峰彇鎺у埗鍒嗕韩椤圭洰(浣忓畢)璇锋眰淇℃伅
+ ///// </summary>
+ //public static string GetSharedHomeApiControl = API_APP + "GetSharedHomeApiControl";
+
#endregion
@@ -228,13 +245,52 @@
/// 4.11 鍚屾椂娣诲姞鍦烘櫙 鍜� 璁惧
/// </summary>
public static string AddSceneAndDeviceList = API_Device + "AddSceneAndDeviceList";
-
+
#endregion
+ #region EmqMqtt 閮ㄥ垎
+ //***************************EmqMqtt 閮ㄥ垎********************************
+ public static string API_EmqMqtt = "/EmqMqtt/";
+ /// <summary>
+ /// 5.03 鑾峰彇鍒嗕韩鑰匨qtt杩滅▼鎺у埗淇℃伅(Emq鐗堟湰)
+ /// </summary>
+ public static string ShareMemberConnMqttInfo = API_EmqMqtt + "ShareMemberConnMqttInfo";
+
+ /// <summary>
+ /// 瀹㈡埛绔幏鍙栬繛鎺ヤ簯绔疢qtt淇℃伅
+ /// Connection
+ /// </summary>
+ public static string GetConnMqttInfo = API_EmqMqtt + "GetConnMqttInfo";
+
+
+ #endregion
}
+
+ /// <summary>
+ /// 涓婁紶澶ф枃浠舵墜鍔ㄥ浠�
+ /// </summary>
+ [System.Serializable]
+ public class UploadHomeAppGatewaySubFilesBigObj : BaseAccountCtrlObj
+ {
+
+ /// <summary>
+ /// 澶囦唤鍚嶇殑Id
+ /// </summary>
+ public string BackupClassId;
+
+ /// <summary>
+ /// ManualBackupType 鎵嬪姩澶囦唤绫诲瀷(0:App鎵嬪姩澶囦唤,2锛氱綉鍏虫墜鍔ㄥ浠�,4:鍏叡澶囦唤) 榛樿鍊�: 0
+ /// </summary>
+ public int ManualBackupType = 0;
+
+ /// <summary>
+ /// 鎵�涓婁紶鐨勬枃浠跺悕(鏂囦欢鍐呭璇烽�氳繃鍐欏叆http body閲�)
+ /// </summary>
+ public string FileName;
+ }
}
--
Gitblit v1.8.0