瀏覽代碼

升级808库

AntDesign
SmallChi(Koike) 1 年之前
父節點
當前提交
d40f9790d0
共有 4 個文件被更改,包括 16 次插入16 次删除
  1. +7
    -8
      src/JTTools/JTTools.csproj
  2. +5
    -5
      src/JTTools/Pages/JT808Analyze.razor
  3. +3
    -2
      src/JTTools/Program.cs
  4. +1
    -1
      src/global.json

+ 7
- 8
src/JTTools/JTTools.csproj 查看文件

@@ -6,20 +6,19 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AntDesign" Version="0.14.4" />
<PackageReference Include="AntDesign" Version="0.15.3" />
<PackageReference Include="JT1078" Version="1.2.0-preview6" />
<PackageReference Include="JT808" Version="2.6.1" />
<PackageReference Include="JT808.Protocol.DependencyInjection" Version="2.6.1" />
<PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.6.1" />
<PackageReference Include="JT808" 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.SuBiao" Version="2.6.1" />
<PackageReference Include="JT808.Protocol.Extensions.YueBiao" Version="2.6.1" />
<PackageReference Include="JT808.Protocol.Extensions.SuBiao" Version="2.6.2" />
<PackageReference Include="JT808.Protocol.Extensions.YueBiao" Version="2.6.2" />
<PackageReference Include="JT809" Version="2.2.3" />
<PackageReference Include="JT809.Protocol.Extensions.JT1078" Version="2.2.3" />
<PackageReference Include="JTActiveSafety" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.2" />
</ItemGroup>

</Project>

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

@@ -13,7 +13,7 @@
@inject IJT808Config config
@inject JT808_JT1078_Config jT808_JT1078_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
@using OneOf;

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

private JT808Serializer Serializer;

private JT808Serializer JTRM_Serializer;
//private JT808Serializer JTRM_Serializer;

private JT808Serializer JTSuBiao_Serializer;

@@ -202,7 +202,7 @@
Serializer = config.GetSerializer();
JT1078Serializer = jT808_JT1078_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();
JT808PrivateConfig = new LocalLodingConfig();
}
@@ -268,7 +268,7 @@
JT808Packages.Add(new JT808PackageInfo { Order = i, Json = JTYueBiao_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance) });
break;
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;
case "JT2013Force":
JT808Packages.Add(new JT808PackageInfo { Order = i, Json = Serializer.Analyze(data, JT808.Protocol.Enums.JT808Version.JTT2013Force, options: JTJsonWriterOptions.Instance) });
@@ -309,7 +309,7 @@
Json = JTYueBiao_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
break;
case "JT808_JTRM":
Json = JTRM_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
//Json = JTRM_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
break;
case "JT2013Force":
Json = Serializer.Analyze(msgid, bodies.ToArray(), JT808.Protocol.Enums.JT808Version.JTT2013Force, options: JTJsonWriterOptions.Instance);


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

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


+ 1
- 1
src/global.json 查看文件

@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.203"
"version": "7.0.306"
}
}

Loading…
取消
儲存