From e8360f38ba3f579d3ca39c4996e337313ebd31e9 Mon Sep 17 00:00:00 2001
From: "SmallChi(Koike)" <564952747@qq.com>
Date: Sat, 10 Oct 2020 15:13:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E8=9A=82=E8=9A=81UI?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=202.=E5=A2=9E=E5=8A=A0=E9=94=90=E6=98=8EJT80?=
 =?UTF-8?q?8=E5=85=AC=E4=BA=A4=E4=B8=9A=E5=8A=A1=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/JTTools/Configs/JT808_Streamax_Config.cs | 13 ++++
 src/JTTools/JTTools.csproj                   |  1 +
 src/JTTools/Pages/Index.razor                |  3 +-
 src/JTTools/Pages/JT1078Pack.razor           | 23 ++++---
 src/JTTools/Pages/JT1078Parse.razor          | 13 ++--
 src/JTTools/Pages/JT19056Analyze.razor       | 29 +++++----
 src/JTTools/Pages/JT808Analyze.razor         | 16 +++--
 src/JTTools/Pages/JT809Analyze.razor         | 67 ++++++++++++--------
 src/JTTools/Program.cs                       |  3 +
 src/JTTools/Shared/MainLayout.razor          |  2 +-
 10 files changed, 108 insertions(+), 62 deletions(-)
 create mode 100644 src/JTTools/Configs/JT808_Streamax_Config.cs

diff --git a/src/JTTools/Configs/JT808_Streamax_Config.cs b/src/JTTools/Configs/JT808_Streamax_Config.cs
new file mode 100644
index 0000000..8794aca
--- /dev/null
+++ b/src/JTTools/Configs/JT808_Streamax_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_Streamax_Config : GlobalConfigBase
+    {
+        public override string ConfigId { get; protected set; } = "JT808_Streamax_Config";
+    }
+}
diff --git a/src/JTTools/JTTools.csproj b/src/JTTools/JTTools.csproj
index 63d2fcc..4e80654 100644
--- a/src/JTTools/JTTools.csproj
+++ b/src/JTTools/JTTools.csproj
@@ -12,6 +12,7 @@
     <PackageReference Include="JT808" Version="2.2.12" />
     <PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.2.12" />
     <PackageReference Include="JT808.Protocol.Extensions.JTActiveSafety" Version="1.0.4" />
+    <PackageReference Include="JT808.Protocol.Extensions.Streamax" Version="0.1.2" />
     <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.8" />
diff --git a/src/JTTools/Pages/Index.razor b/src/JTTools/Pages/Index.razor
index 8ce7107..d103ae9 100644
--- a/src/JTTools/Pages/Index.razor
+++ b/src/JTTools/Pages/Index.razor
@@ -2,7 +2,8 @@
 
 <Title Level="1">JTTools</Title>
 <Paragraph>
+    <Title Level="3">JT808、JT809、JT1078、JT19056、JTNE（新能源）、主动安全（苏标）解析工具</Title>
     <Text>
-        JT808、JT809、JT1078、JT19056、JTNE（新能源）、主动安全（苏标）解析工具
+        <Badge Color="red" />支持锐明808公交业务扩展协议
     </Text>
 </Paragraph>
\ No newline at end of file
diff --git a/src/JTTools/Pages/JT1078Pack.razor b/src/JTTools/Pages/JT1078Pack.razor
index e698594..ea0accd 100644
--- a/src/JTTools/Pages/JT1078Pack.razor
+++ b/src/JTTools/Pages/JT1078Pack.razor
@@ -1,20 +1,27 @@
 @page "/jt1078pack"
+@using OneOf;
 
-<h3>JT1078扩展808、809组包</h3>
+<Select DefaultValue="@MsgType" @bind-Value="@MsgType" Style="width:200px" OnChange="@OnSelectMsgType">
+    <SelectOption Value="0x9101">808_打开看视频</SelectOption>
+    <SelectOption Value="0x9102">808_关闭看视频</SelectOption>
+</Select>
 
-<select class="form-control" Id="exampleFormControlSelect1" @onchange="@OnSelectMsgType">
-    <option value="0x9101">808_打开看视频</option>
-    <option value="0x9102">808_关闭看视频</option>
-</select>
+<Button Type="primary" @onclick="@Pack">组包</Button>
 
-@MsgType
+待开发
 
 @code {
 
     string MsgType = "0x9101";
 
-    private void OnSelectMsgType(ChangeEventArgs e)
+    private void OnSelectMsgType(OneOf<string, IEnumerable<string>, LabeledValue, IEnumerable<LabeledValue>> value,
+        OneOf<SelectOption, IEnumerable<SelectOption>> option)
     {
-        MsgType = e.Value.ToString();
+        MsgType = value.Value.ToString();
+    }
+
+    private void Pack()
+    {
+        Console.WriteLine("pack");
     }
 }
