From c3e1b733fc45bd9f0b88bfb560cfa87a270b079b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 九月 2020 17:33:58 +0800
Subject: [PATCH] 20200909
---
HDL_ON/Entity/Function/Function.cs | 62 +++++++++----------------------
1 files changed, 18 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 0c3e88b..985a1c8 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -17,7 +17,7 @@
/// 灞炴�у悕绉�
/// </summary>
public string name;
- public List<string> _value_key;
+ List<string> _value_key;
/// <summary>
/// 灞炴�х殑鍊煎垪琛�
/// </summary>
@@ -56,8 +56,10 @@
/// <summary>
/// 灞炴�у�煎崟浣�
/// </summary>
- public string _uintString;
- public string uintString {
+ string _uintString;
+ [Newtonsoft.Json.JsonIgnore]
+ public string uintString
+ {
get
{
if(!string.IsNullOrEmpty( _uintString))
@@ -83,6 +85,7 @@
/// 灞炴�у悕绉版樉绀烘枃鏈�
/// 涓嫳鏂囨樉绀�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string name_text
{
get
@@ -322,8 +325,6 @@
public string net_id;
public string dev_id;
public string channels;
-
-
}
@@ -332,6 +333,18 @@
public Function()
{
}
+ /// <summary>
+ /// 鏁版嵁瀛樺偍鏂囦欢鍚�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string savePath
+ {
+ get
+ {
+ return "FunctionData_" + sid;
+ }
+ }
+
#region base info
/// <summary>
/// HDL缁熶竴鍗忚鏍煎紡锛�14bytes
@@ -446,20 +459,6 @@
/// 澶囨敞
/// </summary>
public string name;
- /// <summary>
- /// A鍗忚鍘傚晢浠ｇ爜
- /// </summary>
- public string vendor_code
- {
- get
- {
- string vendorCode = "HDL";
- var code = sid.Substring(0, 4);
- if (code == "0001")
- vendorCode = "HDL";
- return vendorCode;
- }
- }
/// <summary>
/// 鏈�鍚庢帶鍒剁殑涓�娆＄姸鎬�
@@ -498,18 +497,6 @@
}
/// <summary>
- /// 寮�鍏崇姸鎬佹枃鏈�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string on_off_text
- {
- get
- {
- return trait_on_off.value.ToString() == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
- }
- }
-
- /// <summary>
/// 鏄惁鏀惰棌
/// </summary>
public bool collection = false;
@@ -531,19 +518,6 @@
/// 鍥哄畾鐨勫簭鍙�
/// </summary>
public int fixedSerialNumber = int.MaxValue;
-
- /// <summary>
- /// 鑾峰彇A鍗忚鎺у埗瀛楃涓�
- /// </summary>
- /// <param name="command">鎺у埗鍛戒护锛歸rite锛宺ead</param>
- /// <returns></returns>
- public virtual JObject GetSendJObject(CommandType_A command)
- {
- var sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" }, };
- var data = new JObject { { "sid", sid } };
- sendJob.Add("objects", data);
- return sendJob;
- }
public string GetBusId ()
{
--
Gitblit v1.8.0