From adbe731d9a89324aa67f16f49e9978581ccd0d2a Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Fri, 3 Apr 2020 13:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=9B=BD=E6=A0=87=E5=92=8C1078?=
 =?UTF-8?q?=E3=80=81=E4=B8=BB=E5=8A=A8=E5=AE=89=E5=85=A8=E5=88=86=E5=BC=80?=
 =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E9=81=BF=E5=85=8D=E5=8D=8F=E8=AE=AEId?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/JTTools/Configs/JT808_JT1078_Config.cs    | 13 ++++++
 .../Configs/JT808_JTActiveSafety_Config.cs    | 13 ++++++
 src/JTTools/Pages/JT808Analyze.razor          | 45 ++++++++++++-------
 src/JTTools/Program.cs                        | 15 +++----
 4 files changed, 60 insertions(+), 26 deletions(-)
 create mode 100644 src/JTTools/Configs/JT808_JT1078_Config.cs
 create mode 100644 src/JTTools/Configs/JT808_JTActiveSafety_Config.cs

diff --git a/src/JTTools/Configs/JT808_JT1078_Config.cs b/src/JTTools/Configs/JT808_JT1078_Config.cs
new file mode 100644
index 0000000..a91790f
--- /dev/null
+++ b/src/JTTools/Configs/JT808_JT1078_Config.cs
@@ -0,0 +1,13 @@
+using JT808.Protocol.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace JTTools.Configs
+{
+    public class JT808_JT1078_Config : GlobalConfigBase
+    {
+        public override string ConfigId { get; protected set; } = "JT808_JT1078_Config";
+    }
+}
diff --git a/src/JTTools/Configs/JT808_JTActiveSafety_Config.cs b/src/JTTools/Configs/JT808_JTActiveSafety_Config.cs
new file mode 100644
index 0000000..64994db
--- /dev/null
+++ b/src/JTTools/Configs/JT808_JTActiveSafety_Config.cs
@@ -0,0 +1,13 @@
+using JT808.Protocol.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace JTTools.Configs
+{
+    public class JT808_JTActiveSafety_Config : GlobalConfigBase
+    {
+        public override string ConfigId { get; protected set; } = "JT808_JTActiveSafety_Config";
+    }
+}
diff --git a/src/JTTools/Pages/JT808Analyze.razor b/src/JTTools/Pages/JT808Analyze.razor
index 0c666bb..b52a0e7 100644
--- a/src/JTTools/Pages/JT808Analyze.razor
+++ b/src/JTTools/Pages/JT808Analyze.razor
@@ -3,17 +3,20 @@
 @using JT808.Protocol;
 @using JT808.Protocol.Extensions;
 @using Newtonsoft.Json;
-@inject IJT808Config  Config
-
+@using JTTools.Configs;
+@inject IJT808Config  config
+@inject JT808_JT1078_Config  jT808_JT1078_Config
+@inject JT808_JTActiveSafety_Config  jT808_JTActiveSafety_Config
 <h3>jt808analyze</h3>
 
-@*<select class="btn-success" onchange=@DoStuff>
+<select class="btn-success" @onchange="@OnSelectProtocolType">
     <option value="JT808">国标</option>
     <option value="JT808_JT1078">国标扩展JT1078</option>
     <option value="JT808_JTAS">国标扩展主动安全(苏标)</option>
-</select>*@
+</select>
 
 <p>@protocolType</p>
+
 <p>Hex: @HexData</p>
 
 <button class="btn btn-primary" @onclick="Query">分析</button>
@@ -22,19 +25,11 @@
     @Json
 </div>
 
-@functions {
-    string selectedString = "JT808";
-
-    void DoStuff(ChangeEventArgs e)
-    {
-        selectedString = e.Value.ToString();
-        Console.WriteLine("It is definitely: " + selectedString);
-    }
-}
-
 @code {
 
     private JT808Serializer Serializer;
+    private JT808Serializer JTAS_Serializer;
+    private JT808Serializer JT1078Serializer;
 
     string protocolType = "JT808";
 
@@ -42,14 +37,32 @@
 
     private string Json;
 
+    private void OnSelectProtocolType(ChangeEventArgs e)
+    {
+        protocolType = e.Value.ToString();
+    }
+
     protected override void OnInitialized()
     {
-        Serializer = Config.GetSerializer();
+        Serializer = config.GetSerializer();
+        JT1078Serializer = jT808_JT1078_Config.GetSerializer();
+        JTAS_Serializer = jT808_JTActiveSafety_Config.GetSerializer();
     }
 
     private void Query()
     {
         var data = HexData.ToHexBytes();
-        Json = Serializer.Analyze(data);
+        switch (protocolType)
+        {
+            case "JT808":
+                Json = Serializer.Analyze(data);
+                break;
+            case "JT808_JT1078":
+                Json = JT1078Serializer.Analyze(data);
+                break;
+            case "JT808_JTAS":
+                Json = JTAS_Serializer.Analyze(data);
+                break;
+        }
     }
 }
diff --git a/src/JTTools/Program.cs b/src/JTTools/Program.cs
index d96cf7d..4454260 100644
--- a/src/JTTools/Program.cs
+++ b/src/JTTools/Program.cs
@@ -1,23 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using JT808.Protocol;
 using JT808.Protocol.Extensions.JT1078;
 using JT808.Protocol.Extensions.JTActiveSafety;
 using JT809.Protocol;
 using JT809.Protocol.Extensions.JT1078;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Serialization;
+using JTTools.Configs;
 
 namespace JTTools
 {
@@ -90,9 +83,11 @@ namespace JTTools
                 })
                 .ConfigureServices(services =>
                 {
-                    services.AddJT808Configure()
-                            .AddJT1078Configure()
+                    services.AddJT808Configure();
+                    services.AddJT808Configure(new JT808_JTActiveSafety_Config())
                             .AddJTActiveSafetyConfigure();
+                    services.AddJT808Configure(new JT808_JT1078_Config())
+                            .AddJT1078Configure();
                     services.AddJT809Configure()
                             .AddJT1078Configure();
                 })