From 679c2a4c459c7ad0e9f727ad4196c0754716c28f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 08 四月 2020 11:39:20 +0800
Subject: [PATCH] 2020-04-08-1
---
ZigbeeApp/Shared/Common/Logic.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index e7805cc..f5f40e5 100644
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -7,6 +7,7 @@
public class Logic
{
public static List<Logic> LogicList = new List<Logic>();
+ public static List<Logic> LockLogicList = new List<Logic>();
public static List<ZigBee.Device.CommonDevice> LogicDviceList = new List<ZigBee.Device.CommonDevice>();
public static Logic CurrentLogic;
/// <summary>
@@ -16,9 +17,9 @@
/// </summary>
public int Result;
/// <summary>
- /// 1姝ｅ父鑷姩鍖�;2鎺ㄨ崘妯℃澘鑷姩鍖�;
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
/// </summary>
- public int LogicType=1;
+ public int LogicType = 0;
/// <summary>
/// 閫昏緫ID
/// </summary>
@@ -28,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>
///閫昏緫鍚嶇О
@@ -45,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();
@@ -73,7 +84,7 @@
public class TimeAttributeObj
{
public int Calendar;
- public int Repeat=2;
+ public int Repeat = 2;
public int WeekDay;
public int SetYear;
public int MonthDate;
@@ -82,4 +93,4 @@
}
- }
+}
--
Gitblit v1.8.0