ソースを参照

1.修复808粤标解析

2.增加单文件发布命令
pull/9/head
SmallChi(Koike) 3年前
コミット
e5c8659bc0
6個のファイルの変更25行の追加3行の削除
  1. +1
    -0
      .gitignore
  2. +3
    -3
      src/JTTools/JTTools.csproj
  3. +14
    -0
      src/JTTools/Pages/JT808Analyze.razor
  4. +5
    -0
      src/global.json
  5. +1
    -0
      src/publish_linux-x64.txt
  6. +1
    -0
      src/publish_win-x64.txt

+ 1
- 0
.gitignore ファイルの表示

@@ -328,3 +328,4 @@ ASALocalRun/

# MFractors (Xamarin productivity tool) working folder
.mfractor/
/src/.output

+ 3
- 3
src/JTTools/JTTools.csproj ファイルの表示

@@ -7,17 +7,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AntDesign" Version="0.10.3.1" />
<PackageReference Include="AntDesign" Version="0.10.5" />
<PackageReference Include="JT1078" Version="1.2.0-preview2" />
<PackageReference Include="JT808" Version="2.4.5" />
<PackageReference Include="JT808.Protocol.Extensions.JT1078" Version="2.4.5" />
<PackageReference Include="JT808.Protocol.Extensions.Streamax" Version="0.3.4" />
<PackageReference Include="JT808.Protocol.Extensions.Streamax" Version="0.3.5" />
<PackageReference Include="JT808.Protocol.Extensions.SuBiao" Version="2.4.5" />
<PackageReference Include="JT808.Protocol.Extensions.YueBiao" Version="2.4.5" />
<PackageReference Include="JT809" Version="2.2.1-preview2" />
<PackageReference Include="JT809.Protocol.Extensions.JT1078" Version="2.2.1-preview2" />
<PackageReference Include="JTActiveSafety" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.0-rc1" />
</ItemGroup>


+ 14
- 0
src/JTTools/Pages/JT808Analyze.razor ファイルの表示

@@ -14,6 +14,7 @@
@inject JT808_JT1078_Config jT808_JT1078_Config
@inject JT808_SuBiao_Config jT808_SuBiao_Config
@inject JT808_Streamax_Config jT808_Streamax_Config
@inject JT808_YueBiao_Config jT808_YueBiao_Config
@using OneOf;

<Space Direction="DirectionVHType.Vertical" Style="width:100%">
@@ -140,6 +141,8 @@

private static string HexSubDataTmp = "7E120523A204066657506200EB00020001015A00000023012012191042052012191050190000000000000000000101064446D10120121910221720121910420500000000000000000001010F1FE8EB0120121910023420121910221700000000000000000001010F182D5C0120121909471120121910015500000000000000000001010B38F2430120121909274020121909471100000000000000000001010F056DB40120121909080920121909274000000000000000000001010F0724380120121908483820121909080900000000000000000001010F0530AB0120121908290720121908483800000000000000000001010F05896C0120121908093720121908290700000000000000000001010F02CD3B0120121907500520121908093700000000000000000001010F056FEF0120121907303420121907500500000000000000000001010F043C3401201219072541201219073034000000000000000000010103C26C5F0120121907061120121907254100000000000000000001010F03F0C10120121906464220121907061100000000000000000001010F02F6330120121906271220121906464200000000000000000001010F02E43B0120121906074220121906271200000000000000000001010F033D670120121905481120121906074200000000000000000001010F088BF20120121905284120121905481100000000000000000001010F03F9FE0120121905091020121905284100000000000000000001010F05B1040120121904494020121905091000000000000000000001010F02B3540120121904301020121904494000000000000000000001010F0417B00120121904103920121904301000000000000000000001010F0538970120121903510820121904103900000000000000000001010F054E9E0120121903313820121903510800000000000000000001010F016ECB0120121903120820121903313800000000000000000001010F0333C00120121902523820121903120700000000000000000001010F029D230120121902330720121902523700000000000000000001010F0354E40120121902133720121902330700000000000000000001010F03303D0120121901540720121902133700000000000000000001010F04981E0120121901343720121901540700000000000000000001010F02AD940120121901150820121901343700000000000000000001010EFFD7CF0120121900553720121901150800000000000000000001010F07D9330120121900360720121900553700000000000000000001010F040E740C7E\n7E1205203804066657506200EC000200020120121900163320121900360700000000000000000001010F0CE4CD0120121900002220121900163300000000000000000001010C6F9E7B5D7E";

private static string HexYueBiaoDataTmp = "7E0200405C01000000000012345678913CC400000000008C0003015198CF06C158C5000801F200E52203151206110104000716E30302000014040000000015040000000016040000000017020000180300000025040000000030011F310117EF0D49249200000049249011000003DE7E\n7E1205203804066657506200EC000200020120121900163320121900360700000000000000000001010F0CE4CD0120121900002220121900163300000000000000000001010C6F9E7B5D7E";

private string ErrerMessage;

private bool isOpen = false;
@@ -155,6 +158,10 @@
{
HexData = HexSubDataTmp;
}
else if ("JT808_YueBiao" == protocolType)
{
HexData = HexYueBiaoDataTmp;
}
else if ("JT2013Force" == protocolType)
{
HexData = Hex2013ForceTmp;
@@ -196,6 +203,7 @@
JT1078Serializer = jT808_JT1078_Config.GetSerializer();
JTSuBiao_Serializer = jT808_SuBiao_Config.GetSerializer();
JTRM_Serializer = jT808_Streamax_Config.GetSerializer();
JTYueBiao_Serializer = jT808_YueBiao_Config.GetSerializer();
JT808PrivateConfig = new LocalLodingConfig();
}

@@ -256,6 +264,9 @@
case "JT808_SuBiao":
JT808Packages.Add(new JT808PackageInfo { Order = i, Json = JTSuBiao_Serializer.Analyze(data, options: JTJsonWriterOptions.Instance) });
break;
case "JT808_YueBiao":
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) });
break;
@@ -294,6 +305,9 @@
case "JT808_SuBiao":
Json = JTSuBiao_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
break;
case "JT808_YueBiao":
Json = JTYueBiao_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
break;
case "JT808_JTRM":
Json = JTRM_Serializer.Analyze(msgid, bodies.ToArray(), options: JTJsonWriterOptions.Instance);
break;


+ 5
- 0
src/global.json ファイルの表示

@@ -0,0 +1,5 @@
{
"sdk": {
"version": "6.0.200"
}
}

+ 1
- 0
src/publish_linux-x64.txt ファイルの表示

@@ -0,0 +1 @@
dotnet publish ./JTTools/JTTools.csproj -c Release -o .output -r linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeNativeLibrariesForSelfExtract=true

+ 1
- 0
src/publish_win-x64.txt ファイルの表示

@@ -0,0 +1 @@
dotnet publish ./JTTools/JTTools.csproj -c Release -o .output -r win-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeNativeLibrariesForSelfExtract=true

読み込み中…
キャンセル
保存