Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs

@@ -41,6 +41,25 @@
                            }

                        }
                        else if (common.Type == DeviceType.IASZone)
                        {
                            var iASZonedevice = common as IASZone;
                            if (iASZonedevice.IasDeviceType == 541)
                            {//球形移动传感器
                                if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == objecttype["Cluster_ID"])
                                {
                                    Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
                                    Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
                                    return;
                                }
                                continue;
                            }

                            Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
                            Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
                            return;

                        }
                        else
                        {
                            Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
@@ -187,8 +206,7 @@
        /// <summary>
        /// 添加安防输出的方法
        /// </summary>
        /// <param name="objecttype">Objecttype.</param>
        /// <param name="o">O.</param>
        /// <param name="actionsInfo">actionsInfo.</param>
        public static void AddSecurityactions(Dictionary<string, object> actionsInfo)
        {
            for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
@@ -206,8 +224,8 @@
        /// <summary>
        /// 添加自动化输出的方法
        /// </summary>
        /// <param name="objecttype">Objecttype.</param>
        /// <param name="o">O.</param>
        /// <param name="actionsInfo">Objecttype.</param>
        /// <param name="logic">logic</param>
        public static void AddLogicactions(Common.Logic logic, Dictionary<string, object> actionsInfo)
        {