diff --git a/src/JTTools/JTTools.csproj b/src/JTTools/JTTools.csproj index 59f3d38..1c77d59 100644 --- a/src/JTTools/JTTools.csproj +++ b/src/JTTools/JTTools.csproj @@ -6,20 +6,19 @@ - + - - - + + - - + + - + - + diff --git a/src/JTTools/Pages/JT808Analyze.razor b/src/JTTools/Pages/JT808Analyze.razor index 623edea..c6e9032 100644 --- a/src/JTTools/Pages/JT808Analyze.razor +++ b/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); diff --git a/src/JTTools/Program.cs b/src/JTTools/Program.cs index 29a4df3..e631aea 100644 --- a/src/JTTools/Program.cs +++ b/src/JTTools/Program.cs @@ -93,8 +93,9 @@ namespace JTTools JT808.Protocol.Extensions.JT808AnalyzeExtensions.Analyze(JT808.Protocol.JT808ConfigExtensions.GetMessagePackFormatter(jT808Config), ref jT808MessagePackReader, writer, jT808Config); }); - services.AddJT808Configure(new JT808_Streamax_Config()) - .AddStreamaxConfigure(); + //TODO + //services.AddJT808Configure(new JT808_Streamax_Config()) + // .AddStreamaxConfigure(); }) .Build() .Run(); diff --git a/src/global.json b/src/global.json index 0f11ff6..112677b 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.203" + "version": "7.0.306" } } \ No newline at end of file