From b69d7735274b8d0f741da8a6bb8b8e1347477a5a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 19 三月 2020 17:14:16 +0800
Subject: [PATCH] 20200319
---
HDL_ON/Entity/Function/Function.cs | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 1b5bf0e..31d23ac 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -7,11 +7,6 @@
{
public class Function : A_Protocol_FunctionInfo
{
-
- /// <summary>
- /// 鍔熻兘闄勫甫鐨勫睘鎬т笌鍊肩殑鍒楄〃
- /// </summary>
- public Dictionary<string, byte> dicPropert = new Dictionary<string, byte>();
/// <summary>
/// 鏄惁鏀惰棌
/// </summary>
@@ -62,15 +57,25 @@
{
get
{
- var proArr = trait.Split(',').ToList();
- foreach(var pro in proArr)
+ try
{
- if (!dicPropert.ContainsKey(pro))
+ if (trait == null)
+ return new List<string>();
+ var proArr = trait.Split(',').ToList();
+ foreach (var pro in proArr)
{
- dicPropert.TryAdd(pro, 0);
+ if (!dicPropert.ContainsKey(pro))
+ {
+ dicPropert.TryAdd(pro, "0");
+ }
}
+ return proArr;
}
- return proArr;
+ catch (Exception ex)
+ {
+ MainPage.Log($"Get PropertyArray error : {ex.Message}");
+ return new List<string>();
+ }
}
}
@@ -81,7 +86,7 @@
/// <returns></returns>
public virtual JObject GetSendJObject(string command)
{
- var sendJob = new JObject { { "Namespace", a_Protocol_Namespace }, { "Command", command }, { "Type", "device" }, };
+ var sendJob = new JObject { { "vendor_code", a_Protocol_Namespace }, { "Command", command }, { "Type", "device" }, };
var data = new JObject { { "sid", sid } };
sendJob.Add("objects", data);
return sendJob;
--
Gitblit v1.8.0