From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Common/Logic.cs | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index e7805cc..8fed77f 100755
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -3,7 +3,6 @@
namespace Shared.Common
{
-
public class Logic
{
public static List<Logic> LogicList = new List<Logic>();
@@ -15,13 +14,7 @@
///<para>浠ヤ笅鎵�鏈夊瓧娈靛彧鏈夊湪Result 涓�1鏃跺瓨鍦�</para>
/// </summary>
public int Result;
- /// <summary>
- /// 1姝ｅ父鑷姩鍖�;2鎺ㄨ崘妯℃澘鑷姩鍖�;
- /// </summary>
- public int LogicType=1;
- /// <summary>
- /// 閫昏緫ID
- /// </summary>
+
public int LogicId;
/// <summary>
///璇ラ�昏緫鏄惁琚娇鑳姐��
@@ -42,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>
@@ -59,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>>();
}
--
Gitblit v1.8.0