浏览代码

1.优化一下分包的时候单包不显示问题

2.升级808依赖库
AntDesign
SmallChi(Koike) 1年前
父节点
当前提交
d6c0d61972
共有 3 个文件被更改,包括 20 次插入19 次删除
  1. +2
    -2
      src/JTTools/JTTools.csproj
  2. +16
    -14
      src/JTTools/Pages/JT808Analyze.razor
  3. +2
    -3
      src/JTTools/Program.cs

+ 2
- 2
src/JTTools/JTTools.csproj 查看文件

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


<ItemGroup> <ItemGroup>
<PackageReference Include="AntDesign" Version="0.15.3" />
<PackageReference Include="AntDesign" Version="0.15.4" />
<PackageReference Include="JT1078" Version="1.2.0-preview6" /> <PackageReference Include="JT1078" Version="1.2.0-preview6" />
<PackageReference Include="JT808" Version="2.6.2" /> <PackageReference Include="JT808" Version="2.6.2" />
<PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.6.2" /> <PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.6.2" />
<PackageReference Include="JT808.Protocol.Extensions.Streamax" Version="0.4.5" />
<PackageReference Include="JT808.Protocol.Extensions.Streamax" Version="0.4.7" />
<PackageReference Include="JT808.Protocol.Extensions.SuBiao" Version="2.6.2" /> <PackageReference Include="JT808.Protocol.Extensions.SuBiao" Version="2.6.2" />
<PackageReference Include="JT808.Protocol.Extensions.YueBiao" Version="2.6.2" /> <PackageReference Include="JT808.Protocol.Extensions.YueBiao" Version="2.6.2" />
<PackageReference Include="JT809" Version="2.2.3" /> <PackageReference Include="JT809" Version="2.2.3" />


+ 16
- 14
src/JTTools/Pages/JT808Analyze.razor 查看文件

@@ -13,7 +13,7 @@
@inject IJT808Config config @inject IJT808Config config
@inject JT808_JT1078_Config jT808_JT1078_Config @inject JT808_JT1078_Config jT808_JT1078_Config
@inject JT808_SuBiao_Config jT808_SuBiao_Config @inject JT808_SuBiao_Config jT808_SuBiao_Config
@*@inject JT808_Streamax_Config jT808_Streamax_Config*@
@inject JT808_Streamax_Config jT808_Streamax_Config
@inject JT808_YueBiao_Config jT808_YueBiao_Config @inject JT808_YueBiao_Config jT808_YueBiao_Config
@using OneOf; @using OneOf;


@@ -115,7 +115,7 @@


private JT808Serializer Serializer; private JT808Serializer Serializer;


//private JT808Serializer JTRM_Serializer;
private JT808Serializer JTRM_Serializer;


private JT808Serializer JTSuBiao_Serializer; private JT808Serializer JTSuBiao_Serializer;


@@ -154,6 +154,8 @@


private void OnSelectProtocolType(string value) private void OnSelectProtocolType(string value)
{ {
JT808HeaderPackages = null;
JT808Packages = null;
if ("JT808_JT1078" == protocolType) if ("JT808_JT1078" == protocolType)
{ {
HexData = HexSubDataTmp; HexData = HexSubDataTmp;
@@ -202,7 +204,7 @@
Serializer = config.GetSerializer(); Serializer = config.GetSerializer();
JT1078Serializer = jT808_JT1078_Config.GetSerializer(); JT1078Serializer = jT808_JT1078_Config.GetSerializer();
JTSuBiao_Serializer = jT808_SuBiao_Config.GetSerializer(); JTSuBiao_Serializer = jT808_SuBiao_Config.GetSerializer();
//JTRM_Serializer = jT808_Streamax_Config.GetSerializer();
JTRM_Serializer = jT808_Streamax_Config.GetSerializer();
JTYueBiao_Serializer = jT808_YueBiao_Config.GetSerializer(); JTYueBiao_Serializer = jT808_YueBiao_Config.GetSerializer();
JT808PrivateConfig = new LocalLodingConfig(); JT808PrivateConfig = new LocalLodingConfig();
} }
@@ -268,7 +270,7 @@
JT808Packages.Add(new JT808PackageInfo { Order = i, Json = JTYueBiao_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance) }); JT808Packages.Add(new JT808PackageInfo { Order = i, Json = JTYueBiao_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance) });
break; break;
case "JT808_JTRM": case "JT808_JTRM":
//JT808Packages.Add(new JT808PackageInfo { Order = i, Json = JTRM_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance) });
JT808Packages.Add(new JT808PackageInfo { Order = i, Json = JTRM_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance) });
break; break;
case "JT2013Force": case "JT2013Force":
JT808Packages.Add(new JT808PackageInfo { Order = i, Json = Serializer.Analyze(data, JT808.Protocol.Enums.JT808Version.JTT2013Force, options: JTJsonWriterOptions.Instance) }); JT808Packages.Add(new JT808PackageInfo { Order = i, Json = Serializer.Analyze(data, JT808.Protocol.Enums.JT808Version.JTT2013Force, options: JTJsonWriterOptions.Instance) });
@@ -284,16 +286,16 @@
} }
if (sort.Count > 0) if (sort.Count > 0)
{ {
if (sort.Count == total)
List<byte> bodies = new List<byte>();
ushort msgid = 0;
foreach (var item in sort)
{ {
List<byte> bodies = new List<byte>();
ushort msgid = 0;
foreach (var item in sort)
{
msgid = item.Value.Header.MsgId;
bodies = bodies.Concat(item.Value.Bodies).ToList();
}
JT808HeaderPackages = sort.Select(s => s.Value).ToList();
msgid = item.Value.Header.MsgId;
bodies = bodies.Concat(item.Value.Bodies).ToList();
}
JT808HeaderPackages = sort.Select(s => s.Value).ToList();
if (sort.Count == total)
{
switch (protocolType) switch (protocolType)
{ {
case "JT808": case "JT808":
@@ -309,7 +311,7 @@
Json = JTYueBiao_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance); Json = JTYueBiao_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
break; break;
case "JT808_JTRM": case "JT808_JTRM":
//Json = JTRM_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
Json = JTRM_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
break; break;
case "JT2013Force": case "JT2013Force":
Json = Serializer.Analyze(msgid, bodies.ToArray(), JT808.Protocol.Enums.JT808Version.JTT2013Force, options: JTJsonWriterOptions.Instance); Json = Serializer.Analyze(msgid, bodies.ToArray(), JT808.Protocol.Enums.JT808Version.JTT2013Force, options: JTJsonWriterOptions.Instance);


+ 2
- 3
src/JTTools/Program.cs 查看文件

@@ -93,9 +93,8 @@ namespace JTTools
JT808.Protocol.Extensions.JT808AnalyzeExtensions.Analyze(JT808.Protocol.JT808ConfigExtensions.GetMessagePackFormatter<JT808_0x0200>(jT808Config), JT808.Protocol.Extensions.JT808AnalyzeExtensions.Analyze(JT808.Protocol.JT808ConfigExtensions.GetMessagePackFormatter<JT808_0x0200>(jT808Config),
ref jT808MessagePackReader, writer, jT808Config); ref jT808MessagePackReader, writer, jT808Config);
}); });
//TODO
//services.AddJT808Configure(new JT808_Streamax_Config())
// .AddStreamaxConfigure();
services.AddJT808Configure(new JT808_Streamax_Config())
.AddStreamaxConfigure();
}) })
.Build() .Build()
.Run(); .Run();


正在加载...
取消
保存