From 3dc24b3e6ba3ee432da85895e9782a66f5e2334f Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Fri, 8 Oct 2021 10:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81809=E7=9A=842019=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E8=A7=A3=E6=9E=90808=E7=9A=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/JTTools/JTTools.csproj    |  6 +++---
 src/JTTools/Pages/Index.razor |  1 +
 src/JTTools/Program.cs        | 12 +++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/JTTools/JTTools.csproj b/src/JTTools/JTTools.csproj
index b7514a7..0f7e31a 100644
--- a/src/JTTools/JTTools.csproj
+++ b/src/JTTools/JTTools.csproj
@@ -11,11 +11,11 @@
     <PackageReference Include="JT1078" Version="1.1.0" />
     <PackageReference Include="JT808" Version="2.4.4" />
     <PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.4.4" />
-    <PackageReference Include="JT808.Protocol.Extensions.Streamax" Version="0.3.0" />
+    <PackageReference Include="JT808.Protocol.Extensions.Streamax" Version="0.3.2" />
     <PackageReference Include="JT808.Protocol.Extensions.SuBiao" Version="2.4.4" />
     <PackageReference Include="JT808.Protocol.Extensions.YueBiao" Version="2.4.4" />
-    <PackageReference Include="JT809" Version="2.2.0" />
-    <PackageReference Include="JT809.Protocol.Extensions.JT1078" Version="2.2.0" />
+    <PackageReference Include="JT809" Version="2.2.1-preview1" />
+    <PackageReference Include="JT809.Protocol.Extensions.JT1078" Version="2.2.1-preview1" />
     <PackageReference Include="JTActiveSafety" Version="1.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.10" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/src/JTTools/Pages/Index.razor b/src/JTTools/Pages/Index.razor
index 14b686e..c8ede37 100644
--- a/src/JTTools/Pages/Index.razor
+++ b/src/JTTools/Pages/Index.razor
@@ -15,6 +15,7 @@
         <li>支持808的2011版本分析工具</li>
         <li>支持808多包解析</li>
         <li>支持808私有协议扩展库</li>
+        <li>支持809的2019版本解析808的车辆定位信息包</li>
     </ul>
 </Paragraph>
 <style>
diff --git a/src/JTTools/Program.cs b/src/JTTools/Program.cs
index e4635b0..edbe4c2 100644
--- a/src/JTTools/Program.cs
+++ b/src/JTTools/Program.cs
@@ -14,6 +14,9 @@ using Newtonsoft.Json.Serialization;
 using JTTools.Configs;
 using Newtonsoft.Json;
 using JT808.Protocol.Extensions.Streamax;
+using System.Text.Json;
+using JT808.Protocol.MessagePack;
+using JT808.Protocol.MessageBody;
 
 namespace JTTools
 {
@@ -80,8 +83,15 @@ namespace JTTools
                             .AddJT1078Configure();
                     services.AddJT809Configure(new JT809_2011_Config())
                             .AddJT1078Configure();
+                    IServiceProvider serviceProvider = services.BuildServiceProvider();
                     services.AddJT809Configure(new JT809_2019_Config())
-                            .AddJT1078Configure();
+                            .AddJT1078Configure()
+                            .AddJT809_JT808AnalyzeCallback(0x0200,(bytes, writer, jT809Config)=> {
+                                IJT808Config jT808Config = serviceProvider.GetRequiredService<IJT808Config>();
+                                JT808MessagePackReader jT808MessagePackReader = new JT808MessagePackReader(bytes);
+                                JT808.Protocol.Extensions.JT808AnalyzeExtensions.Analyze(JT808.Protocol.JT808ConfigExtensions.GetMessagePackFormatter<JT808_0x0200>(jT808Config),
+                                    ref jT808MessagePackReader, writer, jT808Config);
+                            });
                     services.AddJT808Configure(new JT808_Streamax_Config())
                             .AddStreamaxConfigure();
                 })