新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs

@@ -184,9 +184,11 @@
            var dateTime = DateTime.Now;

            while ((DateTime.Now - dateTime).TotalMilliseconds < 3000)

            {

                if (topicCount <= 0 || error == true)

                //if (error == true) { break; }

                if (topicCount <= 0)

                {

                    //9次主题全部接收完成

                    await Task.Delay(1000);

                    break;

                }

                await Task.Delay(50);

@@ -230,6 +232,9 @@
            SafeguardZoneInfo zoneInfo = this.dicAllZoneInfo[allData.ZoneId];

            zoneInfo.ZoneId = allData.ZoneId;

            zoneInfo.ZoneName = allData.ZoneName;



            //信息推送

            zoneInfo.InformationPush = allData.IsDisablePushMessage;



            //处理设备

            foreach (var data2 in allData.DeviceList)

@@ -285,9 +290,6 @@


            zoneInfo.dicAlarmDevice.Clear();

            zoneInfo.dicScenes.Clear();



            //信息推送

            zoneInfo.InformationPush = resData.IsDisablePushMessage;



            foreach (var data in resData.Actions)

            {

@@ -455,7 +457,7 @@
            foreach (var device in listdevice)

            {

                int MomentStatus = 1;

                int TriggerZoneStatus = 1;

                int TriggerZoneStatus = 3;

                //获取安防传感器的瞬间状态设定值

                this.GetSafeguardSensorMomentStatus(device, ref MomentStatus, ref TriggerZoneStatus);



@@ -594,43 +596,43 @@
            if (device.IasDeviceType == 13)

            {

                MomentStatus = 1;

                TriggerZoneStatus = 1;

                TriggerZoneStatus = 3;

            }

            //烟雾传感器

            else if (device.IasDeviceType == 40)

            {

                MomentStatus = 1;

                TriggerZoneStatus = 1;

                TriggerZoneStatus = 3;

            }

            //水侵传感器

            else if (device.IasDeviceType == 42)

            {

                MomentStatus = 1;

                TriggerZoneStatus = 1;

                TriggerZoneStatus = 3;

            }

            //燃气传感器

            else if (device.IasDeviceType == 43)

            {

                MomentStatus = 1;

                TriggerZoneStatus = 1;

                TriggerZoneStatus = 3;

            }

            //紧急按钮

            else if (device.IasDeviceType == 44)

            {

                MomentStatus = 1;

                TriggerZoneStatus = 1;

                TriggerZoneStatus = 3;

            }

            //钥匙扣

            else if (device.IasDeviceType == 277)

            {

                MomentStatus = 1;

                TriggerZoneStatus = 1;

                TriggerZoneStatus = 3;

            }

            //门窗传感器

            else if (device.IasDeviceType == 21 || device.IasDeviceType == 22)

            {

                MomentStatus = 0;

                TriggerZoneStatus = 1;

                TriggerZoneStatus = 3;

            }

            //如果是虚拟设备，则这个东西永恒为0

            if (device.DriveCode > 0)

@@ -1737,10 +1739,6 @@
        /// <returns>0:推送  1:不推送</returns>

        public int GetGarrisonInformationPushStatu(int zoneId)

        {

            if (zoneId > 3)

            {

                zoneId = 3;

            }

            if (this.dicAllZoneInfo.ContainsKey(zoneId) == false)

            {

                return 1;

@@ -2335,7 +2333,7 @@
            /// </summary>

            public string ZoneName;

            /// <summary>

            /// 信息推送 0:推送  1:不推送 (只有防区ID:1,2,3才会有。4,5的都归为3,因为它是以防区模式ID(ActionType)为单位的)

            /// 信息推送 0:推送  1:不推送 
            /// </summary>

            public int InformationPush = 1;

            /// <summary>