Browse Source

1.修改错误提示弹框

2.增加BlazorStrap库的引用
master
SmallChi(Koike) 5 years ago
parent
commit
c5a6b95e4d
9 changed files with 129 additions and 50 deletions
  1. +1
    -0
      src/JTTools/JTTools.csproj
  2. +1
    -1
      src/JTTools/Pages/Index.razor
  3. +24
    -3
      src/JTTools/Pages/JT1078Parse.razor
  4. +33
    -10
      src/JTTools/Pages/JT19056Analyze.razor
  5. +36
    -13
      src/JTTools/Pages/JT808Analyze.razor
  6. +31
    -9
      src/JTTools/Pages/JT809Parse.razor
  7. +2
    -1
      src/JTTools/Program.cs
  8. +0
    -13
      src/JTTools/Shared/Alert.razor
  9. +1
    -0
      src/JTTools/_Imports.razor

+ 1
- 0
src/JTTools/JTTools.csproj View File

@@ -7,6 +7,7 @@
</PropertyGroup> </PropertyGroup>


<ItemGroup> <ItemGroup>
<PackageReference Include="BlazorStrap" Version="1.3.1" />
<PackageReference Include="JT1078" Version="1.0.2" /> <PackageReference Include="JT1078" Version="1.0.2" />
<PackageReference Include="JT808" Version="2.2.10" /> <PackageReference Include="JT808" Version="2.2.10" />
<PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.2.9" /> <PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.2.9" />


+ 1
- 1
src/JTTools/Pages/Index.razor View File

@@ -2,6 +2,6 @@




<div class="jumbotron"> <div class="jumbotron">
<h1 class="display-4">JTTools(alpha)</h1>
<h1 class="display-5">JTTools(alpha)</h1>
<p class="lead">JT808、JT809、JT1078、JT19056、JTNE(新能源)、主动安全(苏标)解析工具</p> <p class="lead">JT808、JT809、JT1078、JT19056、JTNE(新能源)、主动安全(苏标)解析工具</p>
</div> </div>

+ 24
- 3
src/JTTools/Pages/JT1078Parse.razor View File

@@ -5,7 +5,9 @@
@using Newtonsoft.Json; @using Newtonsoft.Json;


<button class="btn btn-primary" @onclick="Query">解析</button> <button class="btn btn-primary" @onclick="Query">解析</button>

<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
@ErrerMessage
</BSAlert>
<div class="right"> <div class="right">
<textarea class="form-control" @bind="HexData" rows="10"></textarea> <textarea class="form-control" @bind="HexData" rows="10"></textarea>
<pre> <pre>
@@ -19,10 +21,29 @@


private string Json; private string Json;


private string ErrerMessage;

private bool isOpen = false;

void OnDismiss()
{
isOpen = !isOpen;
StateHasChanged();
}


private void Query() private void Query()
{ {
var data = HexData.ToHexBytes();
Json = JsonConvert.SerializeObject(JT1078Serializer.Deserialize(data), Formatting.Indented);
try
{
isOpen = false;
var data = HexData.ToHexBytes();
Json = JsonConvert.SerializeObject(JT1078Serializer.Deserialize(data), Formatting.Indented);
}
catch (Exception ex)
{
isOpen = !isOpen;
Json = "";
ErrerMessage = ex.StackTrace;
}
} }
} }

+ 33
- 10
src/JTTools/Pages/JT19056Analyze.razor View File

@@ -5,11 +5,14 @@
@using JTTools.Configs; @using JTTools.Configs;
@inject IJT808Config Config @inject IJT808Config Config


<select class="btn-success" @onchange="@OnSelectWayType">
<select class="form-control" @onchange="@OnSelectWayType">
<option value="up">上行</option> <option value="up">上行</option>
<option value="down">下行</option> <option value="down">下行</option>
</select> </select>
<button class="btn btn-primary" @onclick="Query">分析</button> <button class="btn btn-primary" @onclick="Query">分析</button>
<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
@ErrerMessage
</BSAlert>
<div class="right"> <div class="right">
<textarea class="form-control" @bind="HexData" rows="10"></textarea> <textarea class="form-control" @bind="HexData" rows="10"></textarea>
<pre> <pre>
@@ -46,6 +49,16 @@


private string Json; private string Json;


private string ErrerMessage;

private bool isOpen = false;

void OnDismiss()
{
isOpen = !isOpen;
StateHasChanged();
}

protected override void OnInitialized() protected override void OnInitialized()
{ {
Serializer = Config.GetCarDVRSerializer(); Serializer = Config.GetCarDVRSerializer();
@@ -53,15 +66,25 @@


private void Query() private void Query()
{ {
var data = HexData.ToHexBytes();
switch (wayType)
try
{ {
case "up":
Json = Serializer.UpAnalyze(data, options: JTJsonWriterOptions.Instance);
break;
case "down":
Json = Serializer.DownAnalyze(data, options: JTJsonWriterOptions.Instance);
break;
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;
} }
} }
}
}

