Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -509,7 +509,7 @@
        /// </summary>

        /// <param name="jobject"></param>

        /// <returns></returns>

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

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

        {

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

            var alarmInfo = new DeviceAlarmInfo();

@@ -549,17 +549,17 @@
                    //暴力开门
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg5);
                }
                else if (info.AlarmCode == 16)
                else if (info.AlarmCode == 116)
                {
                    //常开模式开启
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg6);
                }
                else if (info.AlarmCode == 17)
                else if (info.AlarmCode == 117)
                {
                    //常开模式结束
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg7);
                }
                else if (info.AlarmCode == 32)
                else if (info.AlarmCode == 132)
                {
                    //门铃触发
                    alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg8);