Merge pull request #1 from SmallChi/master

同步

src/JTTools.Bak.Test/ByteArrayHexTextJsonConverterTest.cs

@@ -1,69 +0,0 @@
-using JTTools.JsonConvert;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json;
-using Xunit;
-
-namespace JTTools.Test
-{
-    public class ByteArrayHexTextJsonConverterTest
-    {
-        [Fact]
-        public void Test1()
-        {
-            var options = new JsonSerializerOptions();
-            options.Converters.Add(new ByteArrayHexTextJsonConverter());
-            string jsonSerialized = JsonSerializer.Serialize(new byte[] { 0xA1,0x2D,0xF6}, options);
-            Assert.Equal("\"A1 2D F6\"", jsonSerialized);
-        }
-
-        [Fact]
-        public void Test2()
-        {
-            string json = "\"A1 2D,F6\"";
-            var options = new JsonSerializerOptions();
-            options.Converters.Add(new ByteArrayHexTextJsonConverter());
-            byte[] arr = JsonSerializer.Deserialize<byte[]>(json, options);
-            Assert.Equal(0xA1, arr[0]);
-            Assert.Equal(0x2D, arr[1]);
-            Assert.Equal(0xF6, arr[2]);
-        }
-
-        [Fact]
-        public void Test3()
-        {
-            string json = "{\"Array1\":\"A1 2D,F6\"}";
-            var options = new JsonSerializerOptions();
-            options.Converters.Add(new ByteArrayHexTextJsonConverter());
-            ClassWithProperty obj = JsonSerializer.Deserialize<ClassWithProperty>(json, options);
-            Assert.Equal(0xA1, obj.Array1[0]);
-            Assert.Equal(0x2D, obj.Array1[1]);
-            Assert.Equal(0xF6, obj.Array1[2]);
-        }
-
-
-        [Fact]
-        public void Test4()
-        {
-            string json = "{\"Array1\":\"A1 2D,O6\"}";
-            var options = new JsonSerializerOptions();
-            options.Converters.Add(new ByteArrayHexTextJsonConverter());
-            try
-            {
-                ClassWithProperty obj = JsonSerializer.Deserialize<ClassWithProperty>(json, options);
-            }
-            catch (System.FormatException ex)
-            {
-                Assert.Equal("Could not find any recognizable digits.", ex.Message);
-            }
-        }
-
-
-        private class ClassWithProperty
-        {
-            public byte[] Array1 { get; set; }
-        }
-
-    }
-}

src/JTTools.Bak.Test/JTTools.Test.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\JTTools\JTTools.csproj" />
-  </ItemGroup>
-
-</Project>

src/JTTools.Bak.Test/JTToolsControllerTest.cs

@@ -1,55 +0,0 @@
-using JT808.Protocol;
-using JT808.Protocol.Extensions.JT1078;
-using JT809.Protocol;
-using JT809.Protocol.Configs;
-using JT809.Protocol.Enums;
-using JT809.Protocol.Extensions.JT1078;
-using JT809.Protocol.MessageBody;
-using JTTools.Controllers;
-using JTTools.Dtos;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using Xunit;
-
-namespace JTTools.Test
-{
-    public class JTToolsControllerTest
-    {
-        IServiceCollection serviceDescriptors = new ServiceCollection();
-
-        private readonly JTToolsController jTToolsController;
-
-        public JTToolsControllerTest()
-        {
-            serviceDescriptors.AddJT808Configure()
-                              .AddJT1078Configure();
-            serviceDescriptors.AddJT809Configure()
-                              .AddJT1078Configure();
-            serviceDescriptors.AddSingleton<JTToolsController>();
-            IServiceProvider ServiceProvider = serviceDescriptors.BuildServiceProvider();
-            jTToolsController = ServiceProvider.GetRequiredService<JTToolsController>();
-        }
-
-        [Fact]
-        public void Parse809Test1()
-        {
-            var result=jTToolsController.Parse809(new JT809RequestDto()
-            {
-                 IsEncrypt=true,
-                 EncryptOptions=new JT809EncryptOptions
-                 {
-                      IA1= 96135846,
-                      IC1= 30000000,
-                      M1 = 10000079
-                 },
-                 HexData= "5B 00 00 00 73 00 00 17 3B 12 00 02 A2 49 7F 01 02 0F 01 00 00 00 01 AC 84 2A 2C 11 20 47 CA 38 E1 DD 75 BE EE F8 03 D5 7A B8 17 C7 C0 43 3C D0 85 6D 94 EA E0 00 5A 01 23 68 A6 D6 DB A1 0B 49 F6 CB 74 C6 61 F6 D6 6A 80 C4 D2 B1 10 40 AE 48 7E 96 3A 8D 0F ED 7A 1B 2D 82 00 41 B9 BE 0A E7 8C D6 AB 7D B7 79 2E 8A 7F 17 AE B8 0A 9F AE AA A2 75 A4 5D"
-            });
-            JT809Package package = (JT809Package)result.Value.Data;
-            JT809_0x1200 jT809_0X1200 = (JT809_0x1200)package.Bodies;
-            Assert.Equal(44190079u, package.Header.MsgGNSSCENTERID);
-            Assert.Equal(30116, package.CRCCode);
-            Assert.Equal("ÔÁSEB408²â", jT809_0X1200.VehicleNo);
-            Assert.Equal(JT809VehicleColorType.»ÆÉ«, jT809_0X1200.VehicleColor);
-        }
-    }
-}

src/JTTools.Bak/Controllers/JTToolsController.cs

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using JTTools.Dtos;
-using Microsoft.AspNetCore.Mvc;
-using JT1078.Protocol;
-using JT808.Protocol;
-using JT809.Protocol;
-using JT809.Protocol.Exceptions;
-using JT808.Protocol.Extensions;
-using JT808.Protocol.Exceptions;
-using Microsoft.AspNetCore.Cors;
-using Newtonsoft.Json;
-using JT808.Protocol.Interfaces;
-using JT809.Protocol.Interfaces;
-using Microsoft.AspNetCore.Authorization;
-
-namespace JTTools.Controllers
-{
-    [Route("api/JTTools")]
-    [ApiController]
-    [EnableCors("Domain")]
-    public class JTToolsController : ControllerBase
-    {
-        private readonly IJT809Config jT809Config;
-        private readonly IJT808Config jT808Config;
-        private readonly JT808Serializer jT808Serializer;
-        private readonly JT809Serializer jT809Serializer;
-
-        public JTToolsController(
-            IJT809Config jT809Config, 
-            IJT808Config jT808Config)
-        {
-            this.jT809Config = jT809Config;
-            this.jT808Config = jT808Config;
-            jT808Serializer = jT808Config.GetSerializer();
-            jT809Serializer = jT809Config.GetSerializer();
-        }
-
-        [Route("Parse808")]
-        [HttpPost]
-        public ActionResult<JTResultDto> Parse808([FromBody]JTRequestDto parameter)
-        {
-            JTResultDto jTResultDto = new JTResultDto();
-            try
-            {
-                jTResultDto.Code = 200;
-                jTResultDto.Data =jT808Serializer.Deserialize(parameter.HexData.ToHexBytes());
-            }
-            catch(JT808Exception ex)
-            {
-                jTResultDto.Code = 500;
-                jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}";
-            }
-            catch (Exception ex)
-            {
-                jTResultDto.Code = 500;
-                jTResultDto.Message = ex.Message;
-            }
-            return jTResultDto;
-        }
-
-        [Route("Analyze808")]
-        [HttpPost]
-        public ActionResult<JTResultDto> Analyze808([FromBody]JTRequestDto parameter)
-        {
-            JTResultDto jTResultDto = new JTResultDto();
-            try
-            {
-                jTResultDto.Code = 200;
-                jTResultDto.Data = jT808Serializer.Analyze(parameter.HexData.ToHexBytes());
-            }
-            catch (JT808Exception ex)
-            {
-                jTResultDto.Code = 500;
-                jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}";
-            }
-            catch (Exception ex)
-            {
-                jTResultDto.Code = 500;
-                jTResultDto.Message = ex.Message;
-            }
-            return jTResultDto;
-        }
-
-        [Route("Parse809")]
-        [HttpPost]
-        public ActionResult<JTResultDto> Parse809([FromBody]JT809RequestDto parameter)
-        {
-            JTResultDto jTResultDto = new JTResultDto();
-            try
-            {
-                if (parameter.IsEncrypt)
-                {
-                    IJT809Config jt809ConfigInternal = new JT809Config(Guid.NewGuid().ToString());
-                    jt809ConfigInternal.EncryptOptions = parameter.EncryptOptions;
-                    JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal);
-                    jTResultDto.Data = jT809SerializerInternal.Deserialize(parameter.HexData.ToHexBytes());
-                }
-                else
-                {
-                    jTResultDto.Data = jT809Serializer.Deserialize(parameter.HexData.ToHexBytes());
-                }
-                jTResultDto.Code = 200;
-
-            }
-            catch (JT809Exception ex)
-            {
-                jTResultDto.Code = 500;
-                jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}";
-            }
-            catch (Exception ex)
-            {
-                jTResultDto.Code = 500;
-                jTResultDto.Message = ex.Message;
-            }
-            return jTResultDto;
-        }
-
-        [Route("Parse1078")]
-        [HttpPost]
-        public ActionResult<JTResultDto> Parse1078([FromBody]JTRequestDto parameter)
-        {
-            JTResultDto jTResultDto = new JTResultDto();
-            try
-            {
-                jTResultDto.Code = 200;
-                jTResultDto.Data = JT1078Serializer.Deserialize(parameter.HexData.ToHexBytes());
-            }
-            catch (Exception ex)
-            {
-                jTResultDto.Code = 500;
-                jTResultDto.Message = ex.Message;
-            }
-            return jTResultDto;
-        }
-    }
-
-    class JT809Config :JT809GlobalConfigBase
-    {
-        public JT809Config(string configId)
-        {
-            ConfigId = configId;
-        }
-
-        public override string ConfigId { get; }
-    }
-}

