1

source/DeviceLibrary/DeviceLibrary.csproj

@@ -83,9 +83,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\RFIDAuto.cs" />
     <Compile Include="device\RFID\RFIDManager.cs" />
     <Compile Include="device\RFID\RFIDManager.cs" />
-    <Compile Include="device\RFID\RFIDReader.cs" />
+    <Compile Include="device\RFID\RFIDAutoReader.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/RFID.cs → source/DeviceLibrary/device/RFID/RFIDAuto.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 
 namespace Asa.RFID
 namespace Asa.RFID
 {
 {
-    public class RFID
+    public class RFIDAuto
     {
     {
         public static readonly ILog LOGGER = LogManager.GetLogger("TheRFID");
         public static readonly ILog LOGGER = LogManager.GetLogger("TheRFID");
 
 
@@ -28,7 +28,7 @@ namespace Asa.RFID
         /// </summary>
         /// </summary>
         public event Received_Event Received;
         public event Received_Event Received;
 
 
-        public RFID(string ip)
+        public RFIDAuto(string ip)
         {
         {
             this.IP = ip;
             this.IP = ip;
         }
         }

source/DeviceLibrary/device/RFID/RFIDReader.cs → source/DeviceLibrary/device/RFID/RFIDAutoReader.cs

@@ -4,15 +4,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using static Asa.RFID.RFID;
+using static Asa.RFID.RFIDAuto;
 
 
 namespace Asa.RFID
 namespace Asa.RFID
 {
 {
-    public class RFIDReader
+    public class RFIDAutoReader
     {
     {
         public static readonly ILog LOGGER = LogManager.GetLogger("TheRFID");
         public static readonly ILog LOGGER = LogManager.GetLogger("TheRFID");
 
 
-        private static Dictionary<string, RFID> rfidMap = new Dictionary<string, RFID>();
+        private static Dictionary<string, RFIDAuto> rfidMap = new Dictionary<string, RFIDAuto>();
 
 
         /// <summary>
         /// <summary>
         /// 打开所有
         /// 打开所有
@@ -30,7 +30,7 @@ namespace Asa.RFID
                 }
                 }
                 else
                 else
                 {
                 {
-                    RFID rfid = new RFID(ip);
+                    RFIDAuto rfid = new RFIDAuto(ip);
                     rfid.StartAutoScan(OnReceive);
                     rfid.StartAutoScan(OnReceive);
                     rfidMap.Add(ip, rfid);
                     rfidMap.Add(ip, rfid);
                 }
                 }

source/DeviceLibrary/device/RFID/RFIDManager.cs

@@ -17,7 +17,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
-                RFIDReader.Open(null, iparray);
+                RFIDAutoReader.Open(null, iparray);
             }catch(Exception ex)
             }catch(Exception ex)
             {
             {
                 LogUtil.error("Open 出错：" + ex.ToString());
                 LogUtil.error("Open 出错：" + ex.ToString());
@@ -33,11 +33,11 @@ namespace OnlineStore.DeviceLibrary
                     byte[] bdata = null;
                     byte[] bdata = null;
                     if (isClear)
                     if (isClear)
                     {
                     {
-                        bdata = RFIDReader.ReadAndClear(ip);
+                        bdata = RFIDAutoReader.ReadAndClear(ip);
                     }
                     }
                     else
                     else
                     {
                     {
-                        bdata = RFIDReader.Read(ip);
+                        bdata = RFIDAutoReader.Read(ip);
                     }
                     }
                     if (bdata == null)
                     if (bdata == null)
                     {
                     {
@@ -59,7 +59,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
-                RFIDReader.CloseAll();
+                RFIDAutoReader.CloseAll();
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {