From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/DAL/Server/NewAPI.cs | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 85 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 4be919c..8da4766 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -151,7 +151,7 @@
/// 涓嬭浇璐﹀彿澶村儚
/// </summary>
public const string API_POST_DownloadHeadImage = "/home-wisdom/app/head/portrait/downWithAccount";
-
+
#region 鏁版嵁鍒嗕韩
/// <summary>
/// 鍒嗕韩鎸囧畾鏂囦欢缁欐寚瀹氭垚鍛�
@@ -310,14 +310,14 @@
/// <summary>
/// 妫�娴嬫洿鏂�,鏄惁闇�瑕佸己鍒舵洿鏂�
/// </summary>
- public const string API_POST_CheckAppVersion= "/smart-footstone/app/appVersion/check";
+ public const string API_POST_CheckAppVersion = "/smart-footstone/app/appVersion/check";
///// <summary>
///// 鏌ヨAPP鏈�鏂扮増鏈�
///// </summary>
//public const string API_POST_GetAppVersion = "/smart-footstone/app/getAppVersion";
#endregion
-
+
#region 鈻� -- 鎴块棿鍦烘櫙鑳屾櫙鍥剧墖涓婁紶涓嬭浇鎺ュ彛___________________________
/// <summary>
@@ -348,7 +348,7 @@
/// 鑾峰彇璁惧璇︽儏
/// </summary>
public const string Api_Post_GetDevcieInfoList = "/home-wisdom/app/device/info";
-
+
/// <summary>
/// 鍒锋柊璁惧鐘�
/// </summary>
@@ -450,6 +450,53 @@
#endregion
+ #region Kaede -- 瀹夐槻鎺ュ彛____________________________
+ /// <summary>
+ /// 鑾峰彇瀹夐槻鍒楄〃
+ /// </summary>
+ public const string Api_Post_Security_List = "/home-wisdom/app/security/list";
+ /// <summary>
+ /// 鑾峰彇瀹夐槻璇︽儏
+ /// </summary>
+ public const string Api_Post_Security_Info = "/home-wisdom/app/security/info";
+ /// <summary>
+ /// 娣诲姞瀹夐槻
+ /// </summary>
+ public const string Api_Post_Security_Add = "/home-wisdom/app/security/add";
+ /// <summary>
+ /// 缂栬緫瀹夐槻
+ /// </summary>
+ public const string Api_Post_Security_Edit = "/home-wisdom/app/security/edit";
+ /// <summary>
+ /// 鍒犻櫎瀹夐槻
+ /// </summary>
+ public const string Api_Post_Security_Delete = "/home-wisdom/app/security/delete";
+ /// <summary>
+ /// 璇诲彇瀹夐槻闃插尯鐘舵��
+ /// </summary>
+ public const string Api_Post_Security_StatusRead = "/home-wisdom/app/security/statusRead";
+ /// <summary>
+ /// 璁剧疆瀹夐槻闃插尯鐘舵��
+ /// </summary>
+ public const string Api_Post_Security_StatusSet = "/home-wisdom/app/security/statusSet";
+ /// <summary>
+ /// 瀹夐槻bypass璁剧疆
+ /// </summary>
+ public const string Api_Post_Security_BypassSet = "/home-wisdom/app/security/bypassSet";
+ /// <summary>
+ /// 瀹夐槻bypass璇诲彇
+ /// </summary>
+ public const string Api_Post_Security_BypassRead = "/home-wisdom/app/security/bypassRead";
+ /// <summary>
+ /// 鏌ヨ瀹夐槻鎵�鏈夎褰�
+ /// </summary>
+ public const string Api_Post_Security_ListSecurityLog = "/home-wisdom/app/security/listSecurityLog";
+ /// <summary>
+ /// 鏌ヨ瀹夐槻鎶ヨ璁板綍
+ /// </summary>
+ public const string Api_Post_Security_ListAlarmLog = "/home-wisdom/app/security/listAlarmLog";
+
+ #endregion
#region 鈻� -- 鎴块棿銆佽澶囥�佸満鏅垎浜玙__________________________
@@ -552,14 +599,14 @@
/// <summary>
/// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
/// </summary>
- public const string API_POST_EZ_GetChildToken = "/home-wisdom/platform/childToken";
-
+ public const string API_POST_EZ_GetChildToken = "/home-wisdom/platform/yingshi/child/token";
+
#endregion
#region 鈻� -- 涓版灄鐩稿叧鐩稿叧鎺ュ彛___________________________
/// <summary>
- /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
+ /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋楋紝骞惰幏鍙栭棬鍙ｆ満鍒楄〃
/// </summary>
public const string API_POST_FL_Check = "/home-wisdom/app/fl/vi/check";
/// <summary>
@@ -573,7 +620,7 @@
/// <summary>
/// 寮�閿佹垚鍔�
/// </summary>
- public const string API_POST_FL_Unlock= "/home-wisdom/app/fl/vi/unlock";
+ public const string API_POST_FL_Unlock = "/home-wisdom/app/fl/vi/unlock";
/// <summary>
/// 閫氳瘽瑙嗛鎴浘涓婁紶
/// </summary>
@@ -582,11 +629,6 @@
/// 鎸傛柇
/// </summary>
public const string API_POST_FL_HangUp = "/home-wisdom/app/fl/vi/hang-up";
- /// <summary>
- /// 鑾峰彇閫氳瘽璁板綍
- /// </summary>
- //public const string API_POST_FL_GetCallList = "/home-wisdom/app/fl/vi/list";
- public const string API_POST_FL_GetCallList = "/home-wisdom/platform/imou/listCallRecords";
/// <summary>
/// 鍒犻櫎閫氳瘽璁板綍
/// </summary>
@@ -601,6 +643,7 @@
public const string API_POST_FL_QRcode = "http://112.74.164.111:180/api.php/Device/setdynamicpwd";
#endregion
+
#region 鍙瀵硅鏍囧噯閫氱敤鎺ュ彛
/// <summary>
/// 鑾峰彇鍙瀵硅璁惧鍒楄〃锛堟墍鏈夊鎺ュ彲瑙嗗璁查兘鍖呭惈涓�璧凤級
@@ -614,9 +657,32 @@
/// 鏇存敼閫氳瘽鐘舵��
/// </summary>
public const string API_POST_VideoDevice_UpdateCallStatus = "/home-wisdom/platform/imou/updateCallStatus";
+ /// <summary>
+ /// 鑾峰彇閫氳瘽璁板綍
+ /// </summary>
+ public const string API_POST_FL_GetCallList = "/home-wisdom/platform/imou/listCallRecords";
+
+ public const string Api_Post_GetSipInfo = "";
+ /// <summary>
+ /// 浜鸿劯褰曞叆
+ /// </summary>
+ public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFace";
+ /// <summary>
+ /// 寮�鍏充汉鑴稿姛鑳�
+ /// </summary>
+ public const string Api_Post_SwitchFaceFunction = "/community-wisdom/app/doorDevice/updateCustomerFaceClose";
+ /// <summary>
+ /// 鑾峰彇浣忔埛璇︽儏
+ /// </summary>
+ public const string Api_Post_GetCustomerInfo = "/basis-footstone/app/customer/detail";
+ /// 浣忓畢sip璐﹀彿鑾峰彇
+ /// </summary>
+ public const string API_POST_VideoDevice_GetSipAccount = "/home-wisdom/app/home/getSipAccount";
#endregion
- #region 鍙瀵硅鏍囧噯閫氱敤鎺ュ彛
+
+ #region 鈻� -- 闂ㄩ攣鐩稿叧鎺ュ彛_______________________________
+
/// <summary>
/// 鍒ゆ柇闂ㄩ攣鏄惁绗竴浣跨敤
/// </summary>
@@ -639,6 +705,11 @@
public const string API_POST_DoorHistory = "/home-wisdom/app/device/door/logs";
#endregion
+
+ #region 鈻� -- SIP鐩稿叧鎺ュ彛_______________________________
+ #endregion
+
+
}
///// <summary>
--
Gitblit v1.8.0