Browse Source

v2.2.9.1 1078扩展808协议

修复808查询资源列表和终端上传音视频资源列表的报警标志数据类型
tags/v1.1.0
SmallChi(Koike) 5 years ago
parent
commit
d37ec7b677
5 changed files with 9 additions and 9 deletions
  1. +2
    -2
      src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x1205Test.cs
  2. +3
    -3
      src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x9205Test.cs
  3. +1
    -1
      src/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.csproj
  4. +1
    -1
      src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs
  5. +2
    -2
      src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9205.cs

+ 2
- 2
src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x1205Test.cs View File

@@ -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<JT808_0x1205>("000100000002041907161020011907161025010000000102060500000003291907161120011907161125020000000B153D330000001F".ToHexBytes());
var jT808_0x1205 = JT808Serializer.Deserialize<JT808_0x1205>("0001000000020419071610200119071610250100000000000000010206050000000329190716112001190716112502000000000000000B153D330000001F".ToHexBytes());
Assert.Equal(1, jT808_0x1205.MsgNum);
Assert.Equal(2u, jT808_0x1205.AVResouceTotal);



+ 3
- 3
src/JT808.Protocol.Extensions.JT1078.Test/JT808_0x9205Test.cs View File

@@ -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<JT808_0x9205>("0319071610101019071610101100000001020504".ToHexBytes());
var jT808_0x9205 = JT808Serializer.Deserialize<JT808_0x9205>("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<JT808_0x9205>("0319071610101019071610101100000001020504".ToHexBytes());
var jT808_0x9205 = JT808Serializer.Analyze<JT808_0x9205>("031907161010101907161010110000000000000001020504".ToHexBytes());
}
}
}

+ 1
- 1
src/JT808.Protocol.Extensions.JT1078/JT808.Protocol.Extensions.JT1078.csproj View File

@@ -15,7 +15,7 @@
<licenseUrl>https://github.com/SmallChi/JT1078/blob/master/LICENSE</licenseUrl>
<license>https://github.com/SmallChi/JT1078/blob/master/LICENSE</license>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Version>2.2.9</Version>
<Version>2.2.9.1</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>



+ 1
- 1
src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x1205_AVResouce.cs View File

@@ -28,7 +28,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody
/// <summary>
/// 报警标志
/// </summary>
public UInt64 AlarmFlag { get; set; }
public ulong AlarmFlag { get; set; }
/// <summary>
/// 音视频资源类型
/// </summary>


+ 2
- 2
src/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9205.cs View File

@@ -30,7 +30,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody
/// <summary>
/// 报警标志
/// </summary>
public UInt64 AlarmFlag { get; set; }
public ulong AlarmFlag { get; set; }
/// <summary>
/// 音视频资源类型
/// </summary>
@@ -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();


Loading…
Cancel
Save