Преглед на файлове

v2.2.1

1.添加sourcelink
2.调整车辆定位信息解析
3.修复0x1504车辆行驶记录信息
4.去掉读取BCD内部忽略‘0’,让外部去处理
5.添加指定net版本编译
tags/v2.2.1
SmallChi(Koike) преди 3 години
родител
ревизия
ab7a3f5996
променени са 8 файла, в които са добавени 13 реда и са изтрити 9 реда
  1. +1
    -1
      .github/workflows/dotnetcore.yml
  2. +5
    -0
      global.json
  3. +1
    -1
      src/Info.props
  4. +1
    -1
      src/JT809.Protocol.Extensions/JT809.Protocol.Extensions.JT1078.Test/JT809.Protocol.Extensions.JT1078.Test.csproj
  5. +1
    -1
      src/JT809.Protocol.Test/JT809.Protocol.Test.csproj
  6. +1
    -1
      src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9505Test.cs
  7. +2
    -2
      src/JT809.Protocol/JT809.Protocol.csproj
  8. +1
    -2
      src/JT809.Protocol/MessagePack/JT809MessagePackReader.cs

+ 1
- 1
.github/workflows/dotnetcore.yml Целия файл

@@ -12,7 +12,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@master
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: dotnet info
run: dotnet --info
- name: dotnet restore


+ 5
- 0
global.json Целия файл

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

+ 1
- 1
src/Info.props Целия файл

@@ -8,7 +8,7 @@
<PackageProjectUrl>https://github.com/SmallChi/JT809</PackageProjectUrl>
<license>https://github.com/SmallChi/JT809/blob/master/LICENSE</license>
<licenseUrl>https://github.com/SmallChi/JT809/blob/master/LICENSE</licenseUrl>
<Version>2.2.1-preview2</Version>
<Version>2.2.1</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<AnalysisLevel>latest</AnalysisLevel>


+ 1
- 1
src/JT809.Protocol.Extensions/JT809.Protocol.Extensions.JT1078.Test/JT809.Protocol.Extensions.JT1078.Test.csproj Целия файл

@@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>


+ 1
- 1
src/JT809.Protocol.Test/JT809.Protocol.Test.csproj Целия файл

@@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="JT808" Version="2.4.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>


+ 1
- 1
src/JT809.Protocol.Test/JT809SubMessageBody/JT809_0x9500_0x9505Test.cs Целия файл

@@ -39,7 +39,7 @@ namespace JT809.Protocol.Test.JT809SubMessageBody
{
var bytes = "00 00 00 00 00 00 00 00 08 08 6A 74 38 30 38 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 61 64 73 6C 73 6D 61 6C 6C 63 68 69 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 61 64 73 6C 31 32 33 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 31 32 37 2E 30 2E 30 2E 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 28 03 29 00 00 00 00 5B AC C6 40".ToHexBytes();
JT809_0x9500_0x9505 jT809_0X9500_0X9505 = JT809Serializer.Deserialize<JT809_0x9500_0x9505>(bytes);
Assert.Equal("808", jT809_0X9500_0X9505.AuthenticationCode);
Assert.Equal("00000000000000000808", jT809_0X9500_0X9505.AuthenticationCode);
Assert.Equal("jt808", jT809_0X9500_0X9505.AccessPointName);
Assert.Equal("adslsmallchi", jT809_0X9500_0X9505.UserName);
Assert.Equal("adsl123", jT809_0X9500_0X9505.Password);


+ 2
- 2
src/JT809.Protocol/JT809.Protocol.csproj Целия файл

@@ -95,13 +95,13 @@
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Text.Json" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
</ItemGroup>


+ 1
- 2
src/JT809.Protocol/MessagePack/JT809MessagePackReader.cs Целия файл

@@ -408,8 +408,7 @@ namespace JT809.Protocol.MessagePack
{
bcdSb.Append(readOnlySpan[i].ToString("X2"));
}
// todo:对于协议来说这个0是有意义的,下个版本在去掉
return bcdSb.ToString().TrimStart('0');
return bcdSb.ToString();
}
private ReadOnlySpan<byte> GetReadOnlySpan(int count)
{


Зареждане…
Отказ
Запис