From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2

---
 ZigbeeApp/Shared/Common/Logic.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 42c01e0..da5d19a 100644
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -17,7 +17,7 @@
         /// </summary>
         public int Result;
         /// <summary>
-        /// 0.姝e父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�
+        /// 0.姝e父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
         /// </summary>
         public int LogicType = 0;
         /// <summary>
@@ -31,6 +31,11 @@
         ///<para>2: 鍙Е鍙戜竴娆°�傝Е鍙戝悗璇ュ瓧娈靛皢鑷姩缃负0锛屽嵆绂佺敤鐘舵�併��</para>
         /// </summary>
         public int IsEnable;
+
+        /// <summary>
+        ///  0.姝e父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
+        /// </summary>
+       // public int LogicStatus;
 
         /// <summary>
         ///閫昏緫鍚嶇О
@@ -47,6 +52,10 @@
         /// 鎺ㄩ�佸唴瀹�
         /// </summary>
         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