From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/Server/NewAPI.cs | 231 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 168 insertions(+), 63 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index c7504a0..de5d4de 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -78,10 +78,6 @@
#endregion
#region 鈻� HomeCluster -- 浣忓畢绠＄悊鎺ュ彛___________________________
- ///// <summary>
- ///// 娣诲姞浣忓畢
- ///// </summary>
- //public const string API_POST_Addhome = "/HomeCluster/V1/addhome";
/// <summary>
/// 鑾峰彇浣忓畢鍒嗛〉
/// </summary>
@@ -94,7 +90,10 @@
/// 鏇存柊浣忓畢
/// </summary>
public const string API_POST_Home_UpdateHome = "/home-wisdom/app/home/update";
-
+ /// <summary>
+ /// 浣忓畢杩佺Щ
+ /// </summary>
+ public const string API_POST_Home_Transfer = "/home-wisdom/app/home/transfer";
#endregion
#region 鈻� 瀛愯处鍙� -- 娣诲姞浣忓畢鎴愬憳___________________________
@@ -145,17 +144,14 @@
#endregion
#region 鈻� GatewayCluster -- 缃戝叧___________________________
-
- /// <summary>
- /// 缁戝畾缃戝叧鍒颁綇瀹�
- /// </summary>
- public const string API_POST_BindGateway = "/home-wisdom/app/gateway/bindGateway";
-
+ ///// <summary>
+ ///// 缁戝畾缃戝叧鍒颁綇瀹�
+ ///// </summary>
+ //public const string API_POST_BindGateway = "/home-wisdom/app/gateway/bindGateway";
/// <summary>
/// 鑾峰彇浣忓畢缃戝叧鍒嗛〉
/// </summary>
public const string API_POST_GetGatewayList = "/home-wisdom/app/gateway/getGatewayList";
-
///// <summary>
///// 瑙ｇ粦缁戠綉鍏冲埌浣忓畢
///// </summary>
@@ -179,69 +175,69 @@
#endregion
#region 鈻� HomebackupCluster -- 浣忓畢澶囦唤寰湇鍔__________________________
- /// <summary>
- /// 鍒涘缓鏂囦欢澶�
- /// </summary>
- public const string API_POST_Folder_Create = "/home-wisdom/app/backup/folder/create";
-
- /// <summary>
- /// 鍒犻櫎鏂囦欢澶�
- /// </summary>
- public const string API_POST_Folder_Delete = "/home-wisdom/app/backup/folder/delete";
-
- /// <summary>
- /// 鏌ユ壘鎵�鏈夋枃浠跺す
- /// </summary>
- public const string API_POST_Folder_FindAll = "/home-wisdom/app/backup/folder/findAll";
-
- /// <summary>
- /// 鏇存柊鏂囦欢澶�
- /// </summary>
- public const string API_POST_Folder_Update = "/home-wisdom/app/backup/folder/update";
-
- /// <summary>
- /// 涓婁紶鏂囦欢
- /// </summary>
- public const string API_POST_File_Create = "/home-wisdom/app/backup/file/create";
+ ///// <summary>
+ ///// 鍒涘缓鏂囦欢澶�
+ ///// </summary>
+ //public const string API_POST_Folder_Create = "/home-wisdom/app/backup/folder/create";
///// <summary>
- ///// 鍒犻櫎鏂囦欢
+ ///// 鍒犻櫎鏂囦欢澶�
///// </summary>
- //public const string API_DELETE_File_Delete = "/HomebackupCluster/V1/file/delete";
+ //public const string API_POST_Folder_Delete = "/home-wisdom/app/backup/folder/delete";
- /// <summary>
- /// 涓嬭浇澶囦唤鏂囦欢
- /// </summary>
- public const string API_POST_File_Down = "/home-wisdom/app/backup/file/downOne";
+ ///// <summary>
+ ///// 鏌ユ壘鎵�鏈夋枃浠跺す
+ ///// </summary>
+ //public const string API_POST_Folder_FindAll = "/home-wisdom/app/backup/folder/findAll";
- /// <summary>
- /// 鏌ヨ涓�涓枃浠跺す鎵�鏈夋枃浠跺悕
- /// </summary>
- public const string API_POST_File_FindAll = "/home-wisdom/app/backup/file/findAll";
+ ///// <summary>
+ ///// 鏇存柊鏂囦欢澶�
+ ///// </summary>
+ //public const string API_POST_Folder_Update = "/home-wisdom/app/backup/folder/update";
+
+ ///// <summary>
+ ///// 涓婁紶鏂囦欢
+ ///// </summary>
+ //public const string API_POST_File_Create = "/home-wisdom/app/backup/file/create";
+
+ /////// <summary>
+ /////// 鍒犻櫎鏂囦欢
+ /////// </summary>
+ ////public const string API_DELETE_File_Delete = "/HomebackupCluster/V1/file/delete";
+
+ ///// <summary>
+ ///// 涓嬭浇澶囦唤鏂囦欢
+ ///// </summary>
+ //public const string API_POST_File_Down = "/home-wisdom/app/backup/file/downOne";
+
+ ///// <summary>
+ ///// 鏌ヨ涓�涓枃浠跺す鎵�鏈夋枃浠跺悕
+ ///// </summary>
+ //public const string API_POST_File_FindAll = "/home-wisdom/app/backup/file/findAll";
#endregion
#region 鈻� zigbeespeakerservice -- 璇煶鎺у埗鏈嶅姟___________________________
- /// <summary>
- /// 鑾峰彇闊崇鍒楄〃
- /// </summary>
- public const string API_GET_Speaker_Auth = "/speakerservices/Auth";
+ ///// <summary>
+ ///// 鑾峰彇闊崇鍒楄〃
+ ///// </summary>
+ //public const string API_GET_Speaker_Auth = "/speakerservices/Auth";
- /// <summary>
- /// 淇敼闊崇澶囨敞
- /// </summary>
- public const string API_PUT_Speaker_Auth_Rename = "/speakerservices/Auth";
+ ///// <summary>
+ ///// 淇敼闊崇澶囨敞
+ ///// </summary>
+ //public const string API_PUT_Speaker_Auth_Rename = "/speakerservices/Auth";
- /// <summary>
- /// 鑾峰彇璁惧鍜屽満鏅垪琛�
- /// </summary>
- public const string API_GET_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";
+ ///// <summary>
+ ///// 鑾峰彇璁惧鍜屽満鏅垪琛�
+ ///// </summary>
+ //public const string API_GET_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";
- /// <summary>
- /// 娣诲姞璁惧鍜屽満鏅垪琛�
- /// </summary>
- public const string API_POST_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";
+ ///// <summary>
+ ///// 娣诲姞璁惧鍜屽満鏅垪琛�
+ ///// </summary>
+ //public const string API_POST_Speaker_BatchEdit_V2 = "/speakerservices/BatchEdit_V2";
#endregion
@@ -288,11 +284,119 @@
public const string API_POST_GetAppVersion = "/smart-footstone/app/getAppVersion";
#endregion
+ #region Kaede -- 璁惧鎺ュ彛____________________________
+ /// <summary>
+ /// 鑾峰彇璁惧鍒楄〃
+ /// </summary>
+ public const string Api_Post_GetDevcieList = "/home-wisdom/app/device/list";
+ /// <summary>
+ /// 鑾峰彇璁惧璇︽儏
+ /// </summary>
+ public const string Api_Post_GetDevcieInfoList = "/home-wisdom/app/device/list";
+ /// <summary>
+ /// 璁惧鎺у埗
+ /// </summary>
+ public const string Api_Post_ControlDevice = "/home-wisdom/app/device/control";
+ /// <summary>
+ /// 璁惧缁戝畾鎴块棿
+ /// </summary>
+ public const string Api_Post_BindDeviceToRoom = "/home-wisdom/app/device/bindRoom";
+ /// <summary>
+ /// 璁惧瑙ｇ粦鎴块棿
+ /// </summary>
+ public const string Api_Post_UnbindDeviceToRoom = "/home-wisdom/app/device/unbindRoom";
+ /// <summary>
+ /// 璁惧鍚嶇О淇敼
+ /// </summary>
+ public const string Api_Post_EditDeviceName = "/home-wisdom/app/device/rename";
+ /// <summary>
+ /// 鏀惰棌璁惧
+ /// </summary>
+ public const string Api_Post_CollectDevice = "/home-wisdom/app/device/collect";
+ /// <summary>
+ /// 鍙栨秷鏀惰棌璁惧
+ /// </summary>
+ public const string Api_Post_CancelCollectDevice = "/home-wisdom/app/device/cancelcollect";
+ #endregion
+
+ #region Kaede -- 鍦烘櫙鎺ュ彛____________________________
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙鍒楄〃
+ /// </summary>
+ public const string Api_Post_GetSecneList = "/home-wisdom/app/scene/list";
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙璇︽儏
+ /// </summary>
+ public const string Api_Post_GetSecneInfo = "/home-wisdom/app/scene/info";
+ /// <summary>
+ /// 娣诲姞鍦烘櫙
+ /// </summary>
+ public const string Api_Post_AddSecne = "/home-wisdom/app/scene/add";
+ /// <summary>
+ /// 缂栬緫鍦烘櫙
+ /// </summary>
+ public const string Api_Post_EditSecne = "/home-wisdom/app/scene/update";
+ /// <summary>
+ /// 鍒犻櫎鍦烘櫙
+ /// </summary>
+ public const string Api_Post_DeleteSecne = "/home-wisdom/app/scene/Delete";
+ /// <summary>
+ /// 鎵ц鍦烘櫙
+ /// </summary>
+ public const string Api_Post_ExecuteSecne = "/home-wisdom/app/scene/execute";
+ /// <summary>
+ /// 鏀惰棌鍦烘櫙
+ /// </summary>
+ public const string Api_Post_CollectScene = "/home-wisdom/app/scene/collect";
+ /// <summary>
+ /// 鍙栨秷鏀惰棌鍦烘櫙
+ /// </summary>
+ public const string Api_Post_CancelCollectScene = "/home-wisdom/app/scene/cancelcollect";
+ #endregion
+
+ #region Kaede -- 鎴块棿鎺ュ彛____________________________
+ /// <summary>
+ /// 鑾峰彇璁惧鍒楄〃
+ /// </summary>
+ public const string Api_Post_GetRoomList = "/home-wisdom/app/room/list";
+ /// <summary>
+ /// 娣诲姞鎴块棿
+ /// </summary>
+ public const string Api_Post_AddRoom = "/home-wisdom/app/room/add";
+ /// <summary>
+ /// 鍒犻櫎鎴块棿
+ /// </summary>
+ public const string Api_Post_DelRoom = "/home-wisdom/app/room/delete";
+ /// <summary>
+ /// 淇敼鎴块棿
+ /// </summary>
+ public const string Api_Post_UpdateRoom = "/home-wisdom/app/room/update";
+
+ #endregion
+
+
+
+ #region 鈻� -- 鎴块棿銆佽澶囥�佸満鏅垎浜玙__________________________
+ /// <summary>
+ /// 娣诲姞鍒嗕韩
+ /// </summary>
+ public const string API_POST_Share_Add = "/home-wisdom/app/share/add";
+ /// <summary>
+ /// 鍒犻櫎鍒嗕韩
+ /// </summary>
+ public const string API_POST_Share_Delete = "/home-wisdom/app/share/delete";
+ /// <summary>
+ /// 鑾峰彇鍒嗕韩
+ /// </summary>
+ public const string API_POST_Share_Get = "/home-wisdom/app/share/get";
+ #endregion
+
+
#region 鈻� -- 鑷姩鍖栨帴鍙__________________________
/// <summary>
/// 鑾峰彇鑷姩鍖栧垪琛�
/// </summary>
- public const string API_POST_Logic_List= "/home-wisdom/app/logic/list";
+ public const string API_POST_Logic_List = "/home-wisdom/app/logic/list";
/// <summary>
///鑾峰彇鑷姩鍖栬鎯�
/// </summary>
@@ -316,6 +420,7 @@
#endregion
+
#endregion
}
--
Gitblit v1.8.0