Skip to content

Commit ac6d03e

Browse files
SmallChiSmallChi
committed
v2.7.3
1.调整组包判断消息体长度超出整包范围判断 2.升级net库
1 parent 84e59de commit ac6d03e

File tree

10 files changed

+30
-25
lines changed

10 files changed

+30
-25
lines changed

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.201",
3+
"version": "9.0.303",
44
"rollForward": "latestFeature",
55
"paths": [ ".dotnet", "$host$" ],
66
"errorMessage": "The required .NET SDK wasn't found. Please update 'version' global.json."

‎src/Info.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageProjectUrl>https://github.com/SmallChi/JT808</PackageProjectUrl>
99
<licenseUrl>https://github.com/SmallChi/JT808/blob/master/LICENSE</licenseUrl>
1010
<license>https://github.com/SmallChi/JT808/blob/master/LICENSE</license>
11-
<Version>2.7.2</Version>
11+
<Version>2.7.3</Version>
1212
<ImplicitUsings>enable</ImplicitUsings>
1313
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1414
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

‎src/JT808.Protocol.Benchmark/JT808.Protocol.Benchmark.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<None Remove="ReportTest\**" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
18-
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.0" />
17+
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
18+
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.2" />
1919
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
2020
<PackageReference Include="System.Buffers" Version="4.6.1" />
2121
<PackageReference Include="System.Memory" Version="4.6.3" />

‎src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.GPS51.Test/JT808.Protocol.Extensions.GPS51.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
9-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
9+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1111
<PackageReference Include="xunit" Version="2.9.3" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

‎src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.JT1078.Test/JT808.Protocol.Extensions.JT1078.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
9-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
9+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1111
<PackageReference Include="xunit" Version="2.9.3" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

‎src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.SuBiao.Test/JT808.Protocol.Extensions.SuBiao.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1212
<PackageReference Include="xunit" Version="2.9.3" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

‎src/JT808.Protocol.Extensions/JT808.Protocol.Extensions.YueBiao.Test/JT808.Protocol.Extensions.YueBiao.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1212
<PackageReference Include="xunit" Version="2.9.3" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>

‎src/JT808.Protocol.Test/JT808.Protocol.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@
108108
</ItemGroup>
109109

110110
<ItemGroup>
111-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
111+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
112112
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
113-
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
114-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
113+
<PackageReference Include="System.Drawing.Common" Version="9.0.7" />
114+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
115115
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
116116
<PackageReference Include="xunit" Version="2.9.3" />
117117
<PackageReference Include="xunit.runner.console" Version="2.9.3">
118118
<PrivateAssets>all</PrivateAssets>
119119
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
120120
</PackageReference>
121-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
121+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
122122
<PrivateAssets>all</PrivateAssets>
123123
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
124124
</PackageReference>

‎src/JT808.Protocol.Test/MessageBody/JT808_0x0200Test.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@ public void Test2_1()
149149
{
150150
byte[] bodys = "00 00 00 01 00 00 00 02 00 BA 7F 0E 07 E4 F1 1C 00 28 00 3C 00 00 18 07 15 10 10 10 01 04 00 00 00 64 02 02 00 37".ToHexBytes();
151151
string json = JT808Serializer.Analyze<JT808_0x0200>(bodys);
152+
} [Fact]
153+
public void Test2_13()
154+
{
155+
byte[] bodys = "7E010401B7019019000000001E810423000000010400000078000000130E3132302E37372E3134342E31323900000018040000032800000029040000001E00000030040000000F00000080040000060D0000009004000000030000F00010313735303430373934332C32383830300000F0010205000000F0022141504E3A61706E3A2C636F70733A2C61706E5F6375723A2C61706E5F696E666F3A0000F0030943656E746F724E6F3A0000F0040200640000F00501000000F00601000000F00701000000F0080F3836333831373037303433373339300000F0091438393836303332323437323030373337383535300000F00A0A45533130315F303830340000F00C0A45533130315F563330310000F00D0F3436303131313134313432353034300000F00E01000000F00F011E0000F01001F60000F01101000000F01201030000F01304000186A00000F0142D303038342D303032302D2D303030392D303430362D303331332D303330372D303331372D303031382D303030380000F01501400000F01601000000F01701010000F01801000000F0190E312C312C31302C312C332C302C330000F020000000F0210F3131373331323633343739393438340000F02201001B7E".ToHexBytes();
156+
string json = JT808Serializer.Analyze(bodys);
152157
}
153158

154159
[Fact]

‎src/JT808.Protocol/JT808.Protocol.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
4747
<PackageReference Include="System.Memory" Version="4.6.3" />
4848
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
49-
<PackageReference Include="System.Text.Json" Version="9.0.5" />
49+
<PackageReference Include="System.Text.Json" Version="9.0.7" />
5050
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.3" />
5151
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
5252
</ItemGroup>
@@ -62,8 +62,8 @@
6262
</ItemGroup>
6363

6464
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
65-
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.5" />
66-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
65+
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.7" />
66+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
6767
</ItemGroup>
6868

6969
<ItemGroup>

0 commit comments

Comments
 (0)