From bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 19 四月 2021 09:36:40 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr

---
 HDL_ON/DAL/Server/NewAPI.cs |   83 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index a672f0b..569ee79 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -322,9 +322,14 @@
         /// </summary>
         public const string Api_Post_GetDevcieList = "/home-wisdom/app/device/list";
         /// <summary>
+        /// 鑾峰彇绗笁鏂瑰搧鐗岃澶囧垪琛�
+        /// </summary>
+        public const string Api_Post_Get3tyBrandDevcieList = "/home-wisdom/app/product/list";
+        /// <summary>
         /// 鑾峰彇璁惧璇︽儏
         /// </summary>
         public const string Api_Post_GetDevcieInfoList = "/home-wisdom/app/device/info";
+    
         /// <summary>
         /// 鍒锋柊璁惧鐘�
         /// </summary>
@@ -422,6 +427,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/update";
+        /// <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 鈻�  -- 鎴块棿銆佽澶囥�佸満鏅垎浜玙__________________________
@@ -502,6 +554,18 @@
         /// 閬ユ帶鍣ㄨ嚜瀛︽寜閿垹闄�
         /// </summary>
         public const string API_POST_Ir_CodeRemove = "/home-wisdom/app/device/ir/codeRemove";
+        /// <summary>
+        /// 鑾峰彇璁惧璇︽儏閫氳繃(spk,sid)
+        /// </summary>
+        public const string Api_Post_GetinfoBySid = "/home-wisdom/app/device/infoBySid";
+        /// <summary>
+        /// 绾㈠瀹�/閬ユ帶鍣ㄥ垹闄�
+        /// </summary>
+        public const string API_POST_Ir_DeviceDel = "/home-wisdom/app/device/remove";
+        /// <summary>
+        /// 淇敼璁惧鍚嶇О
+        /// </summary>
+        public const string API_POST_Ir_DeviceRename = "/home-wisdom/app/device/rename";
 
         #endregion
 
@@ -513,15 +577,7 @@
         /// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
         /// </summary>
         public const string API_POST_EZ_GetChildToken = "/home-wisdom/platform/childToken";
-        /// <summary>
-        /// 绾㈠瀹�/閬ユ帶鍣ㄥ垹闄�
-        /// </summary>
-        public const string API_POST_Ir_DeviceDel= "/home-wisdom/app/device/remove";
-        /// <summary>
-        /// 淇敼绾㈠瀹濆悕绉�
-        /// </summary>
-        public const string API_POST_Ir_DeviceRename = "/home-wisdom/app/device/rename";
-
+       
 
         #endregion
 
@@ -558,8 +614,17 @@
         /// 鍒犻櫎閫氳瘽璁板綍
         /// </summary>
         public const string API_POST_FL_DeleteCallInfo = "/home-wisdom/app/fl/vi/delete";
+        /// <summary>
+        /// 鑾峰彇闂ㄥ彛鏈哄垪琛�
+        /// </summary>
+        public const string API_POST_FL_List = "http://112.74.164.111:180/api.php/Device/getmonitorUUID";
+        /// <summary>
+        /// 鍔ㄦ�佸瘑鐮�/浜岀淮鐮佸紑閿�
+        /// </summary>
+        public const string API_POST_FL_QRcode = "http://112.74.164.111:180/api.php/Device/setdynamicpwd";
         #endregion
 
+
     }
 
     ///// <summary>

--
Gitblit v1.8.0