From e5c8659bc05e8d25bc7979201a5fad3fefdc87bb Mon Sep 17 00:00:00 2001 From: "SmallChi(Koike)" <564952747@qq.com> Date: Thu, 17 Mar 2022 20:26:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D808=E7=B2=A4=E6=A0=87?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=202.=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=8F=91=E5=B8=83=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/JTTools/JTTools.csproj | 6 +++--- src/JTTools/Pages/JT808Analyze.razor | 14 ++++++++++++++ src/global.json | 5 +++++ src/publish_linux-x64.txt | 1 + src/publish_win-x64.txt | 1 + 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/global.json create mode 100644 src/publish_linux-x64.txt create mode 100644 src/publish_win-x64.txt diff --git a/.gitignore b/.gitignore index 3e759b7..5b6c4a5 100644 --- a/.gitignore +++ b/.gitignore @@ -328,3 +328,4 @@ ASALocalRun/ # MFractors (Xamarin productivity tool) working folder .mfractor/ +/src/.output diff --git a/src/JTTools/JTTools.csproj b/src/JTTools/JTTools.csproj index 98c90d5..f0e3de1 100644 --- a/src/JTTools/JTTools.csproj +++ b/src/JTTools/JTTools.csproj @@ -7,17 +7,17 @@ - + - + - + diff --git a/src/JTTools/Pages/JT808Analyze.razor b/src/JTTools/Pages/JT808Analyze.razor index 8ce620d..623edea 100644 --- a/src/JTTools/Pages/JT808Analyze.razor +++ b/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; @@ -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; diff --git a/src/global.json b/src/global.json new file mode 100644 index 0000000..403171d --- /dev/null +++ b/src/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "6.0.200" + } +} \ No newline at end of file diff --git a/src/publish_linux-x64.txt b/src/publish_linux-x64.txt new file mode 100644 index 0000000..a79e7c4 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/src/publish_win-x64.txt b/src/publish_win-x64.txt new file mode 100644 index 0000000..3b6c887 --- /dev/null +++ b/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 \ No newline at end of file