From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/Entity/Function/Function.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 8f996e3..45f4951 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -17,6 +17,10 @@
/// </summary>
public string attri;
/// <summary>
+ /// 灞炴�у悕绉�
+ /// </summary>
+ public string name;
+ /// <summary>
/// 灞炴�х殑鍊�
/// </summary>
public List<string> value;
@@ -30,7 +34,7 @@
public int min;
/// <summary>
- ///
+ /// 鏁版嵁绫诲瀷
/// </summary>
public string data_type = "";
@@ -39,8 +43,21 @@
/// app杞欢鑷畾涔夊睘鎬�
/// 鐢ㄦ潵璁板綍褰撳墠鐘舵��
/// </summary>
- public object curValues;
+ public object curValues = new object();
}
+ /// <summary>
+ /// 璁惧鍔熻兘oid
+ /// </summary>
+ public class FunctionOid
+ {
+ public string oid;
+ public string name;
+ public string machine_id;
+ public string net_id;
+ public string dev_id;
+ public string channels;
+ }
+
public class Function
{
@@ -91,12 +108,6 @@
/// </summary>
public BusData bus_Data;
#endregion
-
-
- ///// <summary>
- ///// 鍔熻兘闄勫甫鐨勫睘鎬т笌鍊肩殑鍒楄〃
- ///// </summary>
- //public Dictionary<string, string> dicPropert;
/// <summary>
/// 鍔熻兘绫诲埆
@@ -151,6 +162,7 @@
/// <summary>
/// 鏈�鍚庢帶鍒剁殑涓�娆＄姸鎬�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string lastState = "";
[Newtonsoft.Json.JsonIgnore]
--
Gitblit v1.8.0