不是新代码，别 合并

黄学彪

2020-08-07 ec34983e291d1c85284472a27109d55891f9a6b5

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs

@@ -768,7 +768,8 @@
            {

                recordInfo.IconPath = "Device/Sensor.png";

                //消息类型:传感器

                recordInfo.MsgObjectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId1200);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A402");

                recordInfo.MsgObjectText = infoContent != null ? infoContent.A官方名字 : string.Empty;

            }

            else

            {

@@ -826,7 +827,8 @@
            {

                recordInfo.IconPath = "Device/IntelligentLocks.png";

                //消息类型:智能门锁

                recordInfo.MsgObjectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A405");

                recordInfo.MsgObjectText = infoContent != null ? infoContent.A官方名字 : string.Empty;

            }

            else

            {