diff --git a/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x1205Test.cs b/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x1205Test.cs index f06bdc2..ff41a7c 100644 --- a/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x1205Test.cs +++ b/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x1205Test.cs @@ -65,13 +65,13 @@ namespace JT808.Protocol.Extensions.JT1078.Test } }; var hex = JT808Serializer.Serialize(jT808_0x1205).ToHexString(); - Assert.Equal("000100000002041907161020011907161025010000000102060500000003291907161120011907161125020000000B153D330000001F", hex); + Assert.Equal("0001000000020419071610200119071610250100000000000000010206050000000329190716112001190716112502000000000000000B153D330000001F", hex); } [Fact] public void Test2() { - var jT808_0x1205 = JT808Serializer.Deserialize("000100000002041907161020011907161025010000000102060500000003291907161120011907161125020000000B153D330000001F".ToHexBytes()); + var jT808_0x1205 = JT808Serializer.Deserialize("0001000000020419071610200119071610250100000000000000010206050000000329190716112001190716112502000000000000000B153D330000001F".ToHexBytes()); Assert.Equal(1, jT808_0x1205.MsgNum); Assert.Equal(2u, jT808_0x1205.AVResouceTotal); diff --git a/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x9205Test.cs b/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x9205Test.cs index df7cdc4..e49b8a8 100644 --- a/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x9205Test.cs +++ b/src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x9205Test.cs @@ -48,13 +48,13 @@ namespace JT808.Protocol.Extensions.JT1078.Test StreamType =5 }; var hex = JT808Serializer.Serialize(jT808_0x9205).ToHexString(); - Assert.Equal("0319071610101019071610101100000001020504", hex); + Assert.Equal("031907161010101907161010110000000000000001020504", hex); } [Fact] public void Test2() { - var jT808_0x9205 = JT808Serializer.Deserialize("0319071610101019071610101100000001020504".ToHexBytes()); + var jT808_0x9205 = JT808Serializer.Deserialize("031907161010101907161010110000000000000001020504".ToHexBytes()); Assert.Equal(1u, jT808_0x9205.AlarmFlag); Assert.Equal(2, jT808_0x9205.AVResourceType); Assert.Equal(Convert.ToDateTime("2019-07-16 10:10:10"), jT808_0x9205.BeginTime); @@ -66,7 +66,7 @@ namespace JT808.Protocol.Extensions.JT1078.Test [Fact] public void Test3() { - var jT808_0x9205 = JT808Serializer.Analyze("0319071610101019071610101100000001020504".ToHexBytes()); + var jT808_0x9205 = JT808Serializer.Analyze("031907161010101907161010110000000000000001020504".ToHexBytes()); } } } \ No newline at end of file diff --git a/src/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.csproj b/src/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.csproj index 146bba2..3cb69e9 100644 --- a/src/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.csproj +++ b/src/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.csproj @@ -15,7 +15,7 @@ https://github.com/SmallChi/JT1078/blob/master/LICENSE https://github.com/SmallChi/JT1078/blob/master/LICENSE false - 2.2.9 + 2.2.9.1 LICENSE diff --git a/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs b/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs index f0fd2cc..9dec3df 100644 --- a/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs +++ b/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs @@ -28,7 +28,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// /// 报警标志 /// - public UInt64 AlarmFlag { get; set; } + public ulong AlarmFlag { get; set; } /// /// 音视频资源类型 /// diff --git a/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9205.cs b/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9205.cs index 7a5a31a..a88b5f1 100644 --- a/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9205.cs +++ b/src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9205.cs @@ -30,7 +30,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody /// /// 报警标志 /// - public UInt64 AlarmFlag { get; set; } + public ulong AlarmFlag { get; set; } /// /// 音视频资源类型 /// @@ -152,7 +152,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody jT808_0x9205.LogicChannelNo = reader.ReadByte(); jT808_0x9205.BeginTime = reader.ReadDateTime6(); jT808_0x9205.EndTime = reader.ReadDateTime6(); - jT808_0x9205.AlarmFlag = reader.ReadUInt32(); + jT808_0x9205.AlarmFlag = reader.ReadUInt64(); jT808_0x9205.AVResourceType = reader.ReadByte(); jT808_0x9205.StreamType = reader.ReadByte(); jT808_0x9205.MemoryType = reader.ReadByte();