From 2bf5ec775cb57d8015bee58c745a1e48081ff1b1 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 15 十月 2019 11:06:05 +0800
Subject: [PATCH] 首次合并了全部的代码
---
ZigbeeApp/Shared/Common/Logic.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 8fed77f..e7805cc 100755
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -3,6 +3,7 @@
namespace Shared.Common
{
+
public class Logic
{
public static List<Logic> LogicList = new List<Logic>();
@@ -14,7 +15,13 @@
///<para>浠ヤ笅鎵�鏈夊瓧娈靛彧鏈夊湪Result 涓�1鏃跺瓨鍦�</para>
/// </summary>
public int Result;
-
+ /// <summary>
+ /// 1姝ｅ父鑷姩鍖�;2鎺ㄨ崘妯℃澘鑷姩鍖�;
+ /// </summary>
+ public int LogicType=1;
+ /// <summary>
+ /// 閫昏緫ID
+ /// </summary>
public int LogicId;
/// <summary>
///璇ラ�昏緫鏄惁琚娇鑳姐��
@@ -35,9 +42,13 @@
///<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>
@@ -48,6 +59,10 @@
/// </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