diff --git a/src/JTTools/Pages/JT1078Parse.razor b/src/JTTools/Pages/JT1078Parse.razor
index 309ca0b..6dd2efc 100644
--- a/src/JTTools/Pages/JT1078Parse.razor
+++ b/src/JTTools/Pages/JT1078Parse.razor
@@ -4,12 +4,14 @@
 @using JT1078.Protocol.Extensions;
 @using JTTools.Configs;
 
-<button class="btn btn-primary" @onclick="Query">解析</button>
-<Alert Type="@AlertType.Error" Closable>
-    @ErrerMessage
-</Alert>
+<Button Type="primary" @onclick="Query">分析</Button>
+
+@if (isOpen)
+{
+    <Alert Type="@AlertType.Error" Description="@ErrerMessage" Closable AfterClose="OnDismiss" />
+}
 <div class="right">
-    <textarea class="form-control" @bind="HexData" rows="10"></textarea>
+    <TextArea AllowClear="true" AutoSize="true" MinRows="10" MaxRows="30" @bind-Value="@HexData" />
     <pre>
          @Json
     </pre>
@@ -28,7 +30,6 @@
     void OnDismiss()
     {
         isOpen = !isOpen;
-        StateHasChanged();
     }
 
     private void Query()
diff --git a/src/JTTools/Pages/JT19056Analyze.razor b/src/JTTools/Pages/JT19056Analyze.razor
index 6f01509..d0f373e 100644
--- a/src/JTTools/Pages/JT19056Analyze.razor
+++ b/src/JTTools/Pages/JT19056Analyze.razor
@@ -4,18 +4,21 @@
 @using JT808.Protocol.Extensions;
 @using JTTools.Configs;
 @inject IJT808Config  Config
+@using OneOf;
 
-<select class="form-control" @onchange="@OnSelectWayType">
-    <option value="up">上行</option>
-    <option value="down">下行</option>
-</select>
-<button class="btn btn-primary" @onclick="Query">分析</button>
+<Select DefaultValue="@wayType" @bind-Value="@wayType" Style="width:100px" OnChange="@OnSelectWayType">
+    <SelectOption Value="up">上行</SelectOption>
+    <SelectOption Value="down">下行</SelectOption>
+</Select>
 
-<Alert Type="@AlertType.Error" Closable>
-    @ErrerMessage
-</Alert>
+<Button Type="primary" @onclick="Query">分析</Button>
+
+@if (isOpen)
+{
+    <Alert Type="@AlertType.Error" Description="@ErrerMessage" Closable AfterClose="OnDismiss" />
+}
 <div class="right">
-    <textarea class="form-control" @bind="HexData" rows="10"></textarea>
+    <TextArea AllowClear="true" AutoSize="true" MinRows="10" MaxRows="30" @bind-Value="@HexData" />
     <pre>
          @Json
     </pre>
@@ -32,9 +35,10 @@
 
     string wayType = "up";
 
-    private void OnSelectWayType(ChangeEventArgs e)
+    private void OnSelectWayType(OneOf<string, IEnumerable<string>, LabeledValue, IEnumerable<LabeledValue>> value,
+        OneOf<SelectOption, IEnumerable<SelectOption>> option)
     {
-        wayType = e.Value.ToString();
+        wayType = value.Value.ToString();
         switch (wayType)
         {
             case "up":
@@ -57,7 +61,6 @@
     void OnDismiss()
     {
         isOpen = !isOpen;
-        StateHasChanged();
     }
 
     protected override void OnInitialized()
@@ -88,4 +91,4 @@
             ErrerMessage = ex.StackTrace;
         }
     }
- }
+}
diff --git a/src/JTTools/Pages/JT808Analyze.razor b/src/JTTools/Pages/JT808Analyze.razor
index 3d6d125..da3b192 100644
--- a/src/JTTools/Pages/JT808Analyze.razor
+++ b/src/JTTools/Pages/JT808Analyze.razor
@@ -10,12 +10,14 @@
 @inject IJT808Config  config
 @inject JT808_JT1078_Config  jT808_JT1078_Config
 @inject JT808_JTActiveSafety_Config  jT808_JTActiveSafety_Config
+@inject JT808_Streamax_Config  jT808_Streamax_Config
 @using OneOf;
 
