先上传一个版本

黄学彪

2020-04-08 4dce704aaf8587cf3f91cf88f2208315a03c4cbb

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

@@ -539,7 +539,7 @@
        /// <returns></returns>

        public DeviceAlarmInfo GetDoorLockAlarmInfo(Newtonsoft.Json.Linq.JObject jobject)

        {

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

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

            var alarmInfo = new DeviceAlarmInfo();


            if (info.Clusterid == 1)
@@ -577,17 +577,17 @@
                    //暴力开门
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg5);
                }
                else if (info.AlarmCode == 116)
                else if (info.AlarmCode == 216)
                {
                    //常开模式开启
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg6);
                }
                else if (info.AlarmCode == 117)
                else if (info.AlarmCode == 217)
                {
                    //常开模式结束
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg7);
                }
                else if (info.AlarmCode == 132)
                else if (info.AlarmCode == 232)
                {
                    //门铃触发
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg8);
@@ -614,25 +614,6 @@
            }

            oldDeviceAlarmFile = fileName;

            return fileName;

        }

        #endregion

        #region ■ 结构体_____________________________

        /// <summary>
        /// 门锁的报警结果
        /// </summary>
        private class DoorLockAlarmsResult
        {
            /// <summary>
            /// 报警类型
            /// </summary>
            public int AlarmCode = -1;
            /// <summary>
            /// Clusterid
            /// </summary>
            public int Clusterid = -1;
        }

        #endregion