先上传一个版本

黄学彪

2020-04-08 4dce704aaf8587cf3f91cf88f2208315a03c4cbb

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

@@ -145,7 +145,7 @@
                //门锁上报

                else if (topic == gatewayId + "/Alarms/SendAlarmInform")

                {

                    this.DoorLockDeviceReportPush(null);

                    this.DoorLockDeviceReportPush(JObject.Parse(msgData));

                }

                //通过外部方式布防撤防成功时报告

                else if (topic == gatewayId + "/Security/EnOrWithdrawSucceedReport")

@@ -484,9 +484,25 @@
        /// <param name="receiveData"></param>

        private void DoorLockDeviceReportPush(JObject receiveData)

        {

            //保存门锁信息到本地

            //HdlAlarmsLogic.Current.SaveDoorLockAlarmInfo(receiveData);



            //只有徐梅的门锁界面没有打开的情况下,才会处理这个东西

            if (ControlCommonResourse.IsDoorLockPageOpen == false)

            {

                var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));

                if ((device is ZigBee.Device.DoorLock) == false)

                {

                    //它不是门锁

                    return;

                }

                var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());

                if (info.Clusterid == 257)

                {

                    //常开模式开启

                    if (info.AlarmCode == 216)

                    {

                        DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);

                    }

                }

            }

            //显示有新消息的特效

            this.ShowHadNewMessageAppeal();

        }