-<Select DefaultValue=@("JT808") Style="width:200px" OnChange="OnSelectProtocolType">
+<Select DefaultValue="@protocolType" @bind-Value="@protocolType" Style="width:200px" OnChange="@OnSelectProtocolType">
     <SelectOption Value="JT808">国标</SelectOption>
     <SelectOption Value="JT808_JT1078">国标扩展JT1078</SelectOption>
     <SelectOption Value="JT808_JTAS">国标扩展主动安全(苏标)</SelectOption>
+    <SelectOption Value="JT808_JTRM">公交扩展协议(锐明)</SelectOption>
 </Select>
 
 <Button Type="primary" @onclick="Query">分析</Button>
@@ -24,9 +26,7 @@
 
 @if (isOpen)
 {
-    <Alert Type="@AlertType.Error" Closable AfterClose="OnDismiss">
-        @ErrerMessage
-    </Alert>
+    <Alert Type="@AlertType.Error" Description="@ErrerMessage" Closable AfterClose="OnDismiss" />
 }
 
 <div class="right">
@@ -39,6 +39,8 @@
 
     private JT808Serializer Serializer;
 
+    private JT808Serializer JTRM_Serializer;
+
     private JT808Serializer JTAS_Serializer;
 
     private JT808Serializer JT1078Serializer;
@@ -58,7 +60,7 @@
         isOpen = !isOpen;
     }
 
-    private void OnSelectProtocolType(OneOf<string, IEnumerable<string>, LabeledValue, IEnumerable<LabeledValue>> value, 
+    private void OnSelectProtocolType(OneOf<string, IEnumerable<string>, LabeledValue, IEnumerable<LabeledValue>> value,
         OneOf<SelectOption, IEnumerable<SelectOption>> option)
     {
         protocolType = value.Value.ToString();
@@ -69,6 +71,7 @@
         Serializer = config.GetSerializer();
         JT1078Serializer = jT808_JT1078_Config.GetSerializer();
         JTAS_Serializer = jT808_JTActiveSafety_Config.GetSerializer();
+        JTRM_Serializer = jT808_Streamax_Config.GetSerializer();
     }
 
     private void Query()
@@ -88,6 +91,9 @@
                 case "JT808_JTAS":
                     Json = JTAS_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
                     break;
+                case "JT808_JTRM":
+                    Json = JTRM_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance);
+                    break;
             }
         }
         catch (JT808Exception ex)
diff --git a/src/JTTools/Pages/JT809Analyze.razor b/src/JTTools/Pages/JT809Analyze.razor
index 1ac045f..36bc74a 100644
--- a/src/JTTools/Pages/JT809Analyze.razor
+++ b/src/JTTools/Pages/JT809Analyze.razor
@@ -9,36 +9,40 @@
 @using JTTools.Configs;
 @using JT809.Protocol.Enums;
 @using OneOf;
+@using AntDesign;
 @inject JT809_2011_Config  Config2011
 @inject JT809_2019_Config  Config2019
 
-<Select DefaultValue=@("v2011") Style="width:200px" OnSelect="OnSelectVersion">
+<Select DefaultValue="@version" @bind-Value="@version" Style="width:200px" OnChange="@OnSelectVersion">
     <SelectOption Value="v2011">2011版本</SelectOption>
     <SelectOption Value="v2019">2019版本</SelectOption>
 </Select>
 
-<Select DefaultValue=@("none") Style="width:200px" OnChange="@OnSelectEncryptType">
+<Select DefaultValue="@encryptType" @bind-Value="@encryptType" Style="width:200px" OnChange="@OnSelectEncryptType">
     <SelectOption Value="none">未加密</SelectOption>
     <SelectOption Value="encrypt">加密</SelectOption>
 </Select>
 
 @if (encryptType == "encrypt")
 {
-    @*<Input Placeholder="M1" @bind-Value="@M1" />
-        <Input Placeholder="IA1" @bind-Value="@IA1" />
-        <Input Placeholder="IC1" @bind-Value="@IC1" />*@
+    <AntDesign.Input @bind-Value="@M1">
+        <AddOnBefore>M1</AddOnBefore>
+    </AntDesign.Input>
+    <AntDesign.Input @bind-Value="@IA1">
+        <AddOnBefore>IA1</AddOnBefore>
+    </AntDesign.Input>
+    <AntDesign.Input @bind-Value="@IC1">
+        <AddOnBefore>IC1</AddOnBefore>
+    </AntDesign.Input>
 }
+
 <Button Type="primary" @onclick="Query">分析</Button>
 
 @if (isOpen)
 {
-    <Alert Type="@AlertType.Error" Closable AfterClose="OnDismiss">
-        @ErrerMessage
-    </Alert>
+    <Alert Type="@AlertType.Error" Description="@ErrerMessage" Closable AfterClose="OnDismiss" />
 }
 