src/JTTools.Bak/Dtos/JT809RequestDto.cs

@@ -1,14 +0,0 @@
-using JT809.Protocol.Configs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace JTTools.Dtos
-{
-    public class JT809RequestDto: JTRequestDto
-    {
-        public bool IsEncrypt { get; set; } = false;
-        public JT809EncryptOptions EncryptOptions { get; set; }
-    }
-}

src/JTTools.Bak/Dtos/JTRequestDto.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace JTTools.Dtos
-{
-    public class JTRequestDto
-    {
-        public string HexData { get; set; }
-        public bool Skip { get; set; }
-        public bool Custom { get; set; }
-    }
-}

src/JTTools.Bak/Dtos/JTResultDto.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace JTTools.Dtos
-{
-    public class JTResultDto
-    {
-        public int Code { get; set; }
-        public string Message { get; set; }
-        public object Data { get; set; }
-    }
-}

src/JTTools.Bak/JTTools.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Remove="appsettings.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--<PackageReference Include="JT1078" Version="1.0.0" />-->
-    <PackageReference Include="JT1078" Version="1.0.2" />
-    <PackageReference Include="JT808" Version="2.2.9" />
-    <PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.2.7" />
-    <PackageReference Include="JT808.Protocol.Extensions.JTActiveSafety" Version="1.0.2" />
-    <PackageReference Include="JT809" Version="2.1.3" />
-    <PackageReference Include="JT809.Protocol.Extensions.JT1078" Version="2.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>

src/JTTools.Bak/JsonConvert/ByteArrayHexConverter.cs

@@ -1,29 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JTTools
-{
-    public class ByteArrayHexConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType) => objectType == typeof(byte[]);
-
-        public override bool CanRead => false;
-        public override bool CanWrite => true;
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) => throw new NotImplementedException();
-
-        private readonly string _separator;
-
-        public ByteArrayHexConverter(string separator = " ") => _separator = separator;
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var hexString = string.Join(_separator, ((byte[])value).Select(p => p.ToString("X2")));
-            writer.WriteValue(hexString);
-        }
-    }
-}

src/JTTools.Bak/JsonConvert/ByteArrayHexTextJsonConverter.cs

@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Formatters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace JTTools.JsonConvert
-{
-    /// <summary>
-    /// 
-    /// ref:https://github.com/dotnet/corefx/blob/release/3.0/src/System.Text.Json/tests/Serialization/CustomConverterTests.Array.cs
-    /// </summary>
-    public class ByteArrayHexTextJsonConverter : JsonConverter<byte[]>
-    {
-        public override byte[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            //string hexJson = reader.get();
-            var hexJson = reader.GetString();
-            var list = new List<byte>();
-            foreach (string str in hexJson.Split(new string[] { ",", " " }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                list.Add(Convert.ToByte(str, 16));
-            }
-            return list.ToArray();
-        }
-
-        public override void Write(Utf8JsonWriter writer, byte[] value, JsonSerializerOptions options)
-        {
-            var hexString = string.Join(" ", (value).Select(p => p.ToString("X2")));
-            writer.WriteStringValue(hexString);
-        }
-    }
-}

src/JTTools.Bak/Program.cs

@@ -1,99 +0,0 @@
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using JT808.Protocol;
-using JT809.Protocol;
-using JT808.Protocol.Extensions.JT1078;
-using JT808.Protocol.Extensions.JTActiveSafety;
-using JT809.Protocol.Extensions.JT1078;
-using Newtonsoft.Json.Serialization;
-using System;
-using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using JTTools.JsonConvert;
-
-namespace JTTools
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.ConfigureServices((hostingContext, services) =>
-                    {
-                        services.AddRazorPages();
-                        services.AddServerSideBlazor();
-                        services.AddControllers()
-                                //Microsoft.AspNetCore.Mvc.NewtonsoftJson
-                                .AddNewtonsoftJson(jsonOptions =>
-                                {
-                                    jsonOptions.SerializerSettings.Converters.Add(new ByteArrayHexConverter());
-                                    jsonOptions.SerializerSettings.ContractResolver = new DefaultContractResolver();
-                                    //jsonOptions.SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented;
-                                })
-                                //.AddJsonOptions(jsonOptions =>
-                                //{
-                                //    jsonOptions.JsonSerializerOptions.MaxDepth = 64;
-
-                                //    jsonOptions.JsonSerializerOptions.Converters.Add(new ByteArrayHexTextJsonConverter());
-                                //})
-                                ;
-                        services.AddCors(options =>
-                                     options.AddPolicy("Domain", builder =>
-                                     builder.WithOrigins(hostingContext.Configuration.GetSection("AllowedOrigins").Value.Split(","))
-                                     .AllowAnyMethod()
-                                     .AllowAnyHeader()
-                                     .AllowAnyOrigin()));
-
-                    })
-                    .ConfigureKestrel(ksOptions =>
-                    {
-                        ksOptions.ListenAnyIP(18888);
-                    })
-                    .ConfigureLogging((context, logging) => {
-                        //if (Environment.OSVersion.Platform == PlatformID.Unix)
-                        //{
-                        //    NLog.LogManager.LoadConfiguration("Configs/nlog.unix.config");
-                        //}
-                        //else
-                        //{
-                        //    NLog.LogManager.LoadConfiguration("Configs/nlog.win.config");
-                        //}
-                        //logging.AddNLog(new NLogProviderOptions { CaptureMessageTemplates = true, CaptureMessageProperties = true });
-                        //logging.SetMinimumLevel(LogLevel.Trace);
-                    })
-                    .ConfigureAppConfiguration((hostingContext, config) =>
-                    {
-                        config.SetBasePath(AppDomain.CurrentDomain.BaseDirectory);
-                        config.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
-                    })
-                    .Configure(app => {
-                        app.UseRouting();
-                        app.UseCors("Domain");
-                        app.UseEndpoints(endpoints =>
-                        {
-                            endpoints.MapControllers();
-                            endpoints.MapBlazorHub();
-                            endpoints.MapFallbackToPage("/_Host");
-                        });
-                    });
-                })
-                .ConfigureServices(services => 
-                {
-                    services.AddJT808Configure()
-                            .AddJT1078Configure()
-                            .AddJTActiveSafetyConfigure();
-                    services.AddJT809Configure()
-                            .AddJT1078Configure();
-                })
-                .Build()
-                .Run();
-        }
-    }
-}

src/JTTools.Bak/appsettings.Development.json

@@ -1,11 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
-    }
-  },
-  "AllowedHosts": "*",
-  "AllowedOrigins": "http://jttools.smallchi.cn,https://jttools.smallchi.cn,http://localhost:8080"
-}

src/JTTools.Bak/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug" //Warning
-    }
-  },
-  "AllowedHosts": "*",
-  "AllowedOrigins": "http://jttools.smallchi.cn,https://jttools.smallchi.cn,http://localhost:8080"
-}

src/JTTools.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29123.88
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JTTools", "JTTools\JTTools.csproj", "{BBDC3FB3-B267-4BFB-803E-71287D361300}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JTTools", "JTTools\JTTools.csproj", "{295AB139-27E0-45AE-8E95-A3D0F1E4161F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BBDC3FB3-B267-4BFB-803E-71287D361300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BBDC3FB3-B267-4BFB-803E-71287D361300}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BBDC3FB3-B267-4BFB-803E-71287D361300}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BBDC3FB3-B267-4BFB-803E-71287D361300}.Release|Any CPU.Build.0 = Release|Any CPU
+		{295AB139-27E0-45AE-8E95-A3D0F1E4161F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{295AB139-27E0-45AE-8E95-A3D0F1E4161F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{295AB139-27E0-45AE-8E95-A3D0F1E4161F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{295AB139-27E0-45AE-8E95-A3D0F1E4161F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/JTTools/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "3.1.5",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

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";
+    }
+}

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";
+    }
+}

src/JTTools/Configs/JT809_2011_Config.cs

@@ -0,0 +1,13 @@
+using JT809.Protocol.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace JTTools.Configs
+{
+    public class JT809_2011_Config : JT809GlobalConfigBase
+    {
+        public override string ConfigId { get; }= "JT809_2011";
+    }
+}

src/JTTools/Configs/JT809_2019_Config.cs

@@ -0,0 +1,19 @@
+using JT809.Protocol.Enums;
+using JT809.Protocol.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace JTTools.Configs
+{
+    public class JT809_2019_Config : JT809GlobalConfigBase
+    {
+        public override string ConfigId { get; }= "JT809_2019";
+
+        public JT809_2019_Config()
+        {
+            Version = JT809Version.JTT2019;
+        }
+    }
+}

src/JTTools/Configs/JTJsonWriterOptions.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Unicode;
+using System.Threading.Tasks;
+
+namespace JTTools.Configs
+{
+    public static class JTJsonWriterOptions
+    {
+        /// <summary>
+        /// 汉字编码
+        /// </summary>
+        public readonly static JsonWriterOptions Instance = new System.Text.Json.JsonWriterOptions
+        {
+            Indented = true,
+            Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+        };  
+    }
+}

src/JTTools/Data/WeatherForecast.cs

@@ -1,15 +0,0 @@
-using System;
-
-namespace JTTools.Data
-{
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-        public string Summary { get; set; }
-    }
-}

