From ac909072af41b3dcb05d4a7df3d27a8e85e4e7e2 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期日, 28 六月 2020 17:43:18 +0800
Subject: [PATCH] 2020-06-28-1
---
ZigbeeApp/Shared/Common/Logic.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
old mode 100644
new mode 100755
index e7805cc..25b7c00
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -7,6 +7,8 @@
public class Logic
{
public static List<Logic> LogicList = new List<Logic>();
+ public static List<Logic> LockLogicList = new List<Logic>();
+ public static List<Logic> SoneLogicList = new List<Logic>();
public static List<ZigBee.Device.CommonDevice> LogicDviceList = new List<ZigBee.Device.CommonDevice>();
public static Logic CurrentLogic;
/// <summary>
@@ -16,9 +18,9 @@
/// </summary>
public int Result;
/// <summary>
- /// 1姝ｅ父鑷姩鍖�;2鎺ㄨ崘妯℃澘鑷姩鍖�;
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
/// </summary>
- public int LogicType=1;
+ public int LogicType = 0;
/// <summary>
/// 閫昏緫ID
/// </summary>
@@ -45,7 +47,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 +79,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 +88,4 @@
}
- }
+}
--
Gitblit v1.8.0