-@HexData
-
 <div class="right">
     <TextArea AllowClear="true" AutoSize="true" MinRows="10" MaxRows="30" @bind-Value="@HexData" />
     <pre>
@@ -54,7 +58,7 @@
 
     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 HexData = "";
 
     private string Json;
 
@@ -68,29 +72,28 @@
 
     private bool isOpen = false;
 
-    private uint? M1;
-    private uint? IA1;
-    private uint? IC1;
+    private long M1;
+    private long IA1;
+    private long IC1;
 
     void OnDismiss()
     {
         isOpen = !isOpen;
-        StateHasChanged();
     }
 
-    public void OnSelectVersion(OneOf<string, LabeledValue> value, SelectOption option)
+    public void OnSelectVersion(OneOf<string, IEnumerable<string>, LabeledValue, IEnumerable<LabeledValue>> value,
+        OneOf<SelectOption, IEnumerable<SelectOption>> option)
     {
-        HexData = new Random().Next(1, 100).ToString();
-        //this.version = value.Value.ToString();
-        //switch (version)
-        //{
-        //    case "v2011":
-        //        this.HexData = HexData2011;
-        //        break;
-        //    case "v2019":
-        //        this.HexData = HexData2019;
-        //        break;
-        //}
+        this.version = value.Value.ToString();
+        switch (version)
+        {
+            case "v2011":
+                this.HexData = HexData2011;
+                break;
+            case "v2019":
+                this.HexData = HexData2019;
+                break;
+        }
     }
 
     private void OnSelectEncryptType(OneOf<string, IEnumerable<string>, LabeledValue, IEnumerable<LabeledValue>> value,
@@ -123,12 +126,12 @@
                     else
                     {
                         IJT809Config jt809ConfigInternal = new JT809Config2011(Guid.NewGuid().ToString());
+                        SetEncryptOptions();
                         jt809ConfigInternal.EncryptOptions = EncryptOptions;
                         JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal);
                         Json = jT809SerializerInternal.Analyze(data, JTJsonWriterOptions.Instance);
                     }
                     break;
-
                 case "v2019":
                     if (encryptType == "none")
                     {
@@ -137,6 +140,7 @@
                     else
                     {
                         IJT809Config jt809ConfigInternal = new JT809Config2019(Guid.NewGuid().ToString());
+                        SetEncryptOptions();
                         jt809ConfigInternal.EncryptOptions = EncryptOptions;
                         JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal);
                         Json = jT809SerializerInternal.Analyze(data, JTJsonWriterOptions.Instance);
@@ -158,6 +162,13 @@
         }
     }
 
+    private void SetEncryptOptions()
+    {
+        EncryptOptions.M1 = (uint)M1;
+        EncryptOptions.IA1 = (uint)IA1;
+        EncryptOptions.IC1 = (uint)IC1;
+    }
+
     class JT809Config2011 : JT809GlobalConfigBase
     {
         public JT809Config2011(string configId)
diff --git a/src/JTTools/Program.cs b/src/JTTools/Program.cs
index ae8f985..4609b55 100644
--- a/src/JTTools/Program.cs
+++ b/src/JTTools/Program.cs
@@ -12,6 +12,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Serialization;
 using JTTools.Configs;
 using Newtonsoft.Json;
+using JT808.Protocol.Extensions.Streamax;
 
 namespace JTTools
 {
@@ -82,6 +83,8 @@ namespace JTTools
                             .AddJT1078Configure();
                     services.AddJT809Configure(new JT809_2019_Config())
                             .AddJT1078Configure();
+                    services.AddJT808Configure(new JT808_Streamax_Config())
+                            .AddStreamaxConfigure();
                 })
                 .Build()
                 .Run();
diff --git a/src/JTTools/Shared/MainLayout.razor b/src/JTTools/Shared/MainLayout.razor
index 80b11e2..42165f1 100644
--- a/src/JTTools/Shared/MainLayout.razor
+++ b/src/JTTools/Shared/MainLayout.razor
@@ -15,7 +15,7 @@
     </Sider>
     <Layout>
         <Header Class="site-layout-sub-header-background" Style="padding: 0;">
-            <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>
+            <iframe id="github-star" style="border:none;vertical-align: middle;position:absolute;right:50px;top:25px;" width="105" height="20" src="https://ghbtns.com/github-btn.html?user=SmallChi&amp;repo=JTTools&amp;type=watch&amp;count=true"></iframe>
         </Header>
         <Content Style=" margin: 24px 16px 0;">
             <div class="site-layout-background" style="padding: 24px; min-height: 360px">