src/JTTools/Data/WeatherForecastService.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace JTTools.Data
-{
-    public class WeatherForecastService
-    {
-        private static readonly string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
-
-        public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
-        {
-            var rng = new Random();
-            return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = startDate.AddDays(index),
-                TemperatureC = rng.Next(-20, 55),
-                Summary = Summaries[rng.Next(Summaries.Length)]
-            }).ToArray());
-        }
-    }
-}

src/JTTools/JTTools.csproj

@@ -7,15 +7,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JT1078" Version="1.0.2" />
-    <PackageReference Include="JT808" Version="2.2.9" />
-    <PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.2.7" />
-    <PackageReference Include="JT808.Protocol.Extensions.JTActiveSafety" Version="1.0.2" />
-    <PackageReference Include="JT809" Version="2.1.3" />
-    <PackageReference Include="JT809.Protocol.Extensions.JT1078" Version="2.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
+    <PackageReference Include="BlazorStrap" Version="1.3.2" />
+    <PackageReference Include="JT1078" Version="1.0.3" />
+    <PackageReference Include="JT808" Version="2.2.12" />
+    <PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.2.9.1" />
+    <PackageReference Include="JT808.Protocol.Extensions.JTActiveSafety" Version="1.0.4" />
+    <PackageReference Include="JT809" Version="2.1.4-preview5" />
+    <PackageReference Include="JT809.Protocol.Extensions.JT1078" Version="2.1.4-preview4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />
   </ItemGroup>
 
 </Project>

src/JTTools/Pages/Counter.razor

@@ -1,16 +0,0 @@
-@page "/counter"
-
-<h1>Counter</h1>
-
-<p>Current count: @currentCount</p>
-
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
-
-@code {
-    private int currentCount = 0;
-
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
-}

src/JTTools/Pages/FetchData.razor

@@ -1,46 +0,0 @@
-@page "/fetchdata"
-
-@using JTTools.Data
-@inject WeatherForecastService ForecastService
-
-<h1>Weather forecast</h1>
-
-<p>This component demonstrates fetching data from a service.</p>
-
-@if (forecasts == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <table class="table">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th>Temp. (C)</th>
-                <th>Temp. (F)</th>
-                <th>Summary</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var forecast in forecasts)
-            {
-                <tr>
-                    <td>@forecast.Date.ToShortDateString()</td>
-                    <td>@forecast.TemperatureC</td>
-                    <td>@forecast.TemperatureF</td>
-                    <td>@forecast.Summary</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-}
-
-@code {
-    private WeatherForecast[] forecasts;
-
-    protected override async Task OnInitializedAsync()
-    {
-        forecasts = await ForecastService.GetForecastAsync(DateTime.Now);
-    }
-}

src/JTTools/Pages/Index.razor

@@ -1,7 +1,7 @@
 @page "/"
 
-<h1>Hello, world!</h1>
 
-Welcome to your new app.
-
-<SurveyPrompt Title="How is Blazor working for you?" />
+<div class="jumbotron">
+    <h1 class="display-5">JTTools(alpha)</h1>
+    <p class="lead">JT808、JT809、JT1078、JT19056、JTNE（新能源）、主动安全（苏标）解析工具</p>
+</div>

src/JTTools/Pages/JT1078Parse.razor

@@ -0,0 +1,49 @@
+@page "/jt1078"
+
+@using JT1078.Protocol;
+@using JT1078.Protocol.Extensions;
+@using JTTools.Configs;
+
+<button class="btn btn-primary" @onclick="Query">解析</button>
+<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
+    @ErrerMessage
+</BSAlert>
+<div class="right">
+    <textarea class="form-control" @bind="HexData" rows="10"></textarea>
+    <pre>
+         @Json
+    </pre>
+</div>
+
+@code {
+
+    private string HexData = "30 31 63 64 81 E2 10 88 01 12 34 56 78 10 01 10 00 00 01 6B B3 92 CA 7C 02 80 00 28 00 2E 00 00 00 01 61 E1 A2 BF 00 98 CF C0 EE 1E 17 28 34 07 78 8E 39 A4 03 FD DB D1 D5 46 BF B0 63 01 3F 59 AC 34 C9 7A 02 1A B9 6A 28 A4 2C 08";
+
+    private string Json;
+
+    private string ErrerMessage;
+
+    private bool isOpen = false;
+
+    void OnDismiss()
+    {
+        isOpen = !isOpen;
+        StateHasChanged();
+    }
+
+    private void Query()
+    {
+        try
+        {
+            isOpen = false;
+            var data = HexData.ToHexBytes();
+            Json = JT1078Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
+        }
+        catch (Exception ex)
+        {
+            isOpen = !isOpen;
+            Json = "";
+            ErrerMessage = ex.StackTrace;
+        }
+    }
+}

src/JTTools/Pages/JT19056Analyze.razor

@@ -0,0 +1,90 @@
+@page "/jt19056"
+
+@using JT808.Protocol;
+@using JT808.Protocol.Extensions;
+@using JTTools.Configs;
+@inject IJT808Config  Config
+
+<select class="form-control" @onchange="@OnSelectWayType">
+    <option value="up">上行</option>
+    <option value="down">下行</option>
+</select>
+<button class="btn btn-primary" @onclick="Query">分析</button>
+<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
+    @ErrerMessage
+</BSAlert>
+<div class="right">
+    <textarea class="form-control" @bind="HexData" rows="10"></textarea>
+    <pre>
+         @Json
+    </pre>
+</div>
+
+@code {
+    private JT808CarDVRSerializer Serializer;
+
+    private static string UpHexData = "55 7A C4 00 00 00 EB";
+
+    private static string DownHexData = "55 7A C4 00 14 00 20 03 25 10 26 01 20 03 25 10 26 01 00 00 12 34 00 12 34 56 A9";
+
+    private string HexData = UpHexData;
+
+    string wayType = "up";
+
+    private void OnSelectWayType(ChangeEventArgs e)
+    {
+        wayType = e.Value.ToString();
+        switch (wayType)
+        {
+            case "up":
+                HexData = UpHexData;
+                Json = "";
+                break;
+            case "down":
+                HexData = DownHexData;
+                Json = "";
+                break;
+        }
+    }
+
+    private string Json;
+
+    private string ErrerMessage;
+
+    private bool isOpen = false;
+
+    void OnDismiss()
+    {
+        isOpen = !isOpen;
+        StateHasChanged();
+    }
+
+    protected override void OnInitialized()
+    {
+        Serializer = Config.GetCarDVRSerializer();
+    }
+
+    private void Query()
+    {
+        try
+        {
+            isOpen = false;
+            var data = HexData.ToHexBytes();
+            switch (wayType)
+            {
+                case "up":
+                    Json = Serializer.UpAnalyze(data, options: JTJsonWriterOptions.Instance);
+                    break;
+                case "down":
+                    Json = Serializer.DownAnalyze(data, options: JTJsonWriterOptions.Instance);
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            isOpen = !isOpen;
+            Json = "";
+            ErrerMessage = ex.StackTrace;
+        }
+    }
+ }

src/JTTools/Pages/JT808Analyze.razor

@@ -1,35 +1,107 @@
-@page "/jt808analyze"
+@page "/jt808"
 
 @using JT808.Protocol;
 @using JT808.Protocol.Extensions;
-@using Newtonsoft.Json;
-@inject IJT808Config  JT808Config
+@using JT808.Protocol.Exceptions;
+@using JTTools.Configs;
+@using System.Text;
+@using System.Text.Encodings.Web;
+@using System.Text.Unicode;
+@inject IJT808Config  config
+@inject JT808_JT1078_Config  jT808_JT1078_Config
+@inject JT808_JTActiveSafety_Config  jT808_JTActiveSafety_Config
 
-<h3>jt808analyze</h3>
-
-<p>Hex: @HexData</p>
-
-<button class="btn btn-primary" @onclick="Query">分析</button>
+<BSBasicForm IsInline="true">
+    <BSFormGroup Class="mb-5 mr-sm-5 mb-sm-0">
+        <select class="form-control" Id="exampleFormControlSelect1" @onchange="@OnSelectProtocolType">
+            <option value="JT808">国标</option>
+            <option value="JT808_JT1078">国标扩展JT1078</option>
+            <option value="JT808_JTAS">国标扩展主动安全(苏标)</option>
+        </select>
+    </BSFormGroup>
+    <BSFormGroup Class="mb-5 mr-sm-5 mb-sm-0">
+        <BSButton Class="btn btn-primary" ButtonType="ButtonType.Button" @onclick="Query">分析</BSButton>
+    </BSFormGroup>
+</BSBasicForm>
+<BSFormGroup>
+    <BSBasicInput InputType="InputType.TextArea" Name="text" Id="exampleText" Rows="10" @bind-Value="HexData" />
+</BSFormGroup>
+<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
+    @ErrerMessage
+</BSAlert>
 
 <div class="right">
-    @Json
+    <pre>
+       @Json
+    </pre>
 </div>
 
 @code {
+
     private JT808Serializer Serializer;
 
+    private JT808Serializer JTAS_Serializer;
+
+    private JT808Serializer JT1078Serializer;
+
+    string protocolType = "JT808";
+
     private string HexData = "7E 02 00 00 26 12 34 56 78 90 12 00 7D 02 00 00 00 01 00 00 00 02 00 BA 7F 0E 07 E4 F1 1C 00 28 00 3C 00 00 18 10 15 10 10 10 01 04 00 00 00 64 02 02 00 7D 01 13 7E";
 
     private string Json;
 
+    private string ErrerMessage;
+
+    private bool isOpen = false;
+
+    void OnDismiss()
+    {
+        isOpen = !isOpen;
+        StateHasChanged();
+    }
+
+    private void OnSelectProtocolType(ChangeEventArgs e)
+    {
+        protocolType = e.Value.ToString();
+    }
+
     protected override void OnInitialized()
     {
-        Serializer = JT808Config.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);
+        try
+        {
+            isOpen = false;
+            var data = HexData.ToHexBytes();
+            switch (protocolType)
+            {
+                case "JT808":
+                    Json = Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
+                    break;
+                case "JT808_JT1078":
+                    Json = JT1078Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
+                    break;
+                case "JT808_JTAS":
+                    Json = JTAS_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
+                    break;
+            }
+        }
+        catch (JT808Exception ex)
+        {
+            isOpen = !isOpen;
+            Json = "";
+            ErrerMessage = ex.Message;
+        }
+        catch (Exception ex)
+        {
+            isOpen = !isOpen;
+            Json = "";
+            ErrerMessage = ex.StackTrace;
+        }
     }
 }

