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());
- }
- }
-}
diff --git a/src/JTTools/Pages/Counter.razor b/src/JTTools/Pages/Counter.razor
deleted file mode 100644
index 8641f78..0000000
--- a/src/JTTools/Pages/Counter.razor
+++ /dev/null
@@ -1,16 +0,0 @@
-@page "/counter"
-
-Counter
-
-Current count: @currentCount
-
-
-
-@code {
- private int currentCount = 0;
-
- private void IncrementCount()
- {
- currentCount++;
- }
-}
diff --git a/src/JTTools/Pages/FetchData.razor b/src/JTTools/Pages/FetchData.razor
deleted file mode 100644
index 4a26e96..0000000
--- a/src/JTTools/Pages/FetchData.razor
+++ /dev/null
@@ -1,46 +0,0 @@
-@page "/fetchdata"
-
-@using JTTools.Data
-@inject WeatherForecastService ForecastService
-
-Weather forecast
-
-This component demonstrates fetching data from a service.
-
-@if (forecasts == null)
-{
- Loading...
-}
-else
-{
-
-
-
- | Date |
- Temp. (C) |
- Temp. (F) |
- Summary |
-
-
-
- @foreach (var forecast in forecasts)
- {
-
- | @forecast.Date.ToShortDateString() |
- @forecast.TemperatureC |
- @forecast.TemperatureF |
- @forecast.Summary |
-
- }
-
-
-}
-
-@code {
- private WeatherForecast[] forecasts;
-
- protected override async Task OnInitializedAsync()
- {
- forecasts = await ForecastService.GetForecastAsync(DateTime.Now);
- }
-}
diff --git a/src/JTTools/Pages/JT1078Parse.razor b/src/JTTools/Pages/JT1078Parse.razor
new file mode 100644
index 0000000..fa96a45
--- /dev/null
+++ b/src/JTTools/Pages/JT1078Parse.razor
@@ -0,0 +1,30 @@
+@page "/jt1078"
+
+@using JT1078.Protocol;
+@using JT1078.Protocol.Extensions;
+@using Newtonsoft.Json;
+
+
+JT1078Parse
+
+Hex: @HexData
+
+
+
+
+ @Json
+
+
+@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 void Query()
+ {
+ var data = HexData.ToHexBytes();
+ Json = JsonConvert.SerializeObject(JT1078Serializer.Deserialize(data));
+ }
+}
diff --git a/src/JTTools/Pages/JT19056Analyze.razor b/src/JTTools/Pages/JT19056Analyze.razor
new file mode 100644
index 0000000..3ab24fd
--- /dev/null
+++ b/src/JTTools/Pages/JT19056Analyze.razor
@@ -0,0 +1,48 @@
+@page "/jt19056analyze"
+
+@using JT808.Protocol;
+@using JT808.Protocol.Extensions;
+@using Newtonsoft.Json;
+@inject IJT808Config Config
+
+jt808analyze
+
+Up Hex: @UpHexData
+Down Hex: @DownHexData
+
+
+
+
+
+ @UpJson
+
+ @DownJson
+
+
+@code {
+ private JT808CarDVRSerializer Serializer;
+
+ private string UpHexData = "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 DownHexData = "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 UpJson;
+ private string DownJson;
+
+ protected override void OnInitialized()
+ {
+ Serializer = Config.GetCarDVRSerializer();
+ }
+
+ private void UpQuery()
+ {
+ var data = UpHexData.ToHexBytes();
+ UpJson = Serializer.UpAnalyze(data);
+ }
+
+ private void DownQuery()
+ {
+ var data = DownHexData.ToHexBytes();
+ DownJson = Serializer.UpAnalyze(data);
+ }
+
+}
diff --git a/src/JTTools/Pages/JT808Analyze.razor b/src/JTTools/Pages/JT808Analyze.razor
index 957b7cf..0c666bb 100644
--- a/src/JTTools/Pages/JT808Analyze.razor
+++ b/src/JTTools/Pages/JT808Analyze.razor
@@ -3,10 +3,17 @@
@using JT808.Protocol;
@using JT808.Protocol.Extensions;
@using Newtonsoft.Json;
-@inject IJT808Config JT808Config
+@inject IJT808Config Config
jt808analyze
+@**@
+
+@protocolType
Hex: @HexData
@@ -15,16 +22,29 @@
@Json
+@functions {
+ string selectedString = "JT808";
+
+ void DoStuff(ChangeEventArgs e)
+ {
+ selectedString = e.Value.ToString();
+ Console.WriteLine("It is definitely: " + selectedString);
+ }
+}
+
@code {
+
private JT808Serializer Serializer;
+ 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;
protected override void OnInitialized()
{
- Serializer = JT808Config.GetSerializer();
+ Serializer = Config.GetSerializer();
}
private void Query()
diff --git a/src/JTTools/Pages/JT808Parse.razor b/src/JTTools/Pages/JT808Parse.razor
index 4a375cc..dca7815 100644
--- a/src/JTTools/Pages/JT808Parse.razor
+++ b/src/JTTools/Pages/JT808Parse.razor
@@ -3,7 +3,7 @@
@using JT808.Protocol;
@using JT808.Protocol.Extensions;
@using Newtonsoft.Json;
-@inject IJT808Config JT808Config
+@inject IJT808Config Config
JT808Parse
@@ -24,7 +24,7 @@
protected override void OnInitialized()
{
- Serializer = JT808Config.GetSerializer();
+ Serializer = Config.GetSerializer();
}
private void Query()
diff --git a/src/JTTools/Pages/JT809Parse.razor b/src/JTTools/Pages/JT809Parse.razor
new file mode 100644
index 0000000..b646da9
--- /dev/null
+++ b/src/JTTools/Pages/JT809Parse.razor
@@ -0,0 +1,35 @@
+@page "/jt809"
+
+@using JT809.Protocol;
+@using JT809.Protocol.Extensions;
+@using Newtonsoft.Json;
+@inject IJT809Config Config
+
+JT809Parse
+
+Hex: @HexData
+
+
+
+
+ @Json
+
+
+@code {
+ private JT809Serializer Serializer;
+
+ private string 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";
+
+ private string Json;
+
+ protected override void OnInitialized()
+ {
+ Serializer = Config.GetSerializer();
+ }
+
+ private void Query()
+ {
+ var data = HexData.ToHexBytes();
+ Json = JsonConvert.SerializeObject(Serializer.Deserialize(data));
+ }
+}
diff --git a/src/JTTools/Program.cs b/src/JTTools/Program.cs
index 8592311..d96cf7d 100644
--- a/src/JTTools/Program.cs
+++ b/src/JTTools/Program.cs
@@ -17,7 +17,6 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.HttpsPolicy;
using Microsoft.Extensions.DependencyInjection;
-using JTTools.Data;
using Newtonsoft.Json.Serialization;
namespace JTTools
@@ -33,7 +32,6 @@ namespace JTTools
{
services.AddRazorPages();
services.AddServerSideBlazor();
- services.AddSingleton();
services.AddControllers()
//Microsoft.AspNetCore.Mvc.NewtonsoftJson
.AddNewtonsoftJson(jsonOptions =>
diff --git a/src/JTTools/Shared/NavMenu.razor b/src/JTTools/Shared/NavMenu.razor
index 5d3377d..6e1a6c5 100644
--- a/src/JTTools/Shared/NavMenu.razor
+++ b/src/JTTools/Shared/NavMenu.razor
@@ -13,23 +13,23 @@
-
- JT808解析工具
+
+ JT808分析工具
-
+
-
- JT808分析工具
+
+ JT809解析工具
-
- Counter
+
+ JT1078解析工具
-
- Fetch data
+
+ JT19056分析工具
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 02/23] =?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
jt808analyze
-@*
@protocolType
+
Hex: @HexData
@@ -22,19 +25,11 @@
@Json
-@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();
})
From a185ce942bac5a8e0af35f80ffd8721e2b4bcd1e Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Tue, 7 Apr 2020 18:14:33 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=84=E4=B8=AA?=
=?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/JTTools/Configs/JTJsonWriterOptions.cs | 22 +++++++
src/JTTools/Pages/Index.razor | 6 +-
src/JTTools/Pages/JT1078Parse.razor | 10 +---
src/JTTools/Pages/JT19056Analyze.razor | 69 ++++++++++++++--------
src/JTTools/Pages/JT808Analyze.razor | 22 +++----
src/JTTools/Pages/JT808Parse.razor | 35 -----------
src/JTTools/Pages/JT809Parse.razor | 9 +--
src/JTTools/Shared/NavMenu.razor | 12 ++--
8 files changed, 90 insertions(+), 95 deletions(-)
create mode 100644 src/JTTools/Configs/JTJsonWriterOptions.cs
delete mode 100644 src/JTTools/Pages/JT808Parse.razor
diff --git a/src/JTTools/Configs/JTJsonWriterOptions.cs b/src/JTTools/Configs/JTJsonWriterOptions.cs
new file mode 100644
index 0000000..260a8d6
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 汉字编码
+ ///
+ public readonly static JsonWriterOptions Instance = new System.Text.Json.JsonWriterOptions
+ {
+ Indented = true,
+ Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+ };
+ }
+}
diff --git a/src/JTTools/Pages/Index.razor b/src/JTTools/Pages/Index.razor
index e54d914..e0795fa 100644
--- a/src/JTTools/Pages/Index.razor
+++ b/src/JTTools/Pages/Index.razor
@@ -1,7 +1,5 @@
@page "/"
-Hello, world!
+JTTools
-Welcome to your new app.
-
-
+JT808、JT809、JT1078、JT19056、JTNE（新能源）、主动安全（苏标）解析工具
diff --git a/src/JTTools/Pages/JT1078Parse.razor b/src/JTTools/Pages/JT1078Parse.razor
index fa96a45..a5c6d28 100644
--- a/src/JTTools/Pages/JT1078Parse.razor
+++ b/src/JTTools/Pages/JT1078Parse.razor
@@ -4,15 +4,11 @@
@using JT1078.Protocol.Extensions;
@using Newtonsoft.Json;
-
-JT1078Parse
-
-Hex: @HexData
-
- @Json
+
+
@code {
@@ -25,6 +21,6 @@
private void Query()
{
var data = HexData.ToHexBytes();
- Json = JsonConvert.SerializeObject(JT1078Serializer.Deserialize(data));
+ Json = JsonConvert.SerializeObject(JT1078Serializer.Deserialize(data), Formatting.Indented);
}
}
diff --git a/src/JTTools/Pages/JT19056Analyze.razor b/src/JTTools/Pages/JT19056Analyze.razor
index 3ab24fd..b134f05 100644
--- a/src/JTTools/Pages/JT19056Analyze.razor
+++ b/src/JTTools/Pages/JT19056Analyze.razor
@@ -1,48 +1,65 @@
-@page "/jt19056analyze"
+@page "/jt19056"
@using JT808.Protocol;
@using JT808.Protocol.Extensions;
-@using Newtonsoft.Json;
+@using JTTools.Configs;
@inject IJT808Config Config
-jt808analyze
-
-Up Hex: @UpHexData
-Down Hex: @DownHexData
-
-
-
-
+
+
- @UpJson
-
- @DownJson
+
+
@code {
private JT808CarDVRSerializer Serializer;
- private string UpHexData = "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 DownHexData = "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 static string UpHexData = "55 7A C4 00 00 00 EB";
- private string UpJson;
- private string DownJson;
+ 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";
- protected override void OnInitialized()
+ private string HexData = UpHexData;
+
+ string wayType = "up";
+
+ private void OnSelectWayType(ChangeEventArgs e)
{
- Serializer = Config.GetCarDVRSerializer();
+ wayType = e.Value.ToString();
+ switch (wayType)
+ {
+ case "up":
+ HexData = UpHexData;
+ break;
+ case "down":
+ HexData = DownHexData;
+ break;
+ }
}
- private void UpQuery()
+ private string Json;
+
+ protected override void OnInitialized()
{
- var data = UpHexData.ToHexBytes();
- UpJson = Serializer.UpAnalyze(data);
+ Serializer = Config.GetCarDVRSerializer();
}
- private void DownQuery()
+ private void Query()
{
- var data = DownHexData.ToHexBytes();
- DownJson = Serializer.UpAnalyze(data);
+ var data = HexData.ToHexBytes();
+ switch (wayType)
+ {
+ case "up":
+#warning UpAnalyze bug
+ Json = Serializer.UpAnalyze(data, options: JTJsonWriterOptions.Instance);
+ break;
+ case "down":
+#warning DownAnalyze bug
+ Json = Serializer.DownAnalyze(data, options: JTJsonWriterOptions.Instance);
+ break;
+ }
}
-
}
diff --git a/src/JTTools/Pages/JT808Analyze.razor b/src/JTTools/Pages/JT808Analyze.razor
index b52a0e7..9d6be8b 100644
--- a/src/JTTools/Pages/JT808Analyze.razor
+++ b/src/JTTools/Pages/JT808Analyze.razor
@@ -1,13 +1,14 @@
-@page "/jt808analyze"
+@page "/jt808"
@using JT808.Protocol;
@using JT808.Protocol.Extensions;
-@using Newtonsoft.Json;
@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
-jt808analyze
-@protocolType
-
-Hex: @HexData
-
- @Json
+
+
@code {
private JT808Serializer Serializer;
+
private JT808Serializer JTAS_Serializer;
+
private JT808Serializer JT1078Serializer;
string protocolType = "JT808";
@@ -55,13 +55,13 @@
switch (protocolType)
{
case "JT808":
- Json = Serializer.Analyze(data);
+ Json = Serializer.Analyze(data,options: JTJsonWriterOptions.Instance);
break;
case "JT808_JT1078":
- Json = JT1078Serializer.Analyze(data);
+ Json = JT1078Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
break;
case "JT808_JTAS":
- Json = JTAS_Serializer.Analyze(data);
+ Json = JTAS_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
break;
}
}
diff --git a/src/JTTools/Pages/JT808Parse.razor b/src/JTTools/Pages/JT808Parse.razor
deleted file mode 100644
index dca7815..0000000
--- a/src/JTTools/Pages/JT808Parse.razor
+++ /dev/null
@@ -1,35 +0,0 @@
-@page "/jt808"
-
-@using JT808.Protocol;
-@using JT808.Protocol.Extensions;
-@using Newtonsoft.Json;
-@inject IJT808Config Config
-
-JT808Parse
-
-Hex: @HexData
-
-
-
-
- @Json
-
-
-@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 = Config.GetSerializer();
- }
-
- private void Query()
- {
- var data = HexData.ToHexBytes();
- Json = JsonConvert.SerializeObject(Serializer.Deserialize(data));
- }
-}
diff --git a/src/JTTools/Pages/JT809Parse.razor b/src/JTTools/Pages/JT809Parse.razor
index b646da9..13ea0dc 100644
--- a/src/JTTools/Pages/JT809Parse.razor
+++ b/src/JTTools/Pages/JT809Parse.razor
@@ -5,14 +5,11 @@
@using Newtonsoft.Json;
@inject IJT809Config Config
-JT809Parse
-
-Hex: @HexData
-
- @Json
+
+
@code {
@@ -30,6 +27,6 @@
private void Query()
{
var data = HexData.ToHexBytes();
- Json = JsonConvert.SerializeObject(Serializer.Deserialize(data));
+ Json = JsonConvert.SerializeObject(Serializer.Deserialize(data), Formatting.Indented);
}
}
diff --git a/src/JTTools/Shared/NavMenu.razor b/src/JTTools/Shared/NavMenu.razor
index 6e1a6c5..4fc55fe 100644
--- a/src/JTTools/Shared/NavMenu.razor
+++ b/src/JTTools/Shared/NavMenu.razor
@@ -13,23 +13,23 @@
-
- JT808分析工具
+
+ JT808分析工具
- JT809解析工具
+ JT809解析工具
- JT1078解析工具
+ JT1078解析工具
-
- JT19056分析工具
+
+ JT19056分析工具
From 60ec28771ae1edc19fe62d1f59226db833b78d1c Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Fri, 10 Apr 2020 18:14:21 +0800
Subject: [PATCH 04/23] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7=E5=90=84=E4=B8=AA?=
=?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=BA=93=202.=E5=A2=9E=E5=8A=A0=E5=A4=87?=
=?UTF-8?q?=E6=A1=88=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/JTTools/JTTools.csproj | 6 +++---
src/JTTools/Pages/JT19056Analyze.razor | 4 ++--
src/JTTools/Pages/_Host.cshtml | 5 +++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/JTTools/JTTools.csproj b/src/JTTools/JTTools.csproj
index 4311907..017d55b 100644
--- a/src/JTTools/JTTools.csproj
+++ b/src/JTTools/JTTools.csproj
@@ -8,9 +8,9 @@
-
-
-
+
+
+
diff --git a/src/JTTools/Pages/JT19056Analyze.razor b/src/JTTools/Pages/JT19056Analyze.razor
index b134f05..0f54b4b 100644
--- a/src/JTTools/Pages/JT19056Analyze.razor
+++ b/src/JTTools/Pages/JT19056Analyze.razor
@@ -33,9 +33,11 @@
{
case "up":
HexData = UpHexData;
+ Json = "";
break;
case "down":
HexData = DownHexData;
+ Json = "";
break;
}
}
@@ -53,11 +55,9 @@
switch (wayType)
{
case "up":
-#warning UpAnalyze bug
Json = Serializer.UpAnalyze(data, options: JTJsonWriterOptions.Instance);
break;
case "down":
-#warning DownAnalyze bug
Json = Serializer.DownAnalyze(data, options: JTJsonWriterOptions.Instance);
break;
}
diff --git a/src/JTTools/Pages/_Host.cshtml b/src/JTTools/Pages/_Host.cshtml
index 77221dd..e5d52c7 100644
--- a/src/JTTools/Pages/_Host.cshtml
+++ b/src/JTTools/Pages/_Host.cshtml
@@ -32,8 +32,9 @@
Reload
🗙
-
- Copyright © 2015-2019 SmallChi. All Rights Reserved. 粤ICP备19128140号
+