From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Common/Logic.cs | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 4fe1ac6..8fed77f 100755
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -3,11 +3,9 @@
namespace Shared.Common
{
-
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,13 +14,7 @@
///<para>浠ヤ笅鎵�鏈夊瓧娈靛彧鏈夊湪Result 涓�1鏃跺瓨鍦�</para>
/// </summary>
public int Result;
- /// <summary>
- /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�
- /// </summary>
- public int LogicType = 0;
- /// <summary>
- /// 閫昏緫ID
- /// </summary>
+
public int LogicId;
/// <summary>
///璇ラ�昏緫鏄惁琚娇鑳姐��
@@ -43,13 +35,9 @@
///<para>1锛氭弧瓒冲叾涓竴涓潯浠惰Е鍙戝姩浣�</para>
/// </summary>
public int Relationship;
- /// <summary>
- /// 鎺ㄩ�佸唴瀹�
- /// </summary>
- public string LogicCustomPushText;
//public Dictionary<string, string> TimeAttribute = new Dictionary<string, string>();
- public TimeAttributeObj TimeAttribute = new TimeAttributeObj();
+ public TimeAttributeObj TimeAttribute = new TimeAttributeObj();
/// <summary>
/// 閫昏緫鏉′欢鍒楄〃
/// </summary>
@@ -60,10 +48,6 @@
/// </summary>
public List<Dictionary<string, object>> Actions = new List<Dictionary<string, object>>();
- /// <summary>
- /// 鍏宠仈app璐﹀彿鍒楄〃
- /// </summary>
- public List<Dictionary<string, string>> Accounts = new List<Dictionary<string, string>>();
}
@@ -74,7 +58,7 @@
public class TimeAttributeObj
{
public int Calendar;
- public int Repeat = 2;
+ public int Repeat=2;
public int WeekDay;
public int SetYear;
public int MonthDate;
@@ -83,4 +67,4 @@
}
-}
+ }
--
Gitblit v1.8.0