From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 6d0a404..b1b086f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -180,7 +180,7 @@
});
}
///<summary>
- /// 鍒犻櫎閫昏緫
+ /// 鍒犻櫎閫昏緫(0鎴愬姛,鍏跺畠鍊�:澶辫触)
/// </summary>
public static async System.Threading.Tasks.Task<int> DelLogic(int LogicId)
{
@@ -499,6 +499,15 @@
["AccountName"] = dictionary["AccountName"],
};
+
+ if (dictionary.ContainsKey("Option4"))
+ {
+ accounts1.Add("Option4",dictionary["Option4"]);
+ }
+ if (dictionary.ContainsKey("Option2"))
+ {
+ accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
+ }
accounts.Add(accounts1);
}
}
--
Gitblit v1.8.0