Browse Source

修复bug9206消息,alarmflag从32改为64位

tags/v2.4.1
waterliu99 3 years ago
parent
commit
349326a8d4
2 changed files with 9 additions and 9 deletions
  1. +3
    -3
      src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078.Test/JT808_0x9206Test.cs
  2. +6
    -6
      src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9206.cs

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

@@ -58,13 +58,13 @@ namespace JT808.Protocol.Extensions.JT1078.Test
UserNameLength=2 UserNameLength=2
}; };
var hex = JT808Serializer.Serialize(jT808_0x9206).ToHexString(); var hex = JT808Serializer.Serialize(jT808_0x9206).ToHexString();
Assert.Equal("093132372E302E302E31032802746B0631323334353608443A2F2F31313132031907161010101907161010110000000102050407", hex);
Assert.Equal("093132372E302E302E31032802746B0631323334353608443A2F2F3131313203190716101010190716101011000000000000000102050407", hex);
} }


[Fact] [Fact]
public void Test2() public void Test2()
{ {
var jT808_0x9206 = JT808Serializer.Deserialize<JT808_0x9206>("093132372E302E302E31032802746B0631323334353608443A2F2F31313132031907161010101907161010110000000102050407".ToHexBytes());
var jT808_0x9206 = JT808Serializer.Deserialize<JT808_0x9206>("093132372E302E302E31032802746B0631323334353608443A2F2F3131313203190716101010190716101011000000000000000102050407".ToHexBytes());
Assert.Equal(1u, jT808_0x9206.AlarmFlag); Assert.Equal(1u, jT808_0x9206.AlarmFlag);
Assert.Equal(2, jT808_0x9206.MediaType); Assert.Equal(2, jT808_0x9206.MediaType);
Assert.Equal(Convert.ToDateTime("2019-07-16 10:10:10"), jT808_0x9206.BeginTime); Assert.Equal(Convert.ToDateTime("2019-07-16 10:10:10"), jT808_0x9206.BeginTime);
@@ -86,7 +86,7 @@ namespace JT808.Protocol.Extensions.JT1078.Test
[Fact] [Fact]
public void Test3() public void Test3()
{ {
var jT808_0x9206 = JT808Serializer.Analyze<JT808_0x9206>("093132372E302E302E31032802746B0631323334353608443A2F2F31313132031907161010101907161010110000000102050407".ToHexBytes());
var jT808_0x9206 = JT808Serializer.Analyze<JT808_0x9206>("093132372E302E302E31032802746B0631323334353608443A2F2F3131313203190716101010190716101011000000000000000102050407".ToHexBytes());
} }
} }
} }

+ 6
- 6
src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078/MessageBody/JT808_0x9206.cs View File

@@ -58,17 +58,17 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody
/// </summary> /// </summary>
public byte ChannelNo { get; set; } public byte ChannelNo { get; set; }
/// <summary> /// <summary>
/// 起始时间
/// 起始时间 BCD[6]
/// </summary> /// </summary>
public DateTime BeginTime { get; set; } public DateTime BeginTime { get; set; }
/// <summary> /// <summary>
/// 结束时间
/// 结束时间 BCD[6]
/// </summary> /// </summary>
public DateTime EndTime { get; set; } public DateTime EndTime { get; set; }
/// <summary> /// <summary>
/// 报警标志 /// 报警标志
/// </summary> /// </summary>
public uint AlarmFlag { get; set; }
public UInt64 AlarmFlag { get; set; }
/// <summary> /// <summary>
/// 音视频资源类型 /// 音视频资源类型
/// </summary> /// </summary>
@@ -119,7 +119,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody
writer.WriteString($"[{value.BeginTime.ToString("yyMMddHHmmss")}]起始时间", value.BeginTime.ToString("yyyy-MM-dd HH:mm:ss")); writer.WriteString($"[{value.BeginTime.ToString("yyMMddHHmmss")}]起始时间", value.BeginTime.ToString("yyyy-MM-dd HH:mm:ss"));
value.EndTime = reader.ReadDateTime6(); value.EndTime = reader.ReadDateTime6();
writer.WriteString($"[{value.EndTime.ToString("yyMMddHHmmss")}]起始时间", value.EndTime.ToString("yyyy-MM-dd HH:mm:ss")); writer.WriteString($"[{value.EndTime.ToString("yyMMddHHmmss")}]起始时间", value.EndTime.ToString("yyyy-MM-dd HH:mm:ss"));
value.AlarmFlag = reader.ReadUInt32();
value.AlarmFlag = reader.ReadUInt64();
writer.WriteNumber($"[{value.AlarmFlag.ReadNumber()}]报警标志", value.AlarmFlag); writer.WriteNumber($"[{value.AlarmFlag.ReadNumber()}]报警标志", value.AlarmFlag);
value.MediaType = reader.ReadByte(); value.MediaType = reader.ReadByte();
writer.WriteString($"[{value.MediaType.ReadNumber()}]音视频类型", AVResourceTypeDisplay(value.MediaType)); writer.WriteString($"[{value.MediaType.ReadNumber()}]音视频类型", AVResourceTypeDisplay(value.MediaType));
@@ -207,7 +207,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody
jT808_0x9206.ChannelNo = reader.ReadByte(); jT808_0x9206.ChannelNo = reader.ReadByte();
jT808_0x9206.BeginTime = reader.ReadDateTime6(); jT808_0x9206.BeginTime = reader.ReadDateTime6();
jT808_0x9206.EndTime = reader.ReadDateTime6(); jT808_0x9206.EndTime = reader.ReadDateTime6();
jT808_0x9206.AlarmFlag = reader.ReadUInt32();
jT808_0x9206.AlarmFlag = reader.ReadUInt64();
jT808_0x9206.MediaType = reader.ReadByte(); jT808_0x9206.MediaType = reader.ReadByte();
jT808_0x9206.StreamType = reader.ReadByte(); jT808_0x9206.StreamType = reader.ReadByte();
jT808_0x9206.MemoryPositon = reader.ReadByte(); jT808_0x9206.MemoryPositon = reader.ReadByte();
@@ -233,7 +233,7 @@ namespace JT808.Protocol.Extensions.JT1078.MessageBody
writer.WriteByte(value.ChannelNo); writer.WriteByte(value.ChannelNo);
writer.WriteDateTime6(value.BeginTime); writer.WriteDateTime6(value.BeginTime);
writer.WriteDateTime6(value.EndTime); writer.WriteDateTime6(value.EndTime);
writer.WriteUInt32(value.AlarmFlag);
writer.WriteUInt64(value.AlarmFlag);
writer.WriteByte(value.MediaType); writer.WriteByte(value.MediaType);
writer.WriteByte(value.StreamType); writer.WriteByte(value.StreamType);
writer.WriteByte(value.MemoryPositon); writer.WriteByte(value.MemoryPositon);


Loading…
Cancel
Save