From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs b/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
index 841c397..909bdd8 100644
--- a/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
+++ b/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
@@ -5,12 +5,6 @@
{
public class A_Protocal_Common
{
- public static A_Protocal_Common apc;
-
- public A_Protocal_Common()
- {
- apc = new A_Protocal_Common();
- }
/// <summary>
@@ -20,14 +14,26 @@
/// <returns>long</returns>
public long Get_time_stamp()
{
- //DateTime startTime = new DateTime(1970, 1, 1, 0, 0, 0, 0);
- long t = DateTime.Now.Ticks / 10000; //闄�10000璋冩暣涓�13浣�
+ long t = DateTime.Now.Ticks / 10000;
return t;
}
}
+
/// <summary>
- /// 閫氳鍥炲鏁版嵁鍖�
+ /// 鏈湴閫氳鏁版嵁
+ /// </summary>
+ public class LocalCommunicationData
+ {
+ public string Topic;
+ public int Length;
+
+ public string BodyDataString;
+
+ }
+
+ /// <summary>
+ /// 閫氳鍥炲鏈夋晥鏁版嵁
/// </summary>
public class ResponsePack
{
@@ -46,5 +52,22 @@
/// 鎼滅储鏈湴缃戝叧
/// </summary>
public const string SearchLoaclGateway = "/user/all/custom/gateway/search";
+
+ /// <summary>
+ /// 璋冭瘯杞欢涓婁紶oid鍒楄〃
+ /// </summary>
+ public const string AddDeviceOids = "/user/onpro/custom/device/add";
+ /// <summary>
+ /// 璋冭瘯杞欢涓婁紶鍔熻兘鍒楄〃
+ /// </summary>
+ public const string AddFunctions = "/user/onpro/custom/function/attribute/add";
+ /// <summary>
+ /// 璋冭瘯杞欢鑾峰彇appOid鍒楄〃
+ /// </summary>
+ public const string BusPcGetAppOids = "/user/onpro/custom/device/list/get";
+ /// <summary>
+ /// 璋冭瘯杞欢鑾峰彇appSid鍒楄〃
+ /// </summary>
+ public const string BusPcGetAppSids = "/user/onpro/custom/function/list/get";
}
}
\ No newline at end of file
--
Gitblit v1.8.0