소스 검색

消除有疑问的警告

tags/v2.2.0
SmallChi(Koike) 5 년 전
부모
커밋
b64ed3ee37
7개의 변경된 파일4개의 추가작업 그리고 13개의 파일을 삭제
  1. +3
    -1
      src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs
  2. +1
    -1
      src/JT809.Protocol/MessageBody/JT809_0x9008.cs
  3. +0
    -3
      src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs
  4. +0
    -2
      src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs
  5. +0
    -2
      src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs
  6. +0
    -2
      src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs
  7. +0
    -2
      src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs

+ 3
- 1
src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x1200_0x1202Test.cs 파일 보기

@@ -112,8 +112,10 @@ namespace JT809.Protocol.Test.JT809SubMessageBody
Assert.Equal("33333333333", jT809_0X1200_0X1202.GNSSData.PlatformId3); Assert.Equal("33333333333", jT809_0X1200_0X1202.GNSSData.PlatformId3);
Assert.Equal(3u, jT809_0X1200_0X1202.GNSSData.Alarm3); Assert.Equal(3u, jT809_0X1200_0X1202.GNSSData.Alarm3);
} }
#warning 此处结合808协议包解析 808中的定位信息


/// <summary>
/// 此处结合808协议包解析
/// </summary>
[Fact] [Fact]
public void Test_2019_3() public void Test_2019_3()
{ {


+ 1
- 1
src/JT809.Protocol/MessageBody/JT809_0x9008.cs 파일 보기

@@ -15,7 +15,7 @@ namespace JT809.Protocol.MessageBody
{ {
public override ushort MsgId => JT809BusinessType.上级平台主动关闭链路通知消息.ToUInt16Value(); public override ushort MsgId => JT809BusinessType.上级平台主动关闭链路通知消息.ToUInt16Value();
public override string Description => "上级平台主动关闭链路通知消息"; public override string Description => "上级平台主动关闭链路通知消息";
#warning 待验证主从链路
public override JT809_LinkType LinkType => JT809_LinkType.subordinate; public override JT809_LinkType LinkType => JT809_LinkType.subordinate;
/// <summary> /// <summary>
/// 链路关闭原因 /// 链路关闭原因


+ 0
- 3
src/JT809.Protocol/SubMessageBody/JT809_0x1200_0x1201.cs 파일 보기

@@ -56,7 +56,6 @@ namespace JT809.Protocol.SubMessageBody
virtualHex = reader.ReadVirtualArray(11); virtualHex = reader.ReadVirtualArray(11);
value.ProducerId = reader.ReadString(11); value.ProducerId = reader.ReadString(11);
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车载终端厂商唯一编码", value.ProducerId); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车载终端厂商唯一编码", value.ProducerId);
#warning 此处应该改成大端模式读取数据吧
virtualHex = reader.ReadVirtualArray(20); virtualHex = reader.ReadVirtualArray(20);
value.TerminalModelType = reader.ReadString(20); value.TerminalModelType = reader.ReadString(20);
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车载终端型号", value.TerminalModelType); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车载终端型号", value.TerminalModelType);
@@ -99,7 +98,6 @@ namespace JT809.Protocol.SubMessageBody
{ {
value.PlateformId = reader.ReadString(11); value.PlateformId = reader.ReadString(11);
value.ProducerId = reader.ReadString(11); value.ProducerId = reader.ReadString(11);
#warning 此处应该改成大端模式读取数据吧
value.TerminalModelType = reader.ReadString(20); value.TerminalModelType = reader.ReadString(20);
value.TerminalId = reader.ReadString(7); value.TerminalId = reader.ReadString(7);
value.TerminalId = value.TerminalId.ToUpper(); value.TerminalId = value.TerminalId.ToUpper();
@@ -124,7 +122,6 @@ namespace JT809.Protocol.SubMessageBody
{ {
writer.WriteStringPadRight(value.PlateformId, 11); writer.WriteStringPadRight(value.PlateformId, 11);
writer.WriteStringPadRight(value.ProducerId, 11); writer.WriteStringPadRight(value.ProducerId, 11);
#warning 此处应该改成大端模式读取数据吧
writer.WriteStringPadRight(value.TerminalModelType, 20); writer.WriteStringPadRight(value.TerminalModelType, 20);
writer.WriteStringPadRight(value.TerminalId.ToUpper(), 7); writer.WriteStringPadRight(value.TerminalId.ToUpper(), 7);
writer.WriteStringPadLeft(value.TerminalSimCode, 12); writer.WriteStringPadLeft(value.TerminalSimCode, 12);


+ 0
- 2
src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1402.cs 파일 보기

@@ -105,7 +105,6 @@ namespace JT809.Protocol.SubMessageBody
hex = reader.ReadVirtualArray(8); hex = reader.ReadVirtualArray(8);
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
writer.WriteString($"[{hex.ToArray().ToHexString()}]事件结束时间", value.EndTime); writer.WriteString($"[{hex.ToArray().ToHexString()}]事件结束时间", value.EndTime);
#warning 此处车牌号文档长度有误,使用旧版长度21
hex = reader.ReadVirtualArray(21); hex = reader.ReadVirtualArray(21);
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
writer.WriteString($"[{hex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); writer.WriteString($"[{hex.ToArray().ToHexString()}]车牌号码", value.VehicleNo);
@@ -145,7 +144,6 @@ namespace JT809.Protocol.SubMessageBody
{ {
value.StartTime = reader.ReadUTCDateTime(); value.StartTime = reader.ReadUTCDateTime();
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
#warning 此处车牌号文档长度有误,使用旧版长度21
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte();
value.DestinationPlatformId = reader.ReadString(11); value.DestinationPlatformId = reader.ReadString(11);


+ 0
- 2
src/JT809.Protocol/SubMessageBody/JT809_0x1400_0x1403.cs 파일 보기

@@ -101,7 +101,6 @@ namespace JT809.Protocol.SubMessageBody
virtualHex = reader.ReadVirtualArray(8); virtualHex = reader.ReadVirtualArray(8);
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime);
#warning 此处车牌号文档长度有误,使用旧版长度21
virtualHex = reader.ReadVirtualArray(21); virtualHex = reader.ReadVirtualArray(21);
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo);
@@ -135,7 +134,6 @@ namespace JT809.Protocol.SubMessageBody
value.WarnTime = reader.ReadUTCDateTime(); value.WarnTime = reader.ReadUTCDateTime();
value.StartTime = reader.ReadUTCDateTime(); value.StartTime = reader.ReadUTCDateTime();
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
#warning 此处车牌号文档长度有误,使用旧版长度21
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte();
value.DestinationPlatformId = reader.ReadBigNumber(11); value.DestinationPlatformId = reader.ReadBigNumber(11);


+ 0
- 2
src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9402.cs 파일 보기

@@ -96,7 +96,6 @@ namespace JT809.Protocol.SubMessageBody
virtualHex = reader.ReadVirtualArray(8); virtualHex = reader.ReadVirtualArray(8);
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime);
#warning 此处车牌号文档长度有误,使用旧版长度21
virtualHex = reader.ReadVirtualArray(21); virtualHex = reader.ReadVirtualArray(21);
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo);
@@ -131,7 +130,6 @@ namespace JT809.Protocol.SubMessageBody
if (config.Version == JT809Version.JTT2019) { if (config.Version == JT809Version.JTT2019) {
value.StartTime = reader.ReadUTCDateTime(); value.StartTime = reader.ReadUTCDateTime();
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
#warning 此处车牌号文档长度有误,使用旧版长度21
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte();
value.DestinationPlatformId = reader.ReadBigNumber(11); value.DestinationPlatformId = reader.ReadBigNumber(11);


+ 0
- 2
src/JT809.Protocol/SubMessageBody/JT809_0x9400_0x9403.cs 파일 보기

@@ -95,7 +95,6 @@ namespace JT809.Protocol.SubMessageBody
virtualHex = reader.ReadVirtualArray(8); virtualHex = reader.ReadVirtualArray(8);
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]事件结束时间", value.EndTime);
#warning 此处车牌号文档长度有误,使用旧版长度21
virtualHex = reader.ReadVirtualArray(21); virtualHex = reader.ReadVirtualArray(21);
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo); writer.WriteString($"[{virtualHex.ToArray().ToHexString()}]车牌号码", value.VehicleNo);
@@ -131,7 +130,6 @@ namespace JT809.Protocol.SubMessageBody
{ {
value.StartTime = reader.ReadUTCDateTime(); value.StartTime = reader.ReadUTCDateTime();
value.EndTime = reader.ReadUTCDateTime(); value.EndTime = reader.ReadUTCDateTime();
#warning 此处车牌号文档长度有误,使用旧版长度21
value.VehicleNo = reader.ReadString(21); value.VehicleNo = reader.ReadString(21);
value.VehicleColor = (JT809VehicleColorType)reader.ReadByte(); value.VehicleColor = (JT809VehicleColorType)reader.ReadByte();
value.DestinationPlatformId = reader.ReadBigNumber(11); value.DestinationPlatformId = reader.ReadBigNumber(11);


불러오는 중...
취소
저장