diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
index 4c4f1400..a57dbea0 100644
--- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
+++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
@@ -1034,7 +1034,11 @@
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
- "projectReferences": {}
+ "projectReferences": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ }
+ }
}
},
"warningProperties": {
@@ -1046,6 +1050,12 @@
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
+ "dependencies": {
+ "System.IO.Ports": {
+ "target": "Package",
+ "version": "[8.0.0, )"
+ }
+ },
"imports": [
"net461",
"net462",
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache
index 46e760dc..11451c10 100644
Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache differ
diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json
index 61af07cf..a735086d 100644
--- a/Admin.Core.Api/obj/project.assets.json
+++ b/Admin.Core.Api/obj/project.assets.json
@@ -1490,6 +1490,33 @@
}
}
},
+ "runtime.linux-arm.runtime.native.System.IO.Ports/8.0.0": {
+ "type": "package",
+ "runtimeTargets": {
+ "runtimes/linux-arm/native/libSystem.IO.Ports.Native.so": {
+ "assetType": "native",
+ "rid": "linux-arm"
+ }
+ }
+ },
+ "runtime.linux-arm64.runtime.native.System.IO.Ports/8.0.0": {
+ "type": "package",
+ "runtimeTargets": {
+ "runtimes/linux-arm64/native/libSystem.IO.Ports.Native.so": {
+ "assetType": "native",
+ "rid": "linux-arm64"
+ }
+ }
+ },
+ "runtime.linux-x64.runtime.native.System.IO.Ports/8.0.0": {
+ "type": "package",
+ "runtimeTargets": {
+ "runtimes/linux-x64/native/libSystem.IO.Ports.Native.so": {
+ "assetType": "native",
+ "rid": "linux-x64"
+ }
+ }
+ },
"runtime.native.System/4.3.0": {
"type": "package",
"dependencies": {
@@ -1516,6 +1543,16 @@
"lib/netstandard1.0/_._": {}
}
},
+ "runtime.native.System.IO.Ports/8.0.0": {
+ "type": "package",
+ "dependencies": {
+ "runtime.linux-arm.runtime.native.System.IO.Ports": "8.0.0",
+ "runtime.linux-arm64.runtime.native.System.IO.Ports": "8.0.0",
+ "runtime.linux-x64.runtime.native.System.IO.Ports": "8.0.0",
+ "runtime.osx-arm64.runtime.native.System.IO.Ports": "8.0.0",
+ "runtime.osx-x64.runtime.native.System.IO.Ports": "8.0.0"
+ }
+ },
"runtime.native.System.Net.Http/4.3.0": {
"type": "package",
"dependencies": {
@@ -1580,6 +1617,24 @@
}
}
},
+ "runtime.osx-arm64.runtime.native.System.IO.Ports/8.0.0": {
+ "type": "package",
+ "runtimeTargets": {
+ "runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib": {
+ "assetType": "native",
+ "rid": "osx-arm64"
+ }
+ }
+ },
+ "runtime.osx-x64.runtime.native.System.IO.Ports/8.0.0": {
+ "type": "package",
+ "runtimeTargets": {
+ "runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib": {
+ "assetType": "native",
+ "rid": "osx-x64"
+ }
+ }
+ },
"runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0": {
"type": "package",
"runtimeTargets": {
@@ -2832,6 +2887,35 @@
}
}
},
+ "System.IO.Ports/8.0.0": {
+ "type": "package",
+ "dependencies": {
+ "runtime.native.System.IO.Ports": "8.0.0"
+ },
+ "compile": {
+ "lib/net6.0/System.IO.Ports.dll": {
+ "related": ".xml"
+ }
+ },
+ "runtime": {
+ "lib/net6.0/System.IO.Ports.dll": {
+ "related": ".xml"
+ }
+ },
+ "build": {
+ "buildTransitive/net6.0/_._": {}
+ },
+ "runtimeTargets": {
+ "runtimes/unix/lib/net6.0/System.IO.Ports.dll": {
+ "assetType": "runtime",
+ "rid": "unix"
+ },
+ "runtimes/win/lib/net6.0/System.IO.Ports.dll": {
+ "assetType": "runtime",
+ "rid": "win"
+ }
+ }
+ },
"System.Linq/4.3.0": {
"type": "package",
"dependencies": {
@@ -4126,6 +4210,10 @@
"Aucma.Core.ScannerGun/1.0.0": {
"type": "project",
"framework": ".NETCoreApp,Version=v6.0",
+ "dependencies": {
+ "Admin.Core.Common": "1.0.0",
+ "System.IO.Ports": "8.0.0"
+ },
"compile": {
"bin/placeholder/Aucma.Core.ScannerGun.dll": {}
},
@@ -5922,6 +6010,54 @@
"runtimes/fedora.24-x64/native/System.Security.Cryptography.Native.OpenSsl.so"
]
},
+ "runtime.linux-arm.runtime.native.System.IO.Ports/8.0.0": {
+ "sha512": "gK720fg6HemDg8sXcfy+xCMZ9+hF78Gc7BmREbmkS4noqlu1BAr9qZtuWGhLzFjBfgecmdtl4+SYVwJ1VneZBQ==",
+ "type": "package",
+ "path": "runtime.linux-arm.runtime.native.system.io.ports/8.0.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "Icon.png",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "runtime.linux-arm.runtime.native.system.io.ports.nuspec",
+ "runtimes/linux-arm/native/libSystem.IO.Ports.Native.so",
+ "useSharedDesignerContext.txt"
+ ]
+ },
+ "runtime.linux-arm64.runtime.native.System.IO.Ports/8.0.0": {
+ "sha512": "KYG6/3ojhEWbb3FwQAKgGWPHrY+HKUXXdVjJlrtyCLn3EMcNTaNcPadb2c0ndQzixZSmAxZKopXJr0nLwhOrpQ==",
+ "type": "package",
+ "path": "runtime.linux-arm64.runtime.native.system.io.ports/8.0.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "Icon.png",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "runtime.linux-arm64.runtime.native.system.io.ports.nuspec",
+ "runtimes/linux-arm64/native/libSystem.IO.Ports.Native.so",
+ "useSharedDesignerContext.txt"
+ ]
+ },
+ "runtime.linux-x64.runtime.native.System.IO.Ports/8.0.0": {
+ "sha512": "Wnw5vhA4mgGbIFoo6l9Fk3iEcwRSq49a1aKwJgXUCUtEQLCSUDjTGSxqy/oMUuOyyn7uLHsH8KgZzQ1y3lReiQ==",
+ "type": "package",
+ "path": "runtime.linux-x64.runtime.native.system.io.ports/8.0.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "Icon.png",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "runtime.linux-x64.runtime.native.system.io.ports.nuspec",
+ "runtimes/linux-x64/native/libSystem.IO.Ports.Native.so",
+ "useSharedDesignerContext.txt"
+ ]
+ },
"runtime.native.System/4.3.0": {
"sha512": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==",
"type": "package",
@@ -5950,6 +6086,21 @@
"runtime.native.system.io.compression.nuspec"
]
},
+ "runtime.native.System.IO.Ports/8.0.0": {
+ "sha512": "Ee7Sz5llLpTgyKIWzKI/GeuRSbFkOABgJRY00SqTY0OkTYtkB+9l5rFZfE7fxPA3c22RfytCBYkUdAkcmwMjQg==",
+ "type": "package",
+ "path": "runtime.native.system.io.ports/8.0.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "Icon.png",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "runtime.native.system.io.ports.nuspec",
+ "useSharedDesignerContext.txt"
+ ]
+ },
"runtime.native.System.Net.Http/4.3.0": {
"sha512": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==",
"type": "package",
@@ -6020,6 +6171,38 @@
"runtimes/opensuse.42.1-x64/native/System.Security.Cryptography.Native.OpenSsl.so"
]
},
+ "runtime.osx-arm64.runtime.native.System.IO.Ports/8.0.0": {
+ "sha512": "rbUBLAaFW9oVkbsb0+XSrAo2QdhBeAyzLl5KQ6Oci9L/u626uXGKInsVJG6B9Z5EO8bmplC8tsMiaHK8wOBZ+w==",
+ "type": "package",
+ "path": "runtime.osx-arm64.runtime.native.system.io.ports/8.0.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "Icon.png",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "runtime.osx-arm64.runtime.native.system.io.ports.nuspec",
+ "runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib",
+ "useSharedDesignerContext.txt"
+ ]
+ },
+ "runtime.osx-x64.runtime.native.System.IO.Ports/8.0.0": {
+ "sha512": "IcfB4jKtM9pkzP9OpYelEcUX1MiDt0IJPBh3XYYdEISFF+6Mc+T8WWi0dr9wVh1gtcdVjubVEIBgB8BHESlGfQ==",
+ "type": "package",
+ "path": "runtime.osx-x64.runtime.native.system.io.ports/8.0.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "Icon.png",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "runtime.osx-x64.runtime.native.system.io.ports.nuspec",
+ "runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib",
+ "useSharedDesignerContext.txt"
+ ]
+ },
"runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0": {
"sha512": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==",
"type": "package",
@@ -8162,6 +8345,48 @@
"version.txt"
]
},
+ "System.IO.Ports/8.0.0": {
+ "sha512": "MaiPbx2/QXZc62gm/DrajRrGPG1lU4m08GWMoWiymPYM+ba4kfACp2PbiYpqJ4QiFGhHD00zX3RoVDTucjWe9g==",
+ "type": "package",
+ "path": "system.io.ports/8.0.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "Icon.png",
+ "LICENSE.TXT",
+ "PACKAGE.md",
+ "THIRD-PARTY-NOTICES.TXT",
+ "buildTransitive/net461/System.IO.Ports.targets",
+ "buildTransitive/net462/_._",
+ "buildTransitive/net6.0/_._",
+ "buildTransitive/netcoreapp2.0/System.IO.Ports.targets",
+ "lib/net462/System.IO.Ports.dll",
+ "lib/net462/System.IO.Ports.xml",
+ "lib/net6.0/System.IO.Ports.dll",
+ "lib/net6.0/System.IO.Ports.xml",
+ "lib/net7.0/System.IO.Ports.dll",
+ "lib/net7.0/System.IO.Ports.xml",
+ "lib/net8.0/System.IO.Ports.dll",
+ "lib/net8.0/System.IO.Ports.xml",
+ "lib/netstandard2.0/System.IO.Ports.dll",
+ "lib/netstandard2.0/System.IO.Ports.xml",
+ "runtimes/unix/lib/net6.0/System.IO.Ports.dll",
+ "runtimes/unix/lib/net6.0/System.IO.Ports.xml",
+ "runtimes/unix/lib/net7.0/System.IO.Ports.dll",
+ "runtimes/unix/lib/net7.0/System.IO.Ports.xml",
+ "runtimes/unix/lib/net8.0/System.IO.Ports.dll",
+ "runtimes/unix/lib/net8.0/System.IO.Ports.xml",
+ "runtimes/win/lib/net6.0/System.IO.Ports.dll",
+ "runtimes/win/lib/net6.0/System.IO.Ports.xml",
+ "runtimes/win/lib/net7.0/System.IO.Ports.dll",
+ "runtimes/win/lib/net7.0/System.IO.Ports.xml",
+ "runtimes/win/lib/net8.0/System.IO.Ports.dll",
+ "runtimes/win/lib/net8.0/System.IO.Ports.xml",
+ "system.io.ports.8.0.0.nupkg.sha512",
+ "system.io.ports.nuspec",
+ "useSharedDesignerContext.txt"
+ ]
+ },
"System.Linq/4.3.0": {
"sha512": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==",
"type": "package",
diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache
index 617ee211..be292a5d 100644
--- a/Admin.Core.Api/obj/project.nuget.cache
+++ b/Admin.Core.Api/obj/project.nuget.cache
@@ -1,6 +1,6 @@
{
"version": 2,
- "dgSpecHash": "m2A3blUC+st79Fwfg16JlMcQb60uKgpc/Z41+H6o6SLheL3303WpH1HxhjmZqDvwzoRr+hQBbrXsDsQNMdcyCw==",
+ "dgSpecHash": "F94u7mdFSW4mcmpz6GzwgSU//e1NvwxPV8okl7gDHLi94BeS6qMoDkO+xeh6kEtannd9woqGONXb+is57Ye7ZQ==",
"success": true,
"projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"expectedPackageFiles": [
@@ -91,13 +91,19 @@
"C:\\Users\\admin\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
@@ -166,6 +172,7 @@
"C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
"C:\\Users\\admin\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
diff --git a/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs b/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs
index fad2758f..9d0684ac 100644
--- a/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs
+++ b/Admin.Core.Extensions/Middlewares/ScannerGunMildd.cs
@@ -13,14 +13,14 @@ namespace Admin.Core.Extensions
public static class ScannerGunMildd
{
private static readonly ILog log = LogManager.GetLogger(typeof(ScannerGunMildd));
- public static async void UseScannerGunMildd(this IApplicationBuilder app, IScannerGunService scannerGun)
+ public static void UseScannerGunMildd(this IApplicationBuilder app, IScannerGunService scannerGun)
{
if (app == null) throw new ArgumentNullException(nameof(app));
try
{
if (Appsettings.app("Middleware", "ScannerGun", "Enabled").ObjToBool())
{
- await scannerGun.ScannerGunAsync();
+ scannerGun.ScannerGunAsync();
}
}
catch (Exception e)
diff --git a/Aucma.Core.ScannerGun/Aucma.Core.ScannerGun.csproj b/Aucma.Core.ScannerGun/Aucma.Core.ScannerGun.csproj
index 132c02c5..e97fea9d 100644
--- a/Aucma.Core.ScannerGun/Aucma.Core.ScannerGun.csproj
+++ b/Aucma.Core.ScannerGun/Aucma.Core.ScannerGun.csproj
@@ -6,4 +6,12 @@
enable
+
+
+
+
+
+
+
+
diff --git a/Aucma.Core.ScannerGun/IScannerGunService.cs b/Aucma.Core.ScannerGun/IScannerGunService.cs
index f5237d83..984b3b68 100644
--- a/Aucma.Core.ScannerGun/IScannerGunService.cs
+++ b/Aucma.Core.ScannerGun/IScannerGunService.cs
@@ -3,6 +3,6 @@ namespace Aucma.Core.ScannerGun
{
public interface IScannerGunService
{
- Task ScannerGunAsync();
+ void ScannerGunAsync();
}
}
diff --git a/Aucma.Core.ScannerGun/ScannerGunService.cs b/Aucma.Core.ScannerGun/ScannerGunService.cs
index 22d1c5ef..a1472fd3 100644
--- a/Aucma.Core.ScannerGun/ScannerGunService.cs
+++ b/Aucma.Core.ScannerGun/ScannerGunService.cs
@@ -1,5 +1,5 @@
-using System.Timers;
-
+using log4net;
+using System.IO.Ports;
namespace Aucma.Core.ScannerGun
{
///
@@ -7,10 +7,83 @@ namespace Aucma.Core.ScannerGun
///
public class ScannerGunService : IScannerGunService
{
- public Task ScannerGunAsync()
+ private static readonly log4net.ILog log = LogManager.GetLogger(typeof(ScannerGunService));
+ public void ScannerGunAsync()
{
//COM口初始化
- return Task.CompletedTask;
+ InitScanCode();
+ }
+ /// 初始化扫码设备 采用COM连接
+ ///
+ public static void InitScanCode()
+ {
+ string COM1 = "COM3";
+ InstanceSerialPort3(COM1);
+ }
+
+ public static void InstanceSerialPort3(string portName)
+ {
+ //实例化串行端口
+ SerialPort serialPort = new SerialPort();
+ //端口名 注:因为使用的是USB转RS232 所以去设备管理器中查看一下虚拟com口的名字
+ serialPort.PortName = portName;
+ //波特率
+ serialPort.BaudRate = 9600;
+ //奇偶校验
+ serialPort.Parity = Parity.None;
+ //停止位
+ serialPort.StopBits = StopBits.One;
+ //数据位
+ serialPort.DataBits = 8;
+ //忽略null字节
+ serialPort.DiscardNull = true;
+ //接收事件
+ serialPort.DataReceived += serialPort_DataReceived;
+ //开启串口
+ serialPort.Open();
+ }
+ ///
+ /// 接收数据
+ ///
+ ///
+ ///
+ static void serialPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
+ {
+ try
+ {
+ //防止数据接收不完整 线程sleep(1000)
+ System.Threading.Thread.Sleep(1000);
+ SerialPort serialPort = (SerialPort)sender;
+
+ //开启接收数据线程
+ Thread threadReceiveSub = new Thread(new ParameterizedThreadStart(ReceiveData));
+ threadReceiveSub.Start(serialPort);
+ }
+ catch (Exception ex)
+ {
+ throw;
+ }
+ }
+ private static void ReceiveData(object serialPortobj)
+ {
+ try
+ {
+ SerialPort serialPort = (SerialPort)serialPortobj;
+
+ string code = serialPort.ReadExisting();
+ if (string.IsNullOrEmpty(code))
+ {
+ //MessageBox.Show("未扫描到条码!", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ //传递给前端提醒
+ return;
+ }
+ //业务处理
+
+ }
+ catch (Exception ex)
+ {
+ log.Error(ex.Message);
+ }
}
}
}