src/JTTools/Pages/JT808Parse.razor

@@ -1,35 +0,0 @@
-@page "/jt808"
-
-@using JT808.Protocol;
-@using JT808.Protocol.Extensions;
-@using Newtonsoft.Json;
-@inject IJT808Config  JT808Config
-
-<h3>JT808Parse</h3>
-
-<p>Hex: @HexData</p>
-
-<button class="btn btn-primary" @onclick="Query">解析</button>
-
-<div class="right">
-    @Json
-</div>
-
-@code {
-    private JT808Serializer Serializer;
-
-    private string HexData = "7E 02 00 00 26 12 34 56 78 90 12 00 7D 02 00 00 00 01 00 00 00 02 00 BA 7F 0E 07 E4 F1 1C 00 28 00 3C 00 00 18 10 15 10 10 10 01 04 00 00 00 64 02 02 00 7D 01 13 7E";
-
-    private string Json;
-
-    protected override void OnInitialized()
-    {
-        Serializer = JT808Config.GetSerializer();
-    }
-
-    private void Query()
-    {
-        var data = HexData.ToHexBytes();
-        Json = JsonConvert.SerializeObject(Serializer.Deserialize(data));
-    }
-}

src/JTTools/Pages/JT809Parse.razor

@@ -0,0 +1,168 @@
+@page "/jt809"
+
+@using JT809.Protocol;
+@using JT809.Protocol.Extensions;
+@using Newtonsoft.Json;
+@using JT809.Protocol.Configs;
+@using JT809.Protocol.Interfaces;
+@using JT809.Protocol.Exceptions;
+@using JTTools.Configs;
+@using JT809.Protocol.Enums;
+@inject JT809_2011_Config  Config2011
+@inject JT809_2019_Config  Config2019
+
+<select class="form-control" @onchange="@OnSelectVersion">
+    <option value="v2011">2011版本</option>
+    <option value="v2019">2019版本</option>
+</select>
+<select class="form-control" @onchange="@OnSelectEncryptType">
+    <option value="none">未加密</option>
+    <option value="encrypt">加密</option>
+</select>
+
+@if (encryptType == "encrypt")
+{
+    <div class="form-group">
+        <input type="text" class="form-control" placeholder="M1" @bind="EncryptOptions.M1">
+        <input type="text" class="form-control" placeholder="IA1" @bind="EncryptOptions.IA1">
+        <input type="text" class="form-control" placeholder="IC1" @bind="EncryptOptions.IC1">
+    </div>
+}
+<button class="btn btn-primary" @onclick="Query">解析</button>
+<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
+    @ErrerMessage
+</BSAlert>
+<div class="right">
+    <textarea class="form-control" @bind="HexData" rows="10"></textarea>
+    <pre>
+         @Json
+    </pre>
+</div>
+
+@code {
+    private JT809Serializer Serializer2011;
+    private JT809Serializer Serializer2019;
+
+    private string HexData2011 = "5B 00 00 00 92 00 00 06 82 94 00 01 33 EF B8 01 00 00 00 00 00 27 0F D4 C1 41 31 32 33 34 35 00 00 00 00 00 00 00 00 00 00 00 00 00 02 94 01 00 00 00 5C 01 00 02 00 00 00 00 5A 01 AC 3F 40 12 3F FA A1 00 00 00 00 5A 01 AC 4D 50 03 73 6D 61 6C 6C 63 68 69 00 00 00 00 00 00 00 00 31 32 33 34 35 36 37 38 39 30 31 00 00 00 00 00 00 00 00 00 31 32 33 34 35 36 40 71 71 2E 63 6F 6D 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 BA D8 5D";
+
+    private string HexData2019 = "5B 00 00 00 C9 00 00 06 82 17 00 01 34 15 F4 01 00 00 00 00 00 27 0F 00 00 00 00 5E 02 A5 07 B8 D4 C1 41 31 32 33 34 35 00 00 00 00 00 00 00 00 00 00 00 00 00 02 17 01 00 00 00 8B 01 02 03 04 05 06 07 08 09 10 11 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 E7 D3 5D";
+
+    private string HexData = "";
+
+    private string Json;
+
+    string encryptType = "none";
+
+    string version = "v2011";
+
+    JT809EncryptOptions EncryptOptions;
+
+    private string ErrerMessage;
+
+    private bool isOpen = false;
+
+    void OnDismiss()
+    {
+        isOpen = !isOpen;
+        StateHasChanged();
+    }
+
+    private void OnSelectVersion(ChangeEventArgs e)
+    {
+        version = e.Value.ToString();
+        switch (version)
+        {
+            case "v2011":
+                HexData = HexData2011;
+                break;
+            case "v2019":
+                HexData = HexData2019;
+                break;
+        }
+    }
+
+    private void OnSelectEncryptType(ChangeEventArgs e)
+    {
+        encryptType = e.Value.ToString();
+    }
+
+    protected override void OnInitialized()
+    {
+        Serializer2011 = Config2011.GetSerializer();
+        Serializer2019 = Config2019.GetSerializer();
+        EncryptOptions = new JT809EncryptOptions();
+        HexData = HexData2011;
+    }
+
+    private void Query()
+    {
+        try
+        {
+            isOpen = false;
+            var data = HexData.ToHexBytes();
+            switch (version)
+            {
+                case "v2011":
+                    if (encryptType == "none")
+                    {
+                        Json = Serializer2011.Analyze(data, JTJsonWriterOptions.Instance);
+                    }
+                    else
+                    {
+                        IJT809Config jt809ConfigInternal = new JT809Config2011(Guid.NewGuid().ToString());
+                        jt809ConfigInternal.EncryptOptions = EncryptOptions;
+                        JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal);
+                        Json = jT809SerializerInternal.Analyze(data, JTJsonWriterOptions.Instance);
+                    }
+                    break;
+
+                case "v2019":
+                    if (encryptType == "none")
+                    {
+                        Json = Serializer2019.Analyze(data, JTJsonWriterOptions.Instance);
+                    }
+                    else
+                    {
+                        IJT809Config jt809ConfigInternal = new JT809Config2019(Guid.NewGuid().ToString());
+                        jt809ConfigInternal.EncryptOptions = EncryptOptions;
+                        JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal);
+                        Json = jT809SerializerInternal.Analyze(data, JTJsonWriterOptions.Instance);
+                    }
+                    break;
+            }
+        }
+        catch (JT809Exception ex)
+        {
+            isOpen = !isOpen;
+            Json = "";
+            ErrerMessage = ex.Message;
+        }
+        catch (Exception ex)
+        {
+            isOpen = !isOpen;
+            Json = "";
+            ErrerMessage = ex.StackTrace;
+        }
+    }
+
+    class JT809Config2011 : JT809GlobalConfigBase
+    {
+        public JT809Config2011(string configId)
+        {
+            ConfigId = configId;
+        }
+
+        public override string ConfigId { get; }
+    }
+
+    class JT809Config2019 : JT809GlobalConfigBase
+    {
+        public JT809Config2019(string configId)
+        {
+            ConfigId = configId;
+            Version = JT809Version.JTT2019;
+        }
+
+        public override string ConfigId { get; }
+    }
+}

src/JTTools/Pages/_Host.cshtml

@@ -32,8 +32,6 @@
         <a href="" class="reload">Reload</a>
         <a class="dismiss">🗙</a>
     </div>
-
-    <div>Copyright © 2015-2019 SmallChi. All Rights Reserved. 粤ICP备19128140号</div>
     <script src="_framework/blazor.server.js"></script>
 </body>
 </html>

src/JTTools/Program.cs

@@ -1,24 +1,18 @@
 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 JTTools.Data;
 using Newtonsoft.Json.Serialization;
