From 2eba7f5d706f7802bbd76629116499adeb518a68 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 17:58:14 +0800
Subject: [PATCH] 2019-12-31-03
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 4ff194e..00dfbd3 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -510,6 +510,7 @@
{ "Relationship",logic.Relationship} ,
{ "LogicType",logic.LogicType} ,
{ "LogicCustomPushText",logic.LogicCustomPushText} ,
+ { "LogicIsCustomPushText",logic.LogicIsCustomPushText} ,
{ "TimeAttribute", timeAttribute} ,
{ "Conditions", conditions },
{ "Actions", actions },
@@ -576,6 +577,7 @@
date.Add("LogicName", logic.LogicName);
date.Add("Relationship", logic.Relationship);
date.Add("LogicCustomPushText", logic.LogicCustomPushText);
+ date.Add("LogicIsCustomPushText", logic.LogicIsCustomPushText);
mainGateWay?.Send("Logic/ReviseAttribute", jObject.ToString());
//await System.Threading.Tasks.Task.Run(async () =>
//{
@@ -624,6 +626,7 @@
logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
logic.LogicCustomPushText =Logicifon["LogicCustomPushText"].ToString();
+ logic.LogicIsCustomPushText = int.Parse(Logicifon["LogicIsCustomPushText"].ToString());
logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
--
Gitblit v1.8.0