@@ -12,7 +12,7 @@ jobs: | |||||
- name: Setup .NET Core | - name: Setup .NET Core | ||||
uses: actions/setup-dotnet@master | uses: actions/setup-dotnet@master | ||||
with: | with: | ||||
dotnet-version: 6.0.302 | |||||
dotnet-version: 6.0.400 | |||||
- name: dotnet info | - name: dotnet info | ||||
run: dotnet --info | run: dotnet --info | ||||
- name: dotnet restore | - name: dotnet restore | ||||
@@ -253,6 +253,7 @@ When the device uploads multimedia data, due to the large amount of data, it can | |||||
3. When N packet data comes in, continue as in Step 2. | 3. When N packet data comes in, continue as in Step 2. | ||||
> General Knowledge 1:Since the maximum length of the message body is 10bits (1023 bytes), there is a hard condition that the maximum length cannot be exceeded. | > General Knowledge 1:Since the maximum length of the message body is 10bits (1023 bytes), there is a hard condition that the maximum length cannot be exceeded. | ||||
> General Knowledge 2:General industry subcontracting is an integer multiple of 256, too much is not good, too little is not good, must be just right. | > General Knowledge 2:General industry subcontracting is an integer multiple of 256, too much is not good, too little is not good, must be just right. | ||||
[See Demo5 for Simples](https://github.com/SmallChi/JT808/blob/master/src/JT808.Protocol.Test/Simples/Demo5.cs) | [See Demo5 for Simples](https://github.com/SmallChi/JT808/blob/master/src/JT808.Protocol.Test/Simples/Demo5.cs) | ||||
@@ -253,7 +253,8 @@ JT808Serializer DT2JT808Serializer = new JT808Serializer(DT2JT808Config); | |||||
3. 当N包数据上来,延续步骤2的方式。 | 3. 当N包数据上来,延续步骤2的方式。 | ||||
> 普及知识点1:由于消息体长度最大为10bit也就是1023的字节,所以这边就有个硬性条件不能超过最大长度 | |||||
> 普及知识点1:由于消息体长度最大为10bit也就是1023的字节,所以这边就有个硬性条件不能超过最大长度。 | |||||
> 普及知识点2:一般行业分包是按256的整数倍,太多不行,太少也不行,必须刚刚好。 | > 普及知识点2:一般行业分包是按256的整数倍,太多不行,太少也不行,必须刚刚好。 | ||||
[可以参考Simples的Demo5](https://github.com/SmallChi/JT808/blob/master/src/JT808.Protocol.Test/Simples/Demo5.cs) | [可以参考Simples的Demo5](https://github.com/SmallChi/JT808/blob/master/src/JT808.Protocol.Test/Simples/Demo5.cs) | ||||
@@ -267,8 +268,7 @@ JT808Serializer DT2JT808Serializer = new JT808Serializer(DT2JT808Config); | |||||
***解决方式:*** | ***解决方式:*** | ||||
可以根据设备类型去实现(GlobalConfigBase)对应的配置,根据不同的GlobalConfigBase实例去绑定对应 | |||||
协议解析器。 | |||||
可以根据设备类型去实现(GlobalConfigBase)对应的配置,根据不同的GlobalConfigBase实例去绑定对应协议解析器。 | |||||
[可以参考Simples的Demo6](https://github.com/SmallChi/JT808/blob/master/src/JT808.Protocol.Test/Simples/Demo6.cs) | [可以参考Simples的Demo6](https://github.com/SmallChi/JT808/blob/master/src/JT808.Protocol.Test/Simples/Demo6.cs) | ||||
@@ -1,5 +1,5 @@ | |||||
{ | { | ||||
"sdk": { | "sdk": { | ||||
"version": "6.0.302" | |||||
"version": "6.0.400" | |||||
} | } | ||||
} | } |
@@ -1,6 +1,6 @@ | |||||
<Project> | <Project> | ||||
<PropertyGroup> | <PropertyGroup> | ||||
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;</TargetFrameworks> | |||||
<TargetFrameworks>net6.0;</TargetFrameworks> | |||||
<LangVersion>10.0</LangVersion> | <LangVersion>10.0</LangVersion> | ||||
<Copyright>Copyright 2018.</Copyright> | <Copyright>Copyright 2018.</Copyright> | ||||
<Authors>SmallChi(Koike)</Authors> | <Authors>SmallChi(Koike)</Authors> | ||||
@@ -8,7 +8,7 @@ | |||||
<PackageProjectUrl>https://github.com/SmallChi/JT808</PackageProjectUrl> | <PackageProjectUrl>https://github.com/SmallChi/JT808</PackageProjectUrl> | ||||
<licenseUrl>https://github.com/SmallChi/JT808/blob/master/LICENSE</licenseUrl> | <licenseUrl>https://github.com/SmallChi/JT808/blob/master/LICENSE</licenseUrl> | ||||
<license>https://github.com/SmallChi/JT808/blob/master/LICENSE</license> | <license>https://github.com/SmallChi/JT808/blob/master/LICENSE</license> | ||||
<Version>2.5.0-preview2</Version> | |||||
<Version>2.5.0-preview3</Version> | |||||
<PackageLicenseFile>LICENSE</PackageLicenseFile> | <PackageLicenseFile>LICENSE</PackageLicenseFile> | ||||
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | ||||
<AnalysisLevel>latest</AnalysisLevel> | <AnalysisLevel>latest</AnalysisLevel> | ||||
@@ -15,21 +15,6 @@ | |||||
<PackageReadmeFile>README.md</PackageReadmeFile> | <PackageReadmeFile>README.md</PackageReadmeFile> | ||||
</PropertyGroup> | </PropertyGroup> | ||||
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'"> | |||||
<Optimize>false</Optimize> | |||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> | |||||
</PropertyGroup> | |||||
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.1|AnyCPU'"> | |||||
<Optimize>false</Optimize> | |||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> | |||||
</PropertyGroup> | |||||
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0|AnyCPU'"> | |||||
<Optimize>false</Optimize> | |||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> | |||||
</PropertyGroup> | |||||
<ItemGroup> | <ItemGroup> | ||||
<Compile Remove="Formatters\MessageBodyFormatters\**" /> | <Compile Remove="Formatters\MessageBodyFormatters\**" /> | ||||
<Compile Remove="Metadata\JT808LocationAttachProperties\**" /> | <Compile Remove="Metadata\JT808LocationAttachProperties\**" /> | ||||
@@ -57,24 +42,6 @@ | |||||
<Compile Remove="Metadata\JT808UploadLocationRequestProperty.cs" /> | <Compile Remove="Metadata\JT808UploadLocationRequestProperty.cs" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> | |||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> | |||||
<PackageReference Include="System.Buffers" Version="4.5.1" /> | |||||
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" /> | |||||
<PackageReference Include="System.Memory" Version="4.5.5" /> | |||||
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" /> | |||||
<PackageReference Include="System.Text.Json" Version="6.0.5" /> | |||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" 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.4" /> | |||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> | |||||
</ItemGroup> | |||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> | <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> | ||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" /> | <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> | <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> | ||||