From a051c37a96a4b518b1bf1689252649c32430194f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 10 四月 2020 15:49:12 +0800
Subject: [PATCH] 2020-04-10-0-1
---
ZigbeeApp/Shared/Common/Logic.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 4fe1ac6..f5f40e5 100644
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -17,7 +17,7 @@
/// </summary>
public int Result;
/// <summary>
- /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
/// </summary>
public int LogicType = 0;
/// <summary>
@@ -29,8 +29,14 @@
///<para>0锛氱鐢ㄨ閫昏緫</para>
///<para>1锛氫娇鑳借閫昏緫</para>
///<para>2: 鍙Е鍙戜竴娆°�傝Е鍙戝悗璇ュ瓧娈靛皢鑷姩缃负0锛屽嵆绂佺敤鐘舵�併��</para>
+ ///3锛氬け鑳戒竴娆★紙鏉′欢绗竴娆℃垚绔嬩細琚拷鐣ワ紝瑙﹀彂涓嶄簡閫昏緫锛岀劧鍚嶪sValid鑷姩缃�1銆備互鍚庢潯浠跺啀鎴愮珛灏嗕笉浼氳蹇界暐锛�
/// </summary>
public int IsEnable;
+
+ /// <summary>
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
+ /// </summary>
+ // public int LogicStatus;
/// <summary>
///閫昏緫鍚嶇О
@@ -46,7 +52,11 @@
/// <summary>
/// 鎺ㄩ�佸唴瀹�
/// </summary>
- public string LogicCustomPushText;
+ public string LogicCustomPushText=string.Empty;
+ /// <summary>
+ /// 璁板綍鎺ㄩ�佸紑鍏崇姸鎬�
+ /// </summary>
+ public int LogicIsCustomPushText = 0;
//public Dictionary<string, string> TimeAttribute = new Dictionary<string, string>();
public TimeAttributeObj TimeAttribute = new TimeAttributeObj();
--
Gitblit v1.8.0