From ca23e182cd81b66d71950b56803b7cc5b02fcfee Mon Sep 17 00:00:00 2001 From: SmallChi <564952747@qq.com> Date: Sun, 9 Jun 2019 23:22:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7=E5=B9=B3=E5=8F=B0=E6=97=A5=E6=9C=9F=E5=B9=B4=E4=BB=BD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=202.=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=AD=90=E6=A8=A1=E5=9D=97=E6=94=B9=E7=94=A8nuget?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=BC=95=E7=94=A8809=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 --- src/JT809.DotNetty.Core/JT809.DotNetty.Core.csproj | 2 +- .../JT809.Inferior.Client/JT809InferiorService.cs | 2 +- .../JT809.DotNetty.Host.Test.csproj | 2 +- src/JT809.DotNetty.sln | 13 ++----------- src/JT809.Protocol | 1 - 6 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 .gitmodules delete mode 160000 src/JT809.Protocol diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9239c9f..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "src/JT809.Protocol"] - path = src/JT809.Protocol - url = https://github.com/SmallChi/JT809.git diff --git a/src/JT809.DotNetty.Core/JT809.DotNetty.Core.csproj b/src/JT809.DotNetty.Core/JT809.DotNetty.Core.csproj index a41a842..2bc30a8 100644 --- a/src/JT809.DotNetty.Core/JT809.DotNetty.Core.csproj +++ b/src/JT809.DotNetty.Core/JT809.DotNetty.Core.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/JT809.DotNetty.Simples/Inferior/JT809.Inferior.Client/JT809InferiorService.cs b/src/JT809.DotNetty.Simples/Inferior/JT809.Inferior.Client/JT809InferiorService.cs index b59e5a0..e8cb6db 100644 --- a/src/JT809.DotNetty.Simples/Inferior/JT809.Inferior.Client/JT809InferiorService.cs +++ b/src/JT809.DotNetty.Simples/Inferior/JT809.Inferior.Client/JT809InferiorService.cs @@ -51,7 +51,7 @@ namespace JT809.Inferior.Client { Day = (byte)(DateTime.Now.Day), Month = (byte)(DateTime.Now.Month), - Year = (byte)(DateTime.Now.Year), + Year = (ushort)(DateTime.Now.Year), Hour = (byte)(DateTime.Now.Hour), Minute = (byte)(DateTime.Now.Minute), Second = (byte)(DateTime.Now.Second), diff --git a/src/JT809.DotNetty.Tests/JT809.DotNetty.Host.Test/JT809.DotNetty.Host.Test.csproj b/src/JT809.DotNetty.Tests/JT809.DotNetty.Host.Test/JT809.DotNetty.Host.Test.csproj index 0dbcc5c..0a5f76c 100644 --- a/src/JT809.DotNetty.Tests/JT809.DotNetty.Host.Test/JT809.DotNetty.Host.Test.csproj +++ b/src/JT809.DotNetty.Tests/JT809.DotNetty.Host.Test/JT809.DotNetty.Host.Test.csproj @@ -6,7 +6,7 @@ 7.3 - + diff --git a/src/JT809.DotNetty.sln b/src/JT809.DotNetty.sln index 22bb844..313ecf2 100644 --- a/src/JT809.DotNetty.sln +++ b/src/JT809.DotNetty.sln @@ -11,10 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{DD4611CF EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT809.DotNetty.Host.Test", "JT809.DotNetty.Tests\JT809.DotNetty.Host.Test\JT809.DotNetty.Host.Test.csproj", "{D4E18559-C429-416F-9399-42C0E604D27B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9EFC0937-8515-4EFB-8FE7-558C6FC8860C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT809.Protocol", "JT809.Protocol\src\JT809.Protocol\JT809.Protocol.csproj", "{3D7271A3-02CF-4DF4-AD3C-1BF248D6D7CA}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simples", "Simples", "{3C761892-4ED8-42D2-96CF-F76041D17EC1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Superior", "Superior", "{E9DC871D-EFCE-4D53-A5B5-8A88D2D52EA4}" @@ -33,9 +29,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT809.GpsConsumer", "JT809. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inferior", "Inferior", "{139F3035-EAC2-42A8-9123-1F7E6B79AFEB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JT809.Inferior.Server", "JT809.DotNetty.Simples\Inferior\JT809.Inferior.Server\JT809.Inferior.Server.csproj", "{126FFC37-3ABF-4537-A0DD-3FC609F853EF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT809.Inferior.Server", "JT809.DotNetty.Simples\Inferior\JT809.Inferior.Server\JT809.Inferior.Server.csproj", "{126FFC37-3ABF-4537-A0DD-3FC609F853EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JT809.Inferior.Client", "JT809.DotNetty.Simples\Inferior\JT809.Inferior.Client\JT809.Inferior.Client.csproj", "{5990307A-4EE9-40B7-80E8-5AE2E7697287}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT809.Inferior.Client", "JT809.DotNetty.Simples\Inferior\JT809.Inferior.Client\JT809.Inferior.Client.csproj", "{5990307A-4EE9-40B7-80E8-5AE2E7697287}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -55,10 +51,6 @@ Global {D4E18559-C429-416F-9399-42C0E604D27B}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4E18559-C429-416F-9399-42C0E604D27B}.Release|Any CPU.ActiveCfg = Release|Any CPU {D4E18559-C429-416F-9399-42C0E604D27B}.Release|Any CPU.Build.0 = Release|Any CPU - {3D7271A3-02CF-4DF4-AD3C-1BF248D6D7CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D7271A3-02CF-4DF4-AD3C-1BF248D6D7CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D7271A3-02CF-4DF4-AD3C-1BF248D6D7CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D7271A3-02CF-4DF4-AD3C-1BF248D6D7CA}.Release|Any CPU.Build.0 = Release|Any CPU {5F8AFD67-FDA8-40A6-A655-FD855E2CCF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F8AFD67-FDA8-40A6-A655-FD855E2CCF26}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F8AFD67-FDA8-40A6-A655-FD855E2CCF26}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -97,7 +89,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {D4E18559-C429-416F-9399-42C0E604D27B} = {DD4611CF-79A9-45C7-91EB-1E84D22B7D07} - {3D7271A3-02CF-4DF4-AD3C-1BF248D6D7CA} = {9EFC0937-8515-4EFB-8FE7-558C6FC8860C} {E9DC871D-EFCE-4D53-A5B5-8A88D2D52EA4} = {3C761892-4ED8-42D2-96CF-F76041D17EC1} {5F8AFD67-FDA8-40A6-A655-FD855E2CCF26} = {E9DC871D-EFCE-4D53-A5B5-8A88D2D52EA4} {D64F2F77-DC0C-4120-80DA-45012A794CDF} = {E9DC871D-EFCE-4D53-A5B5-8A88D2D52EA4} diff --git a/src/JT809.Protocol b/src/JT809.Protocol deleted file mode 160000 index 991ee62..0000000 --- a/src/JT809.Protocol +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 991ee6202f91d933ff9a1a12f542cb3238efd7cd