From a46ab7f649748d69d21490cf887f3743a9f4b9a5 Mon Sep 17 00:00:00 2001
From: SmallChi <564952747@qq.com>
Date: Sun, 4 Nov 2018 16:20:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7JT808=E5=BA=93=202.?=
 =?UTF-8?q?=E7=94=B1=E4=BA=8E808=E7=9A=84=E6=B6=88=E6=81=AF=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=AF=E4=BB=A5=E6=89=A9=E5=B1=95=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=8D=E4=BE=9D=E8=B5=96=E4=BA=8E=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/JT808.DotNetty/JT808.DotNetty.csproj    |  2 +-
 src/JT808.DotNetty/JT808MsgIdHandlerBase.cs | 36 ++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/JT808.DotNetty/JT808.DotNetty.csproj b/src/JT808.DotNetty/JT808.DotNetty.csproj
index bb3e910..f9df2b8 100644
--- a/src/JT808.DotNetty/JT808.DotNetty.csproj
+++ b/src/JT808.DotNetty/JT808.DotNetty.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="DotNetty.Codecs" Version="0.6.0" />
     <PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
     <PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" />
-    <PackageReference Include="JT808" Version="1.0.0" />
+    <PackageReference Include="JT808" Version="1.0.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.Options" Version="2.1.1" />
diff --git a/src/JT808.DotNetty/JT808MsgIdHandlerBase.cs b/src/JT808.DotNetty/JT808MsgIdHandlerBase.cs
index 5649382..6571ab3 100644
--- a/src/JT808.DotNetty/JT808MsgIdHandlerBase.cs
+++ b/src/JT808.DotNetty/JT808MsgIdHandlerBase.cs
@@ -26,21 +26,20 @@ namespace JT808.DotNetty
         protected JT808MsgIdHandlerBase(JT808SessionManager sessionManager)
         {
             this.sessionManager = sessionManager;
-            HandlerDict = new Dictionary<JT808MsgId, Func<JT808Request, JT808Response>>
+            HandlerDict = new Dictionary<ushort, Func<JT808Request, JT808Response>>
             {
-                {JT808MsgId.终端通用应答, Msg0x0001},
-                {JT808MsgId.终端鉴权, Msg0x0102},
-                {JT808MsgId.终端心跳, Msg0x0002},
-                {JT808MsgId.终端注销, Msg0x0003},
-                {JT808MsgId.终端注册, Msg0x0100},
-                {JT808MsgId.位置信息汇报,Msg0x0200 },
-                {JT808MsgId.定位数据批量上传,Msg0x0704 },
-                {JT808MsgId.数据上行透传,Msg0x0900 }
+                {JT808MsgId.终端通用应答.ToUInt16Value(), Msg0x0001},
+                {JT808MsgId.终端鉴权.ToUInt16Value(), Msg0x0102},
+                {JT808MsgId.终端心跳.ToUInt16Value(), Msg0x0002},
+                {JT808MsgId.终端注销.ToUInt16Value(), Msg0x0003},
+                {JT808MsgId.终端注册.ToUInt16Value(), Msg0x0100},
+                {JT808MsgId.位置信息汇报.ToUInt16Value(),Msg0x0200 },
+                {JT808MsgId.定位数据批量上传.ToUInt16Value(),Msg0x0704 },
+                {JT808MsgId.数据上行透传.ToUInt16Value(),Msg0x0900 }
             };
-
         }
 
-        public Dictionary<JT808MsgId, Func<JT808Request, JT808Response>> HandlerDict { get; }
+        public Dictionary<ushort, Func<JT808Request, JT808Response>> HandlerDict { get; protected set; }
         /// <summary>
         /// 终端通用应答
         /// </summary>
@@ -51,7 +50,7 @@ namespace JT808.DotNetty
         {
             return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
             {
-                MsgId = request.Package.Header.MsgId,
+                MsgId = (JT808MsgId)request.Package.Header.MsgId,
                 JT808PlatformResult = JT808PlatformResult.Success,
                 MsgNum = request.Package.Header.MsgNum
             }));
@@ -67,7 +66,7 @@ namespace JT808.DotNetty
             sessionManager.Heartbeat(request.Package.Header.TerminalPhoneNo);
             return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
             {
-                MsgId = request.Package.Header.MsgId,
+                MsgId = (JT808MsgId)request.Package.Header.MsgId,
                 JT808PlatformResult = JT808PlatformResult.Success,
                 MsgNum = request.Package.Header.MsgNum
             }));
@@ -80,9 +79,10 @@ namespace JT808.DotNetty
         /// <returns></returns>
         public virtual JT808Response Msg0x0003(JT808Request request)
         {
+# warning JT808MsgId 
             return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
             {
-                MsgId = request.Package.Header.MsgId,
+                MsgId = (JT808MsgId)request.Package.Header.MsgId,
                 JT808PlatformResult = JT808PlatformResult.Success,
                 MsgNum = request.Package.Header.MsgNum
             }));
@@ -112,7 +112,7 @@ namespace JT808.DotNetty
         {
             return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
             {
-                MsgId = request.Package.Header.MsgId,
+                MsgId = (JT808MsgId)request.Package.Header.MsgId,
                 JT808PlatformResult = JT808PlatformResult.Success,
                 MsgNum = request.Package.Header.MsgNum
             }));
@@ -127,7 +127,7 @@ namespace JT808.DotNetty
         {
             return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
             {
-                MsgId = request.Package.Header.MsgId,
+                MsgId = (JT808MsgId)request.Package.Header.MsgId,
                 JT808PlatformResult = JT808PlatformResult.Success,
                 MsgNum = request.Package.Header.MsgNum
             }));
@@ -142,7 +142,7 @@ namespace JT808.DotNetty
         {
             return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
             {
-                MsgId = request.Package.Header.MsgId,
+                MsgId = (JT808MsgId)request.Package.Header.MsgId,
                 JT808PlatformResult = JT808PlatformResult.Success,
                 MsgNum = request.Package.Header.MsgNum
             }));
@@ -157,7 +157,7 @@ namespace JT808.DotNetty
         {
             return new JT808Response(JT808MsgId.平台通用应答.Create(request.Package.Header.TerminalPhoneNo, new JT808_0x8001()
             {
-                MsgId = request.Package.Header.MsgId,
+                MsgId =(JT808MsgId) request.Package.Header.MsgId,
                 JT808PlatformResult = JT808PlatformResult.Success,
                 MsgNum = request.Package.Header.MsgNum
             }));