Ver código fonte

修复里程数据类型

tags/v2.6.9
yedajiang44 9 meses atrás
pai
commit
d7b320cfc6
7 arquivos alterados com 18 adições e 18 exclusões
  1. +3
    -3
      src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs
  2. +1
    -1
      src/JT808.Protocol.Test/MessageBody/JT808_0x0201Test.cs
  3. +1
    -1
      src/JT808.Protocol.Test/MessageBody/JT808_0x0500Test.cs
  4. +2
    -2
      src/JT808.Protocol.Test/MessageBody/JT808_0x0704Test.cs
  5. +6
    -6
      src/JT808.Protocol.Test/Simples/Demo10.cs
  6. +1
    -1
      src/JT808.Protocol.Test/Simples/Demo2.cs
  7. +4
    -4
      src/JT808.Protocol/MessageBody/JT808_0x0200_0x01.cs

+ 3
- 3
src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs Ver arquivo

@@ -140,7 +140,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal((uint)2, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
}

@@ -215,7 +215,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal((uint)2, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
var jT808LocationAttachImpl0x61 = (JT808LocationAttachImpl0x61)jT808UploadLocationRequest.CustomLocationAttachData[0x61];
Assert.Equal(18, jT808LocationAttachImpl0x61.Age);
@@ -307,7 +307,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal((uint)2, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
}
[Fact]


+ 1
- 1
src/JT808.Protocol.Test/MessageBody/JT808_0x0201Test.cs Ver arquivo

@@ -65,7 +65,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(132444444, jT808_0X0201.Position.Lng);
Assert.Equal(60, jT808_0X0201.Position.Speed);
Assert.Equal((uint)2, jT808_0X0201.Position.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808_0X0201.Position.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808_0X0201.Position.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808_0X0201.Position.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
}



+ 1
- 1
src/JT808.Protocol.Test/MessageBody/JT808_0x0500Test.cs Ver arquivo

@@ -67,7 +67,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(0, JT808Bodies.JT808_0x0200.Direction);
Assert.Equal(60, JT808Bodies.JT808_0x0200.Speed);
Assert.Equal((uint)2, JT808Bodies.JT808_0x0200.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)JT808Bodies.JT808_0x0200.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)JT808Bodies.JT808_0x0200.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)JT808Bodies.JT808_0x0200.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
}



+ 2
- 2
src/JT808.Protocol.Test/MessageBody/JT808_0x0704Test.cs Ver arquivo

@@ -143,7 +143,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(0, JT808Bodies.Positions[0].Direction);
Assert.Equal(60, JT808Bodies.Positions[0].Speed);
Assert.Equal((uint)2, JT808Bodies.Positions[0].StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)JT808Bodies.Positions[0].BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)JT808Bodies.Positions[0].BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)JT808Bodies.Positions[0].BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);

