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

升级JT808库,修改消息id依赖

tags/v1.0.0
SmallChi преди 6 години
родител
ревизия
3fcada065f
променени са 2 файла, в които са добавени 16 реда и са изтрити 17 реда
  1. +2
    -2
      src/JT808.DotNetty/JT808.DotNetty.csproj
  2. +14
    -15
      src/JT808.DotNetty/JT808MsgIdHandlerBase.cs

+ 2
- 2
src/JT808.DotNetty/JT808.DotNetty.csproj Целия файл

@@ -9,13 +9,13 @@
<PackageReference Include="DotNetty.Codecs" Version="0.6.0" /> <PackageReference Include="DotNetty.Codecs" Version="0.6.0" />
<PackageReference Include="DotNetty.Handlers" Version="0.6.0" /> <PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
<PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" /> <PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" />
<PackageReference Include="JT808" Version="1.0.1" />
<PackageReference Include="JT808" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" /> <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Polly" Version="6.1.0" />
<PackageReference Include="Polly" Version="6.1.1" />
</ItemGroup> </ItemGroup>


</Project> </Project>

+ 14
- 15
src/JT808.DotNetty/JT808MsgIdHandlerBase.cs Целия файл

@@ -50,8 +50,8 @@ namespace JT808.DotNetty
{ {
return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001() return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
{ {
MsgId = (JT808MsgId)request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.Success,
MsgId = request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.成功,
MsgNum = request.Package.Header.MsgNum MsgNum = request.Package.Header.MsgNum
})); }));
} }
@@ -66,8 +66,8 @@ namespace JT808.DotNetty
sessionManager.Heartbeat(request.Package.Header.TerminalPhoneNo); sessionManager.Heartbeat(request.Package.Header.TerminalPhoneNo);
return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001() return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
{ {
MsgId = (JT808MsgId)request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.Success,
MsgId = request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.成功,
MsgNum = request.Package.Header.MsgNum MsgNum = request.Package.Header.MsgNum
})); }));
} }
@@ -79,11 +79,10 @@ namespace JT808.DotNetty
/// <returns></returns> /// <returns></returns>
public virtual JT808Response Msg0x0003(JT808Request request) public virtual JT808Response Msg0x0003(JT808Request request)
{ {
# warning JT808MsgId
return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001() return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
{ {
MsgId = (JT808MsgId)request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.Success,
MsgId = request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.成功,
MsgNum = request.Package.Header.MsgNum MsgNum = request.Package.Header.MsgNum
})); }));
} }
@@ -112,8 +111,8 @@ namespace JT808.DotNetty
{ {
return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001() return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
{ {
MsgId = (JT808MsgId)request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.Success,
MsgId = request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.成功,
MsgNum = request.Package.Header.MsgNum MsgNum = request.Package.Header.MsgNum
})); }));
} }
@@ -127,8 +126,8 @@ namespace JT808.DotNetty
{ {
return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001() return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
{ {
MsgId = (JT808MsgId)request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.Success,
MsgId = request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.成功,
MsgNum = request.Package.Header.MsgNum MsgNum = request.Package.Header.MsgNum
})); }));
} }
@@ -142,8 +141,8 @@ namespace JT808.DotNetty
{ {
return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001() return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
{ {
MsgId = (JT808MsgId)request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.Success,
MsgId =request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.成功,
MsgNum = request.Package.Header.MsgNum MsgNum = request.Package.Header.MsgNum
})); }));
} }
@@ -157,8 +156,8 @@ namespace JT808.DotNetty
{ {
return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001() return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
{ {
MsgId =(JT808MsgId) request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.Success,
MsgId =request.Package.Header.MsgId,
JT808PlatformResult = JT808PlatformResult.成功,
MsgNum = request.Package.Header.MsgNum MsgNum = request.Package.Header.MsgNum
})); }));
} }


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