From d37ec7b6778a8886725caf4d09f8a1972b219219 Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Fri, 22 May 2020 09:28:30 +0800
Subject: [PATCH] =?UTF-8?q?v2.2.9.1=201078=E6=89=A9=E5=B1=95808=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=20=E4=BF=AE=E5=A4=8D808=E6=9F=A5=E8=AF=A2=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=88=97=E8=A1=A8=E5=92=8C=E7=BB=88=E7=AB=AF=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E9=9F=B3=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=8A=A5=E8=AD=A6=E6=A0=87=E5=BF=97=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JT808_0x1205Test.cs                                     | 4 ++--
 .../JT808_0x9205Test.cs                                     | 6 +++---
 .../JT808.Protocol.Extensions.JT1078.csproj                 | 2 +-
 .../MessageBody/JT808_0x1205_AVResouce.cs                   | 2 +-
 .../MessageBody/JT808_0x9205.cs                             | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

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<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);
 
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<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());
         }
     }
 }
\ 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 @@
     <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>
 
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
         /// <summary>
         /// 报警标志
         /// </summary>
-        public UInt64 AlarmFlag { get; set; }
+        public ulong AlarmFlag { get; set; }
         /// <summary>
         /// 音视频资源类型
         /// </summary>
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
         /// <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();