Assert.Equal((uint)2, JT808Bodies.Positions[1].AlarmFlag);
@@ -153,7 +153,7 @@ namespace JT808.Protocol.Test.MessageBody
Assert.Equal(54, JT808Bodies.Positions[1].Speed);
Assert.Equal(120, JT808Bodies.Positions[1].Direction);
Assert.Equal((uint)1, JT808Bodies.Positions[1].StatusFlag);
Assert.Equal(96, ((JT808_0x0200_0x01)JT808Bodies.Positions[1].BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(96u, ((JT808_0x0200_0x01)JT808Bodies.Positions[1].BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(66, ((JT808_0x0200_0x02)JT808Bodies.Positions[1].BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
}



+ 6
- 6
src/JT808.Protocol.Test/Simples/Demo10.cs Ver arquivo

@@ -103,7 +103,7 @@ namespace JT808.Protocol.Test.Simples
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal(2u, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
var jT808LocationAttachImpl0XDF = (JT808LocationAttachImpl0xDF)jT808UploadLocationRequest.CustomLocationAttachData[0xDF];
Assert.Equal(0xDF, jT808LocationAttachImpl0XDF.AttachInfoId);
@@ -167,7 +167,7 @@ namespace JT808.Protocol.Test.Simples
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal(2u, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
var jT808LocationAttachImpl0XDD = (JT808LocationAttachImpl0xDD)jT808UploadLocationRequest.CustomLocationAttachData3[0xDD];
Assert.Equal(0xDD, jT808LocationAttachImpl0XDD.AttachInfoId);
@@ -231,7 +231,7 @@ namespace JT808.Protocol.Test.Simples
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal(2u, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
var jT808LocationAttachImpl0XDE = (JT808LocationAttachImpl0xDE)jT808UploadLocationRequest.CustomLocationAttachData2[0xDE];
Assert.Equal(0xDE, jT808LocationAttachImpl0XDE.AttachInfoId);
@@ -295,7 +295,7 @@ namespace JT808.Protocol.Test.Simples
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal(2u, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
var jT808LocationAttachImpl0X62 = (JT808LocationAttachImpl0x62)jT808UploadLocationRequest.CustomLocationAttachData4[0x62];
Assert.Equal(0x62, jT808LocationAttachImpl0X62.AttachInfoId);
@@ -380,7 +380,7 @@ namespace JT808.Protocol.Test.Simples
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal(2u, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);

var jT808LocationAttachImpl0X62 = (JT808LocationAttachImpl0x62)jT808UploadLocationRequest.CustomLocationAttachData4[0x62];
@@ -475,7 +475,7 @@ namespace JT808.Protocol.Test.Simples
Assert.Equal(132444444, jT808UploadLocationRequest.Lng);
Assert.Equal(60, jT808UploadLocationRequest.Speed);
Assert.Equal(2u, jT808UploadLocationRequest.StatusFlag);
Assert.Equal(100, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(55, ((JT808_0x0200_0x02)jT808UploadLocationRequest.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);

var jT808LocationAttachImpl0XDF = (JT808LocationAttachImpl0xDF)jT808UploadLocationRequest.CustomLocationAttachData[0xDF];


+ 1
- 1
src/JT808.Protocol.Test/Simples/Demo2.cs Ver arquivo

@@ -50,7 +50,7 @@ namespace JT808.Protocol.Test.Simples
Assert.Equal(0, jT808_0x0200.Direction);
Assert.Equal((uint)2, jT808_0x0200.StatusFlag);
//4.1.附加信息1
Assert.Equal(100, ((JT808_0x0200_0x01)jT808_0x0200.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
Assert.Equal(100u, ((JT808_0x0200_0x01)jT808_0x0200.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x01]).Mileage);
//4.2.附加信息2
Assert.Equal(125, ((JT808_0x0200_0x02)jT808_0x0200.BasicLocationAttachData[JT808Constants.JT808_0x0200_0x02]).Oil);
}


+ 4
- 4
src/JT808.Protocol/MessageBody/JT808_0x0200_0x01.cs Ver arquivo

@@ -23,7 +23,7 @@ namespace JT808.Protocol.MessageBody
/// <summary>
/// 里程
/// </summary>
public int Mileage { get; set; }
public uint Mileage { get; set; }
/// <summary>
/// 里程 1/10km,对应车上里程表读数
/// </summary>
@@ -42,7 +42,7 @@ namespace JT808.Protocol.MessageBody
writer.WriteNumber($"[{value.AttachInfoId.ReadNumber()}]附加信息Id", value.AttachInfoId);
value.AttachInfoLength = reader.ReadByte();
writer.WriteNumber($"[{value.AttachInfoLength.ReadNumber()}]附加信息长度", value.AttachInfoLength);
value.Mileage = reader.ReadInt32();
value.Mileage = reader.ReadUInt32();
writer.WriteNumber($"[{value.Mileage.ReadNumber()}]里程", value.Mileage);
}
/// <summary>
@@ -56,7 +56,7 @@ namespace JT808.Protocol.MessageBody
JT808_0x0200_0x01 value = new JT808_0x0200_0x01();
value.AttachInfoId = reader.ReadByte();
value.AttachInfoLength = reader.ReadByte();
value.Mileage = reader.ReadInt32();
value.Mileage = reader.ReadUInt32();
return value;
}
/// <summary>
@@ -69,7 +69,7 @@ namespace JT808.Protocol.MessageBody
{
writer.WriteByte(value.AttachInfoId);
writer.WriteByte(value.AttachInfoLength);
writer.WriteInt32(value.Mileage);
writer.WriteUInt32(value.Mileage);
}
}
}

Carregando…
Cancelar
Salvar