diff --git a/src/JTTools/JTTools.csproj b/src/JTTools/JTTools.csproj index 017d55b..d759cf7 100644 --- a/src/JTTools/JTTools.csproj +++ b/src/JTTools/JTTools.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/JTTools/Pages/Index.razor b/src/JTTools/Pages/Index.razor index e0795fa..58c60fc 100644 --- a/src/JTTools/Pages/Index.razor +++ b/src/JTTools/Pages/Index.razor @@ -1,5 +1,7 @@ @page "/" -

JTTools

-JT808、JT809、JT1078、JT19056、JTNE(新能源)、主动安全(苏标)解析工具 +
+

JTTools(alpha)

+

JT808、JT809、JT1078、JT19056、JTNE(新能源)、主动安全(苏标)解析工具

+
diff --git a/src/JTTools/Pages/JT1078Parse.razor b/src/JTTools/Pages/JT1078Parse.razor index a5c6d28..09b6947 100644 --- a/src/JTTools/Pages/JT1078Parse.razor +++ b/src/JTTools/Pages/JT1078Parse.razor @@ -8,7 +8,9 @@
- +
+         @Json
+    
@code { diff --git a/src/JTTools/Pages/JT19056Analyze.razor b/src/JTTools/Pages/JT19056Analyze.razor index 0f54b4b..d979f85 100644 --- a/src/JTTools/Pages/JT19056Analyze.razor +++ b/src/JTTools/Pages/JT19056Analyze.razor @@ -12,7 +12,9 @@
- +
+         @Json
+    
@code { diff --git a/src/JTTools/Pages/JT808Analyze.razor b/src/JTTools/Pages/JT808Analyze.razor index 9d6be8b..34ba894 100644 --- a/src/JTTools/Pages/JT808Analyze.razor +++ b/src/JTTools/Pages/JT808Analyze.razor @@ -10,7 +10,7 @@ @inject JT808_JT1078_Config jT808_JT1078_Config @inject JT808_JTActiveSafety_Config jT808_JTActiveSafety_Config - @@ -20,7 +20,9 @@
- +
+         @Json
+    
@code { diff --git a/src/JTTools/Pages/JT809Parse.razor b/src/JTTools/Pages/JT809Parse.razor index 13ea0dc..06a4529 100644 --- a/src/JTTools/Pages/JT809Parse.razor +++ b/src/JTTools/Pages/JT809Parse.razor @@ -3,13 +3,30 @@ @using JT809.Protocol; @using JT809.Protocol.Extensions; @using Newtonsoft.Json; +@using JT809.Protocol.Configs; +@using JT809.Protocol.Interfaces; @inject IJT809Config Config + + +@if (encryptType == "encrypt") +{ +
+ + + +
+}
- +
+         @Json
+    
@code { @@ -19,14 +36,44 @@ private string Json; + string encryptType = "none"; + + JT809EncryptOptions EncryptOptions; + + private void OnSelectEncryptType(ChangeEventArgs e) + { + encryptType = e.Value.ToString(); + } + protected override void OnInitialized() { Serializer = Config.GetSerializer(); + EncryptOptions = new JT809EncryptOptions(); } private void Query() { var data = HexData.ToHexBytes(); - Json = JsonConvert.SerializeObject(Serializer.Deserialize(data), Formatting.Indented); + 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); + } + } + + class JT809Config : JT809GlobalConfigBase + { + public JT809Config(string configId) + { + ConfigId = configId; + } + + public override string ConfigId { get; } } } diff --git a/src/JTTools/Shared/Alert.razor b/src/JTTools/Shared/Alert.razor new file mode 100644 index 0000000..fdf5810 --- /dev/null +++ b/src/JTTools/Shared/Alert.razor @@ -0,0 +1,13 @@ + + +@code { + [Parameter] + public string Title { get; set; } + [Parameter] + public string ErrorMessage { get; set; } +}