+using JTTools.Configs;
+using BlazorStrap;
+using Newtonsoft.Json;
 
 namespace JTTools
 {
@@ -26,6 +20,18 @@ namespace JTTools
     {
         public static void Main(string[] args)
         {
+            Newtonsoft.Json.JsonConvert.DefaultSettings = new Func<JsonSerializerSettings>(() =>
+            {
+                Newtonsoft.Json.JsonSerializerSettings settings = new Newtonsoft.Json.JsonSerializerSettings();
+                //日期类型默认格式化处理
+                settings.DateFormatHandling = Newtonsoft.Json.DateFormatHandling.MicrosoftDateFormat;
+                settings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
+                //空值处理
+                settings.NullValueHandling = NullValueHandling.Ignore;
+                settings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+                settings.Converters.Add(new ByteArrayHexConverter());
+                return settings;
+            });
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
@@ -33,7 +39,6 @@ namespace JTTools
                     {
                         services.AddRazorPages();
                         services.AddServerSideBlazor();
-                        services.AddSingleton<WeatherForecastService>();
                         services.AddControllers()
                                 //Microsoft.AspNetCore.Mvc.NewtonsoftJson
                                 .AddNewtonsoftJson(jsonOptions =>
@@ -55,7 +60,7 @@ namespace JTTools
                                      .AllowAnyMethod()
                                      .AllowAnyHeader()
                                      .AllowAnyOrigin()));
-
+                        services.AddBootstrapCss();
                     })
                     .ConfigureKestrel(ksOptions =>
                     {
@@ -92,10 +97,14 @@ namespace JTTools
                 })
                 .ConfigureServices(services =>
                 {
-                    services.AddJT808Configure()
-                            .AddJT1078Configure()
+                    services.AddJT808Configure();
+                    services.AddJT808Configure(new JT808_JTActiveSafety_Config())
                             .AddJTActiveSafetyConfigure();
-                    services.AddJT809Configure()
+                    services.AddJT808Configure(new JT808_JT1078_Config())
+                            .AddJT1078Configure();
+                    services.AddJT809Configure(new JT809_2011_Config())
+                            .AddJT1078Configure();
+                    services.AddJT809Configure(new JT809_2019_Config())
                             .AddJT1078Configure();
                 })
                 .Build()

src/JTTools/Shared/MainLayout.razor

@@ -12,4 +12,8 @@
     <div class="content px-4">
         @Body
     </div>
+
+    <div class="footer">
+        <a href="http://www.beian.miit.gov.cn" target="_blank">Copyright © 2015-2020 SmallChi. All Rights Reserved. 粤ICP备19128140号-1</a>
+    </div>
 </div>

src/JTTools/Shared/NavMenu.razor

@@ -8,29 +8,29 @@
 <div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
     <ul class="nav flex-column">
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
+            <BSNavLink class="nav-link" href="" Match="NavLinkMatch.All">
                 <span class="oi oi-home" aria-hidden="true"></span> Home
-            </NavLink>
+            </BSNavLink>
         </li>
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="jt808">
-                <span class="oi oi-plus" aria-hidden="true"></span> JT808解析工具
-            </NavLink>
-        </li>        
+            <BSNavLink class="nav-link" href="jt808">
+                <span aria-hidden="true"></span>JT808分析工具
+            </BSNavLink>
+        </li>
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="jt808analyze">
-                <span class="oi oi-plus" aria-hidden="true"></span> JT808分析工具
-            </NavLink>
+            <BSNavLink class="nav-link" href="jt809">
+                <span aria-hidden="true"></span>JT809分析工具
+            </BSNavLink>
         </li>
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
-            </NavLink>
+            <BSNavLink class="nav-link" href="jt1078">
+                <span aria-hidden="true"></span>JT1078分析工具
+            </BSNavLink>
         </li>
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
-            </NavLink>
+            <BSNavLink class="nav-link" href="jt19056">
+                <span aria-hidden="true"></span>JT19056分析工具
+            </BSNavLink>
         </li>
     </ul>
 </div>

src/JTTools/_Imports.razor

@@ -7,3 +7,4 @@
 @using Microsoft.JSInterop
 @using JTTools
 @using JTTools.Shared
+@using BlazorStrap

src/JTTools/wwwroot/css/site.css

@@ -99,6 +99,7 @@ app {
 
 .content {
     padding-top: 1.1rem;
+    padding-bottom: 60px;
 }
 
 .navbar-toggler {
@@ -135,7 +136,13 @@ app {
     right: 0.75rem;
     top: 0.5rem;
 }
-
+.footer {
+    position: fixed;
+    bottom: 0;
+    text-align: center;
+    padding: 10px !important;
+    background: #fff;
+}
 @media (max-width: 767.98px) {
     .main .top-row:not(.auth) {
         display: none;
@@ -148,6 +155,9 @@ app {
     .main .top-row a, .main .top-row .btn-link {
         margin-left: 0;
     }
+    .footer {
+        width: 100%;
+    }
 }
 
 @media (min-width: 768px) {
@@ -180,4 +190,7 @@ app {
         /* Never collapse the sidebar for wide screens */
         display: block;
     }
-}
+    .footer {
+        width: calc(100% - 250px);
+    }
+    }

src/JTTools/wwwroot/index.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="keywords" content="JT808|gb808|JT809|gb809|JT1078|JTT1078|JT19056|gb19056|在线解析工具" />
+    <meta name="description" content="道路运输车辆卫星定位协议在线解析工具" />
+    <meta http-equiv="Blazor-Environment" content="Development" />
+    <title>JTTools解析工具</title>
+    <base href="/" />
+    <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet">
+    <link href="css/open-iconic/font/css/open-iconic-bootstrap.min.css" rel="stylesheet">
+    <link href="css/site.css" rel="stylesheet">
+    <script type="text/javascript">
+        // Single Page Apps for GitHub Pages
+        // https://github.com/rafrex/spa-github-pages
+        // Copyright (c) 2016 Rafael Pedicini, licensed under the MIT License
+        // ----------------------------------------------------------------------
+        // This script checks to see if a redirect is present in the query string
+        // and converts it back into the correct url and adds it to the
+        // browser's history using window.history.replaceState(...),
+        // which won't cause the browser to attempt to load the new url.
+        // When the single page app is loaded further down in this file,
+        // the correct url will be waiting in the browser's history for
+        // the single page app to route accordingly.
+        (function (l) {
+            if (l.search) {
+                var q = {};
+                l.search.slice(1).split('&').forEach(function (v) {
+                    var a = v.split('=');
+                    q[a[0]] = a.slice(1).join('=').replace(/~and~/g, '&');
+                });
+                if (q.p !== undefined) {
+                    window.history.replaceState(null, null,
+                        l.pathname.slice(0, -1) + (q.p || '') +
+                        (q.q ? ('?' + q.q) : '') +
+                        l.hash
+                    );
+                }
+            }
+        }(window.location))
+    </script>
+    <link rel="stylesheet" href="_content/BlazorStrap/css/cromefix.css">
+    <link rel="stylesheet" href="_content/BlazorStrap/css/submenu.css">
+    <script src="_content/BlazorStrap/blazorStrap.js"></script>
+    <script src="_content/BlazorStrap/popper.min.js"></script>
+</head>
+<body>
+    <app>首次加载，请耐心等待...</app>
+    <!-- temporary WORKAROUND for Safari https://github.com/mono/mono/issues/15588#issuecomment-529056521 -->
+    <script>var Module;</script>
+    <script src="_framework/blazor.webassembly.js"></script>
+    <script async defer src="https://buttons.github.io/buttons.js"></script>
+    <script>
+        const environmentName = 'Development';
+    </script>
+</body>
+</html>

src/ui/jttools/.babelrc

@@ -1,12 +0,0 @@
-{
-  "presets": [
-    ["env", {
-      "modules": false,
-      "targets": {
-        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
-      }
-    }],
-    "stage-2"
-  ],
-  "plugins": ["transform-vue-jsx", "transform-runtime"]
-}

src/ui/jttools/.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true

src/ui/jttools/.eslintignore

@@ -1,5 +0,0 @@
-/build/
-/config/
-/dist/
-/*.js
-/*.vue

src/ui/jttools/.eslintrc.js

@@ -1,31 +0,0 @@
-// https://eslint.org/docs/user-guide/configuring
-
-module.exports = {
-  root: true,
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
-  env: {
-    browser: true,
-  },
-  extends: [
-    // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
-    // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
-    'plugin:vue/essential', 
-    // https://github.com/standard/standard/blob/master/docs/RULES-en.md
-    'standard'
-  ],
-  // required to lint *.vue files
-  plugins: [
-    'vue'
-  ],
-  // add your custom rules here
-  rules: {
-    // allow async-await
-    'eslint-disable':'off',
-    'eslint-disable-next-line':'off',
-    'generator-star-spacing': 'off',
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
-  }
-}

src/ui/jttools/.gitignore

@@ -1,15 +0,0 @@
-.DS_Store
-node_modules/
-/dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-package-lock.json

src/ui/jttools/.postcssrc.js

@@ -1,10 +0,0 @@
-// https://github.com/michael-ciniawsky/postcss-load-config
-
-module.exports = {
-  "plugins": {
-    "postcss-import": {},
-    "postcss-url": {},
-    // to edit target browsers: use "browserslist" field in package.json
-    "autoprefixer": {}
-  }
-}

src/ui/jttools/README.md

@@ -1,21 +0,0 @@
-# jttools
-
-> A Vue.js project
-
-## Build Setup
-
-``` bash
-# install dependencies
-npm install
-
-# serve with hot reload at localhost:8080
-npm run dev
-
-# build for production with minification
-npm run build
-
-# build for production and view the bundle analyzer report
-npm run build --report
-```
-
-For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

src/ui/jttools/build/build.js

@@ -1,41 +0,0 @@
-'use strict'
-require('./check-versions')()
-
-process.env.NODE_ENV = 'production'
-
-const ora = require('ora')
-const rm = require('rimraf')
-const path = require('path')
-const chalk = require('chalk')
-const webpack = require('webpack')
-const config = require('../config')
-const webpackConfig = require('./webpack.prod.conf')
-
-const spinner = ora('building for production...')
-spinner.start()
-
-rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
-  if (err) throw err
-  webpack(webpackConfig, (err, stats) => {
-    spinner.stop()
-    if (err) throw err
-    process.stdout.write(stats.toString({
-      colors: true,
-      modules: false,
-      children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
-      chunks: false,
-      chunkModules: false
-    }) + '\n\n')
-
-    if (stats.hasErrors()) {
-      console.log(chalk.red('  Build failed with errors.\n'))
-      process.exit(1)
-    }
-
-    console.log(chalk.cyan('  Build complete.\n'))
-    console.log(chalk.yellow(
-      '  Tip: built files are meant to be served over an HTTP server.\n' +
-      '  Opening index.html over file:// won\'t work.\n'
-    ))
-  })
-})

src/ui/jttools/build/check-versions.js

@@ -1,54 +0,0 @@
-'use strict'
-const chalk = require('chalk')
-const semver = require('semver')
-const packageConfig = require('../package.json')
-const shell = require('shelljs')
-
-function exec (cmd) {
-  return require('child_process').execSync(cmd).toString().trim()
-}
-
-const versionRequirements = [
-  {
-    name: 'node',
-    currentVersion: semver.clean(process.version),
-    versionRequirement: packageConfig.engines.node
-  }
-]
-
-if (shell.which('npm')) {
-  versionRequirements.push({
-    name: 'npm',
-    currentVersion: exec('npm --version'),
-    versionRequirement: packageConfig.engines.npm
-  })
-}
-
-module.exports = function () {
-  const warnings = []
-
-  for (let i = 0; i < versionRequirements.length; i++) {
-    const mod = versionRequirements[i]
-
-    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
-      warnings.push(mod.name + ': ' +
-        chalk.red(mod.currentVersion) + ' should be ' +
-        chalk.green(mod.versionRequirement)
-      )
-    }
-  }
-
-  if (warnings.length) {
-    console.log('')
-    console.log(chalk.yellow('To use this template, you must update following to modules:'))
-    console.log()
-
-    for (let i = 0; i < warnings.length; i++) {
-      const warning = warnings[i]
-      console.log('  ' + warning)
-    }
-
-    console.log()
-    process.exit(1)
-  }
-}

src/ui/jttools/build/utils.js

@@ -1,101 +0,0 @@
-'use strict'
-const path = require('path')
-const config = require('../config')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const packageConfig = require('../package.json')
-
-exports.assetsPath = function (_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production'
-    ? config.build.assetsSubDirectory
-    : config.dev.assetsSubDirectory
-
-  return path.posix.join(assetsSubDirectory, _path)
-}
-
-exports.cssLoaders = function (options) {
-  options = options || {}
-
-  const cssLoader = {
-    loader: 'css-loader',
-    options: {
-      sourceMap: options.sourceMap
-    }
-  }
-
-  const postcssLoader = {
-    loader: 'postcss-loader',
-    options: {
-      sourceMap: options.sourceMap
-    }
-  }
-
-  // generate loader string to be used with extract text plugin
-  function generateLoaders (loader, loaderOptions) {
-    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
-
-    if (loader) {
-      loaders.push({
-        loader: loader + '-loader',
-        options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
-      })
-    }
-
-    // Extract CSS when that option is specified
-    // (which is the case during production build)
-    if (options.extract) {
-      return ExtractTextPlugin.extract({
-        use: loaders,
-        fallback: 'vue-style-loader'
-      })
-    } else {
-      return ['vue-style-loader'].concat(loaders)
-    }
-  }
-
-  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
-  return {
-    css: generateLoaders(),
-    postcss: generateLoaders(),
-    less: generateLoaders('less'),
-    sass: generateLoaders('sass', { indentedSyntax: true }),
-    scss: generateLoaders('sass'),
-    stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
-  }
-}
-
-// Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function (options) {
-  const output = []
-  const loaders = exports.cssLoaders(options)
-
-  for (const extension in loaders) {
-    const loader = loaders[extension]
-    output.push({
-      test: new RegExp('\\.' + extension + '$'),
-      use: loader
-    })
-  }
-
-  return output
-}
-
-exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier')
-
-  return (severity, errors) => {
-    if (severity !== 'error') return
-
-    const error = errors[0]
-    const filename = error.file && error.file.split('!').pop()
-
-    notifier.notify({
-      title: packageConfig.name,
-      message: severity + ': ' + error.name,
-      subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    })
-  }
-}

src/ui/jttools/build/vue-loader.conf.js

@@ -1,22 +0,0 @@
-'use strict'
-const utils = require('./utils')
-const config = require('../config')
-const isProduction = process.env.NODE_ENV === 'production'
-const sourceMapEnabled = isProduction
-  ? config.build.productionSourceMap
-  : config.dev.cssSourceMap
-
-module.exports = {
-  loaders: utils.cssLoaders({
-    sourceMap: sourceMapEnabled,
-    extract: isProduction
-  }),
-  cssSourceMap: sourceMapEnabled,
-  cacheBusting: config.dev.cacheBusting,
-  transformToRequire: {
-    video: ['src', 'poster'],
-    source: 'src',
-    img: 'src',
-    image: 'xlink:href'
-  }
-}

src/ui/jttools/build/webpack.base.conf.js

@@ -1,91 +0,0 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const config = require('../config')
-const vueLoaderConfig = require('./vue-loader.conf')
-
-function resolve (dir) {
-  return path.join(__dirname, '..', dir)
-}
-
-const createLintingRule = () => ({
-  test: /\.(js|vue)$/,
-  loader: 'eslint-loader',
-  enforce: 'pre',
-  include: [resolve('src'), resolve('test')],
-  options: {
-    formatter: require('eslint-friendly-formatter'),
-    emitWarning: !config.dev.showEslintErrorsInOverlay
-  }
-})
-
-module.exports = {
-  context: path.resolve(__dirname, '../'),
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: config.build.assetsRoot,
-    filename: '[name].js',
-    publicPath: process.env.NODE_ENV === 'production'
-      ? config.build.assetsPublicPath
-      : config.dev.assetsPublicPath
-  },
-  resolve: {
-    extensions: ['.js', '.vue', '.json'],
-    alias: {
-      '@': resolve('src'),
-    }
-  },
-  module: {
-    rules: [
-      ...(config.dev.useEslint ? [createLintingRule()] : []),
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: vueLoaderConfig
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
-        }
-      },
-      {
-        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('media/[name].[hash:7].[ext]')
-        }
-      },
-      {
-        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
-        }
-      }
-    ]
-  },
-  node: {
-    // prevent webpack from injecting useless setImmediate polyfill because Vue
-    // source contains it (although only uses it if it's native).
-    setImmediate: false,
-    // prevent webpack from injecting mocks to Node native modules
-    // that does not make sense for the client
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty'
-  }
-}

src/ui/jttools/build/webpack.dev.conf.js

@@ -1,95 +0,0 @@
-'use strict'
-const utils = require('./utils')
-const webpack = require('webpack')
-const config = require('../config')
-const merge = require('webpack-merge')
-const path = require('path')
-const baseWebpackConfig = require('./webpack.base.conf')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
-const portfinder = require('portfinder')
-
-const HOST = process.env.HOST
-const PORT = process.env.PORT && Number(process.env.PORT)
-
-const devWebpackConfig = merge(baseWebpackConfig, {
-  module: {
-    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
-  },
-  // cheap-module-eval-source-map is faster for development
-  devtool: config.dev.devtool,
-
-  // these devServer options should be customized in /config/index.js
-  devServer: {
-    clientLogLevel: 'warning',
-    historyApiFallback: {
-      rewrites: [
-        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
-      ],
-    },
-    hot: true,
-    contentBase: false, // since we use CopyWebpackPlugin.
-    compress: true,
-    host: HOST || config.dev.host,
-    port: PORT || config.dev.port,
-    open: config.dev.autoOpenBrowser,
-    overlay: config.dev.errorOverlay
-      ? { warnings: false, errors: true }
-      : false,
-    publicPath: config.dev.assetsPublicPath,
-    proxy: config.dev.proxyTable,
-    quiet: true, // necessary for FriendlyErrorsPlugin
-    watchOptions: {
-      poll: config.dev.poll,
-    }
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': require('../config/dev.env')
-    }),
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
-    new webpack.NoEmitOnErrorsPlugin(),
-    // https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: 'index.html',
-      template: 'index.html',
-      inject: true
-    }),
-    // copy custom static assets
-    new CopyWebpackPlugin([
-      {
-        from: path.resolve(__dirname, '../static'),
-        to: config.dev.assetsSubDirectory,
-        ignore: ['.*']
-      }
-    ])
-  ]
-})
-
-module.exports = new Promise((resolve, reject) => {
-  portfinder.basePort = process.env.PORT || config.dev.port
-  portfinder.getPort((err, port) => {
-    if (err) {
-      reject(err)
-    } else {
-      // publish the new Port, necessary for e2e tests
-      process.env.PORT = port
-      // add port to devServer config
-      devWebpackConfig.devServer.port = port
-
-      // Add FriendlyErrorsPlugin
-      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
-        compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
-        },
-        onErrors: config.dev.notifyOnErrors
-        ? utils.createNotifierCallback()
-        : undefined
-      }))
-
-      resolve(devWebpackConfig)
-    }
-  })
-})

src/ui/jttools/build/webpack.prod.conf.js

@@ -1,145 +0,0 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const webpack = require('webpack')
-const config = require('../config')
-const merge = require('webpack-merge')
-const baseWebpackConfig = require('./webpack.base.conf')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-
-const env = require('../config/prod.env')
-
-const webpackConfig = merge(baseWebpackConfig, {
-  module: {
-    rules: utils.styleLoaders({
-      sourceMap: config.build.productionSourceMap,
-      extract: true,
-      usePostCSS: true
-    })
-  },
-  devtool: config.build.productionSourceMap ? config.build.devtool : false,
-  output: {
-    path: config.build.assetsRoot,
-    filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
-  },
-  plugins: [
-    // http://vuejs.github.io/vue-loader/en/workflow/production.html
-    new webpack.DefinePlugin({
-      'process.env': env
-    }),
-    new UglifyJsPlugin({
-      uglifyOptions: {
-        compress: {
-          warnings: false
-        }
-      },
-      sourceMap: config.build.productionSourceMap,
-      parallel: true
-    }),
-    // extract css into its own file
-    new ExtractTextPlugin({
-      filename: utils.assetsPath('css/[name].[contenthash].css'),
-      // Setting the following option to `false` will not extract CSS from codesplit chunks.
-      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
-      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, 
-      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
-      allChunks: true,
-    }),
-    // Compress extracted CSS. We are using this plugin so that possible
-    // duplicated CSS from different components can be deduped.
-    new OptimizeCSSPlugin({
-      cssProcessorOptions: config.build.productionSourceMap
-        ? { safe: true, map: { inline: false } }
-        : { safe: true }
-    }),
-    // generate dist index.html with correct asset hash for caching.
-    // you can customize output by editing /index.html
-    // see https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: config.build.index,
-      template: 'index.html',
-      inject: true,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeAttributeQuotes: true
-        // more options:
-        // https://github.com/kangax/html-minifier#options-quick-reference
-      },
-      // necessary to consistently work with multiple chunks via CommonsChunkPlugin
-      chunksSortMode: 'dependency'
-    }),
-    // keep module.id stable when vendor modules does not change
-    new webpack.HashedModuleIdsPlugin(),
-    // enable scope hoisting
-    new webpack.optimize.ModuleConcatenationPlugin(),
-    // split vendor js into its own file
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'vendor',
-      minChunks (module) {
-        // any required modules inside node_modules are extracted to vendor
-        return (
-          module.resource &&
-          /\.js$/.test(module.resource) &&
-          module.resource.indexOf(
-            path.join(__dirname, '../node_modules')
-          ) === 0
-        )
-      }
-    }),
-    // extract webpack runtime and module manifest to its own file in order to
-    // prevent vendor hash from being updated whenever app bundle is updated
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'manifest',
-      minChunks: Infinity
-    }),
-    // This instance extracts shared chunks from code splitted chunks and bundles them
-    // in a separate chunk, similar to the vendor chunk
-    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'app',
-      async: 'vendor-async',
-      children: true,
-      minChunks: 3
-    }),
-
-    // copy custom static assets
-    new CopyWebpackPlugin([
-      {
-        from: path.resolve(__dirname, '../static'),
-        to: config.build.assetsSubDirectory,
-        ignore: ['.*']
-      }
-    ])
-  ]
-})
-
-if (config.build.productionGzip) {
-  const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-  webpackConfig.plugins.push(
-    new CompressionWebpackPlugin({
-      asset: '[path].gz[query]',
-      algorithm: 'gzip',
-      test: new RegExp(
-        '\\.(' +
-        config.build.productionGzipExtensions.join('|') +
-        ')$'
-      ),
-      threshold: 10240,
-      minRatio: 0.8
-    })
-  )
-}
-
-if (config.build.bundleAnalyzerReport) {
-  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
-  webpackConfig.plugins.push(new BundleAnalyzerPlugin())
-}
-
-module.exports = webpackConfig

src/ui/jttools/config/dev.env.js

@@ -1,7 +0,0 @@
-'use strict'
-const merge = require('webpack-merge')
-const prodEnv = require('./prod.env')
-
-module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
-})

src/ui/jttools/config/index.js

@@ -1,76 +0,0 @@
-'use strict'
-// Template version: 1.3.1
-// see http://vuejs-templates.github.io/webpack for documentation.
-
-const path = require('path')
-
-module.exports = {
-  dev: {
-
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {},
-
-    // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
-    errorOverlay: true,
-    notifyOnErrors: true,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
-    // Use Eslint Loader?
-    // If true, your code will be linted during bundling and
-    // linting errors and warnings will be shown in the console.
-    useEslint: true,
-    // If true, eslint errors and warnings will also be shown in the error overlay
-    // in the browser.
-    showEslintErrorsInOverlay: false,
-
-    /**
-     * Source Maps
-     */
-
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'cheap-module-eval-source-map',
-
-    // If you have problems debugging vue-files in devtools,
-    // set this to false - it *may* help
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: true,
-
-    cssSourceMap: true
-  },
-
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
-
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-
-    /**
-     * Source Maps
-     */
-
-    productionSourceMap: true,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: '#source-map',
-
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
-
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report
-  }
-}

src/ui/jttools/config/prod.env.js

@@ -1,4 +0,0 @@
-'use strict'
-module.exports = {
-  NODE_ENV: '"production"'
-}

src/ui/jttools/index.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <meta name="keywords" content="JT808|gb808|JT809|gb809|JT1078|JTT1078|在线解析工具">
-    <meta name=”description” content="道路运输车辆卫星定位协议在线解析工具">
-    <title>JTTools解析工具</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>

src/ui/jttools/package.json

@@ -1,75 +0,0 @@
-{
-  "name": "jttools",
-  "version": "1.0.0",
-  "description": "A Vue.js project",
-  "author": "SmallChi",
-  "private": true,
-  "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-    "start": "npm run dev",
-    "lint": "eslint --ext .js,.vue src",
-    "build": "node build/build.js"
-  },
-  "dependencies": {
-    "axios": "^0.19.0",
-    "iview": "^3.4.2",
-    "vue": "^2.5.2",
-    "vue-json-viewer": "^2.2.1"
-  },
-  "devDependencies": {
-    "autoprefixer": "^7.1.2",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^8.2.1",
-    "babel-helper-vue-jsx-merge-props": "^2.0.3",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-plugin-transform-vue-jsx": "^3.5.0",
-    "babel-preset-env": "^1.3.2",
-    "babel-preset-stage-2": "^6.22.0",
-    "chalk": "^2.0.1",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.0",
-    "eslint": "^4.15.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eslint-plugin-vue": "^4.0.0",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^1.1.4",
-    "friendly-errors-webpack-plugin": "^1.6.1",
-    "html-webpack-plugin": "^2.30.1",
-    "node-notifier": "^5.1.2",
-    "optimize-css-assets-webpack-plugin": "^3.2.0",
-    "ora": "^1.2.0",
-    "portfinder": "^1.0.13",
-    "postcss-import": "^11.0.0",
-    "postcss-loader": "^2.0.8",
-    "postcss-url": "^7.2.1",
-    "rimraf": "^2.6.0",
-    "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
-    "uglifyjs-webpack-plugin": "^1.1.1",
-    "url-loader": "^0.5.8",
-    "vue-loader": "^13.3.0",
-    "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.2",
-    "webpack": "^3.6.0",
-    "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-dev-server": "^2.9.1",
-    "webpack-merge": "^4.1.0"
-  },
-  "engines": {
-    "node": ">= 6.0.0",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
-}

src/ui/jttools/src/App.vue

@@ -1,390 +0,0 @@
-<template>
-  <div id="app">
-    <div class="layout">
-      <div class="ivu-layout">
-        <!-- header -->
-        <div class="ivu-layout-header">
-          <ul class="ivu-menu ivu-menu-horizontal">
-            <div class="layout-logo">SmallChi</div>
-            <div class="layout-nav">
-              <li class="ivu-menu-item ivu-menu-item-active ivu-menu-item-selected">
-                <a href="index.html" class>JTTools在线解析</a>
-              </li>
-              <li class="ivu-menu-item">
-                <iframe id="github-star" style="border:none;vertical-align: middle;" width="105" height="20" src="https://ghbtns.com/github-btn.html?user=SmallChi&amp;repo=JTTools&amp;type=watch&amp;count=true"></iframe>
-              </li>
-            </div>
-          </ul>
-        </div>
-        <!-- End header -->
-        <div class="ivu-layout-content" style="padding: 0px 70px;margin-top: 20px">
-          <div class="ivu-card ivu-card-bordered">
-            <div class="ivu-card-body">
-              <div style="min-height: 200px;">
-                <tabs value="name1">
-                  <tab-pane label="JT808解析工具" name="name1">
-                    <div class="pane-content">
-                      <div class="left">
-                        <i-input
-                          v-model="parse808Parameter.HexData"
-                          type="textarea"
-                          placeholder="Enter Hex Data..."
-                          style="resize:none"
-                        />
-                      </div>
-                      <div class="center">
-                        <i-button @click="parse808Click" type="primary">
-                          <Icon type="ios-arrow-forward" />
-                        </i-button>
-                      </div>
-                      <div class="right">
-                        <json-viewer copyable :expand-depth=5 :value="parse808Result"></json-viewer>
-                      </div>
-                    </div>
-                  </tab-pane>
-                  <tab-pane :label="tabLabel"  name="name4">
-                    <div class="pane-content">
-                      <div class="left">
-                        <i-input
-                          v-model="analyze808arameter.HexData"
-                          type="textarea"
-                          placeholder="Enter Hex Data..."
-                          style="resize:none"
-                        />
-                      </div>
-                      <div class="center">
-                        <i-button @click="analyze808Click" type="primary">
-                          <Icon type="ios-arrow-forward" />
-                        </i-button>
-                      </div>
-                      <div class="right">
-                        <json-viewer copyable :expand-depth=5 :value="analyze808Result"></json-viewer>
-                      </div>
-                    </div>
-                  </tab-pane>
-                  <tab-pane label="JT809解析工具" name="name2">
-                    <div class="pane-content">
-                      <div class="left">
-                        <i-input
-                          v-model="parse809Parameter.HexData"
-                          type="textarea"
-                          placeholder="Enter Hex Data..."
-                          style="resize:none"
-                        />
-                      </div>
-                      <div class="center">
-                        <i-button @click="parse809Click" type="primary">
-                          <Icon type="ios-arrow-forward" />
-                        </i-button>
-                      </div>
-                      <div class="right">
-                        <json-viewer copyable :expand-depth=5 :value="parse809Result"></json-viewer>
-                      </div>
-                    </div>
-                  </tab-pane>
-                  <tab-pane label="JT1078解析工具" name="name3">
-                    <div class="pane-content">
-                      <div class="left">
-                        <i-input
-                          v-model="parse1078Parameter.HexData"
-                          type="textarea"
-                          placeholder="Enter Hex Data..."
-                          style="resize:none"
-                        />
-                      </div>
-                      <div class="center">
-                        <i-button @click="parse1078Click" type="primary">
-                          <Icon type="ios-arrow-forward" />
-                        </i-button>
-                      </div>
-                      <div class="right">
-                           <json-viewer copyable :expand-depth=5 :value="parse1078Result"></json-viewer>
-                      </div>
-                    </div>
-                  </tab-pane>
-                </tabs>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="layout-footer-center ivu-layout-footer"
-        >Copyright © 2015-2019 SmallChi. All Rights Reserved. 粤ICP备19128140号</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import axios from 'axios'
-export default {
-  name: 'App',
-  data () {
-    return {
-      tabLabel: (h) => {
-        return h('div', [
-          h('span', 'JT808分析工具'),
-          h('Badge', {
-            props: {
-              dot: true
-            }
-          })
-        ])
-      },
-      parse808Parameter: {
-        HexData: '7E 02 00 00 26 12 34 56 78 90 12 00 7D 02 00 00 00 01 00 00 00 02 00 BA 7F 0E 07 E4 F1 1C 00 28 00 3C 00 00 18 10 15 10 10 10 01 04 00 00 00 64 02 02 00 7D 01 13 7E'
-      },
-      analyze808arameter: {
-        HexData: '7E 02 00 00 26 12 34 56 78 90 12 00 7D 02 00 00 00 01 00 00 00 02 00 BA 7F 0E 07 E4 F1 1C 00 28 00 3C 00 00 18 10 15 10 10 10 01 04 00 00 00 64 02 02 00 7D 01 13 7E'
-      },
-      parse809Parameter: {
-        HexData: '5B 00 00 00 92 00 00 06 82 94 00 01 33 EF B8 01 00 00 00 00 00 27 0F D4 C1 41 31 32 33 34 35 00 00 00 00 00 00 00 00 00 00 00 00 00 02 94 01 00 00 00 5C 01 00 02 00 00 00 00 5A 01 AC 3F 40 12 3F FA A1 00 00 00 00 5A 01 AC 4D 50 03 73 6D 61 6C 6C 63 68 69 00 00 00 00 00 00 00 00 31 32 33 34 35 36 37 38 39 30 31 00 00 00 00 00 00 00 00 00 31 32 33 34 35 36 40 71 71 2E 63 6F 6D 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 BA D8 5D'
-      },
-      parse1078Parameter: {
-        HexData: '30 31 63 64 81 E2 10 88 01 12 34 56 78 10 01 10 00 00 01 6B B3 92 CA 7C 02 80 00 28 00 2E 00 00 00 01 61 E1 A2 BF 00 98 CF C0 EE 1E 17 28 34 07 78 8E 39 A4 03 FD DB D1 D5 46 BF B0 63 01 3F 59 AC 34 C9 7A 02 1A B9 6A 28 A4 2C 08'
-      },
-      parse808Result: '',
-      analyze808Result: '',
-      parse809Result: '',
-      parse1078Result: '',
-      apiUrl: 'https://jttools.smallchi.cn/api'
-      // apiUrl: 'http://localhost:18888/api'
-    }
-  },
-  mounted () {},
-  methods: {
-    parse808Click () {
-      if (!this.parse808Parameter) return
-      this.$Loading.start()
-      axios
-        .post(this.apiUrl + '/JTTools/Parse808', this.parse808Parameter)
-        .then(response => {
-          if (response.data.Code === 200) {
-            this.parse808Result = response.data.Data
-          } else {
-            this.parse808Result = response.data.Message
-          }
-          this.$Loading.finish()
-        })
-        .catch(error => {
-          this.parse808Result = JSON.stringify(error)
-          this.$Loading.error()
-        })
-    },
-    analyze808Click () {
-      if (!this.analyze808arameter) return
-      this.$Loading.start()
-      axios
-        .post(this.apiUrl + '/JTTools/Analyze808', this.analyze808arameter)
-        .then(response => {
-          if (response.data.Code === 200) {
-            this.analyze808Result = JSON.parse(response.data.Data)
-          } else {
-            this.analyze808Result = response.data.Message
-          }
-          this.$Loading.finish()
-        })
-        .catch(error => {
-          this.analyze808Result = JSON.stringify(error)
-          this.$Loading.error()
-        })
-    },
-    parse809Click () {
-      if (!this.parse809Parameter) return
-      this.$Loading.start()
-      axios
-        .post(this.apiUrl + '/JTTools/Parse809', this.parse809Parameter)
-        .then(response => {
-          if (response.data.Code === 200) {
-            this.parse809Result = response.data.Data
-          } else {
-            this.parse809Result = response.data.Message
-          }
-          this.$Loading.finish()
-        })
-        .catch(error => {
-          this.parse809Result = JSON.stringify(error)
-          this.$Loading.error()
-        })
-    },
-    parse1078Click () {
-      if (!this.parse1078Parameter) return
-      this.$Loading.start()
-      axios
-        .post(this.apiUrl + '/JTTools/Parse1078', this.parse1078Parameter)
-        .then(response => {
-          if (response.data.Code === 200) {
-            this.parse1078Result = response.data.Data
-          } else {
-            this.parse1078Result = response.data.Message
-          }
-          this.$Loading.finish()
-        })
-        .catch(error => {
-          this.parse1078Result = JSON.stringify(error)
-          this.$Loading.error()
-        })
-    }
-  }
-}
-</script>
-
-<style scope>
-.layout {
-  border: 1px solid #d7dde4;
-  background: #f5f7f9;
-  position: relative;
-  border-radius: 0px;
-  overflow: hidden;
-}
-
-.ivu-layout {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-flex: 1;
-  -ms-flex: auto;
-  flex: auto;
-  background: #f5f7f9;
-}
-
-.ivu-layout-header {
-  background: #2e8cf0!important;
-  padding: 0 50px;
-  height: 60px;
-  line-height: 60px;
-}
-.ivu-badge{top: -15px;
-    right: -10px;}
-.ivu-menu-horizontal {
-  height: 60px;
-  line-height: 60px;
-}
-
-.ivu-menu {
-  display: block;
-  margin: 0;
-  padding: 0;
-  outline: 0;
-  list-style: none;
-  color: #515a6e;
-  font-size: 14px;
-  position: relative;
-  z-index: 900;
-}
-
-.ivu-menu a {
-  color: #ccc;
-}
-
-ivu-menu a:hover,
-.ivu-menu-item-active a {
-  color: #fff;
-}
-
-.layout-logo {
-  height: 30px;
-  border-radius: 3px;
-  float: left;
-  position: relative;
-  top: 15px;
-  left: 20px;
-  color: #fff;
-  line-height: 30px;
-  font-size: 24px;
-  font-weight: 400;
-}
-
-.layout-nav {
-  width: 320px;
-  margin: 0 auto;
-  margin-right: 20px;
-  display: flex;
-}
-
-.ivu-menu-item a {
-  display: inline-block;
-}
-
-.ivu-menu-item {
-  font-size: 16px;
-  font-weight: 500;
-}
-.ivu-card-body{
-  padding: 0!important;
-}
-.layout-footer-center {
-  text-align: center;
-}
-
-.pane-content {
-  width: 100%;
-  display: flex;
-  display: -webkit-flex;
-  align-items: center;
-  justify-content: center;
-  height: calc(100vh - 210px);
-  padding: 20px 20px;
-}
-
-.ivu-tabs-bar {
-  margin-bottom: 0!important;
-}
-
-.left, .right {
-    width: 45%;
-    height: 100%;
-    display: inline-block;
-    overflow: auto;
-}
-.right {
-    border: 1px solid #ccc;
-    border-radius: 4px;
-}
-.center {
-  width: 10%;
-  display: flex;
-  display: -webkit-flex;
-  align-items: center;
-  justify-content: center;
-}
-
-textarea.ivu-input {
-  max-height: 100%;
-  min-height: 32px;
-  height: 100%!important;
-}
-
-.ivu-input-wrapper {
-  height: 100%;
-}
-
-.ivu-card-body {
-  padding: 0;
-}
-
-.ivu-tabs-nav .ivu-tabs-tab {
-  padding: 16px!important;
-  /*margin-right: 0px;*/
-}
-
-.ivu-tabs-nav .ivu-tabs-tab-active {
-  color: #2d8cf0;
-  background: #f0faff;
-}
-
-@media (max-width: 1024px) {
-  .left,
-  .right {
-    width: 40%;
-  }
-
-  .center {
-    width: 20%;
-  }
-}
-</style>

src/ui/jttools/src/main.js

@@ -1,15 +0,0 @@
-import Vue from 'vue'
-import App from './App'
-import iView from 'iview'
-import JsonViewer from 'vue-json-viewer'
-import 'iview/dist/styles/iview.css'
-import 'vue-json-viewer/style.css'
-
-Vue.config.productionTip = false
-Vue.use(iView)
-Vue.use(JsonViewer)
-/* eslint-disable no-new */
-new Vue({
-  el: '#app',
-  render: h => h(App)
-})