rfid修改

source/DeviceLibrary/DeviceLibrary.csproj

@@ -48,13 +48,13 @@
     <Reference Include="halcondotnet">
     <Reference Include="halcondotnet">
       <HintPath>..\..\..\RC32-SZBOSCH-ACSingleStore\dll\halcondotnet.dll</HintPath>
       <HintPath>..\..\..\RC32-SZBOSCH-ACSingleStore\dll\halcondotnet.dll</HintPath>
     </Reference>
     </Reference>
+    <Reference Include="HFReader9CSharp">
+      <HintPath>..\..\dll\RFID\HFReader9CSharp.dll</HintPath>
+    </Reference>
     <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
     <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\dll\log4net.dll</HintPath>
       <HintPath>..\..\dll\log4net.dll</HintPath>
     </Reference>
     </Reference>
-    <Reference Include="RFIDLibrary">
-      <HintPath>..\..\dll\RFID\RFIDLibrary.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing" />
@@ -82,7 +82,9 @@
     <Compile Include="device\PanasonicServo\ACCMDManager.cs" />
     <Compile Include="device\PanasonicServo\ACCMDManager.cs" />
     <Compile Include="device\PanasonicServo\ACServerManager.cs" />
     <Compile Include="device\PanasonicServo\ACServerManager.cs" />
     <Compile Include="device\PanasonicServo\ACServerManager_Partial.cs" />
     <Compile Include="device\PanasonicServo\ACServerManager_Partial.cs" />
+    <Compile Include="device\RFID\RFID.cs" />
     <Compile Include="device\RFID\RFIDManager.cs" />
     <Compile Include="device\RFID\RFIDManager.cs" />
+    <Compile Include="device\RFID\RFIDReader.cs" />
     <Compile Include="store\AutoInoutInfo.cs" />
     <Compile Include="store\AutoInoutInfo.cs" />
     <Compile Include="store\LineMoveP.cs" />
     <Compile Include="store\LineMoveP.cs" />
     <Compile Include="store\LineAlarm.cs">
     <Compile Include="store\LineAlarm.cs">

source/DeviceLibrary/device/RFID/RFIDReader.cs

+using log4net;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static Asa.RFID.RFID;
+
+namespace Asa.RFID
+{
+    public class RFIDReader
+    {
+        public static readonly ILog LOGGER = LogManager.GetLogger("TheRFID");
+
+        private static Dictionary<string, RFID> rfidMap = new Dictionary<string, RFID>();
+
+        /// <summary>
+        /// 打开所有
+        /// </summary>
+        /// <param name="ipArr"></param>
+        /// <param name="OnReceive"></param>
+        /// <param name="ip"></param>
+        public static  void Open(Received_Event OnReceive, params string[] ipArr)
+        {
+            foreach(var ip in ipArr)
+            {
+                if (rfidMap.ContainsKey(ip))
+                {
+                    rfidMap[ip].StartAutoScan(OnReceive);
+                }
+                else
+                {
+                    RFID rfid = new RFID(ip);
+                    rfid.StartAutoScan(OnReceive);
+                    rfidMap.Add(ip, rfid);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取最后读到的标签并清理
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <returns></returns>
+        public static byte[] ReadAndClear(string ip)
+        {
+            if (rfidMap.ContainsKey(ip))
+            {
+                return rfidMap[ip].ReadAndClear();
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 获取最后读到的标签
+        /// </summary>
+        /// <param name="ip"></param>
+        /// <returns></returns>
+        public static byte[] Read(string ip)
+        {
+            if (rfidMap.ContainsKey(ip))
+            {
+                return rfidMap[ip].Read();
+            }
+            return null;
+        }
+
+
+        /// <summary>
+        /// 关闭所有
+        /// </summary>
+        public static void CloseAll()
+        {
+            foreach(var rfid in rfidMap.Values)
+            {
+                rfid.StopAutoScan();
+            }
+        }
+    }
+}