+ 36
- 13
src/JTTools/Pages/JT808Analyze.razor View File

@@ -17,11 +17,13 @@
</select> </select>


<button class="btn btn-primary" @onclick="Query">分析</button> <button class="btn btn-primary" @onclick="Query">分析</button>

<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
@ErrerMessage
</BSAlert>
<div class="right"> <div class="right">
<textarea class="form-control" @bind="HexData" rows="10"></textarea> <textarea class="form-control" @bind="HexData" rows="10"></textarea>
<pre> <pre>
@Json
@Json
</pre> </pre>
</div> </div>


@@ -39,6 +41,16 @@


private string Json; private string Json;


private string ErrerMessage;

private bool isOpen = false;

void OnDismiss()
{
isOpen = !isOpen;
StateHasChanged();
}

private void OnSelectProtocolType(ChangeEventArgs e) private void OnSelectProtocolType(ChangeEventArgs e)
{ {
protocolType = e.Value.ToString(); protocolType = e.Value.ToString();
@@ -53,18 +65,29 @@


private void Query() private void Query()
{ {
var data = HexData.ToHexBytes();
switch (protocolType)
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 (Exception ex)
{ {
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;
isOpen = !isOpen;
Json = "";
ErrerMessage = ex.StackTrace;
} }
} }
} }

+ 31
- 9
src/JTTools/Pages/JT809Parse.razor View File

@@ -21,7 +21,9 @@
</div> </div>
} }
<button class="btn btn-primary" @onclick="Query">解析</button> <button class="btn btn-primary" @onclick="Query">解析</button>

<BSAlert Color="Color.Danger" IsOpen="@isOpen" IsDismissible="true" OnDismiss="@OnDismiss">
@ErrerMessage
</BSAlert>
<div class="right"> <div class="right">
<textarea class="form-control" @bind="HexData" rows="10"></textarea> <textarea class="form-control" @bind="HexData" rows="10"></textarea>
<pre> <pre>
@@ -40,6 +42,16 @@


JT809EncryptOptions EncryptOptions; JT809EncryptOptions EncryptOptions;


private string ErrerMessage;

private bool isOpen = false;

void OnDismiss()
{
isOpen = !isOpen;
StateHasChanged();
}

private void OnSelectEncryptType(ChangeEventArgs e) private void OnSelectEncryptType(ChangeEventArgs e)
{ {
encryptType = e.Value.ToString(); encryptType = e.Value.ToString();
@@ -53,17 +65,27 @@


private void Query() private void Query()
{ {
var data = HexData.ToHexBytes();
if (encryptType == "none")
try
{ {
Json = JsonConvert.SerializeObject(Serializer.Deserialize(data), Formatting.Indented);
isOpen = false;
var data = HexData.ToHexBytes();
if (encryptType == "none")
{
Json = JsonConvert.SerializeObject(Serializer.Deserialize(data), Formatting.Indented);
}
else
{
IJT809Config jt809ConfigInternal = new JT809Config(Guid.NewGuid().ToString());
jt809ConfigInternal.EncryptOptions = EncryptOptions;
JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal);
Json = JsonConvert.SerializeObject(jT809SerializerInternal.Deserialize(data), Formatting.Indented);
}
} }
else
catch(Exception ex)
{ {
IJT809Config jt809ConfigInternal = new JT809Config(Guid.NewGuid().ToString());
jt809ConfigInternal.EncryptOptions = EncryptOptions;
JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal);
Json = JsonConvert.SerializeObject(jT809SerializerInternal.Deserialize(data), Formatting.Indented);
isOpen = !isOpen;
Json = "";
ErrerMessage = ex.StackTrace;
} }
} }




+ 2
- 1
src/JTTools/Program.cs View File

@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using JTTools.Configs; using JTTools.Configs;
using BlazorStrap;


namespace JTTools namespace JTTools
{ {
@@ -46,7 +47,7 @@ namespace JTTools
.AllowAnyMethod() .AllowAnyMethod()
.AllowAnyHeader() .AllowAnyHeader()
.AllowAnyOrigin())); .AllowAnyOrigin()));
services.AddBootstrapCss();
}) })
.ConfigureKestrel(ksOptions => .ConfigureKestrel(ksOptions =>
{ {


+ 0
- 13
src/JTTools/Shared/Alert.razor View File

@@ -1,13 +0,0 @@
<div class="alert alert-warning alert-dismissible fade show" role="alert">
<strong>@Title</strong>@ErrorMessage
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>

@code {
[Parameter]
public string Title { get; set; }
[Parameter]
public string ErrorMessage { get; set; }
}

+ 1
- 0
src/JTTools/_Imports.razor View File

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

Loading…
Cancel
Save