Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Common/Logic.cs

@@ -3,9 +3,11 @@

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>
@@ -14,7 +16,13 @@
        ///<para>以下所有字段只有在Result 为1时存在</para>
        /// </summary>
        public int Result;

        /// <summary>
        /// 0.正常自动化;1.门锁自动化
        /// </summary>
        public int LogicType = 0;
        /// <summary>
        /// 逻辑ID
        /// </summary>
        public int LogicId;
        /// <summary>
        ///该逻辑是否被使能。 
@@ -35,6 +43,10 @@
        ///<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(); 
@@ -48,6 +60,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>>();

    }