2020-7-1-1

陈嘉乐

2020-07-01 c16f0f8fd1e5374164852a441751abb96a84d300

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

old mode 100755
new mode 100644
@@ -41,6 +41,18 @@
                            }

                        }
                        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;
                                }
                            }
                        }
                        else
                        {
                            Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
@@ -126,7 +138,7 @@
        /// </summary>
        /// <param name="common">Common.</param>
        /// <param name="actionsInfo">Objecttype.</param>
        public static void AddDeviceactions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
        public static void AddDeviceActions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
        {
            for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
            {
@@ -143,6 +155,27 @@
            Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
        }
        /// <summary>
        /// 添加门锁设备输出的方法
        /// </summary>
        /// <param name="common">Common.</param>
        /// <param name="actionsInfo">Objecttype.</param>
        public static void AddDoorLockActions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
        {
            for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
            {
                if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "8")
                {
                    if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == common.DeviceAddr && Common.Logic.CurrentLogic.Actions[i]["Epoint"].ToString() =="200")
                    {
                        Common.Logic.CurrentLogic.Actions.RemoveAt(i);
                        Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
                        return;
                    }
                }
            }
            Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
        }
        /// <summary>
        /// 添加Scene输出的方法
        /// </summary>
        /// <param name="Scene">Common.</param>