Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 68ebc882 由 LN
选项

Merge branch 'master' of http://106.15.194.121:8083/sunke/RC1250-AssemblyLine

2 个父辈 757ca089 171608e9
内嵌 并排
正在显示 5 个修改的文件 包含 109 行增加 和 26 行删除
dll/RFID/Asa.RFID.ReadAll.dll 0 → 100644
此文件类型无法预览
dll/RFID/Asa.RFID.ReadAll.xml 0 → 100644
<?xml version="1.0"?>
<doc>
<assembly>
<name>Asa.RFID.ReadAll</name>
</assembly>
<members>
<member name="T:Asa.RFID.ReadAll">
<summary>
读取所有RFID
</summary>
</member>
<member name="M:Asa.RFID.ReadAll.#ctor(System.String)">
<summary>
读取所有RFID
</summary>
<param name="logName">日志名称</param>
</member>
<member name="P:Asa.RFID.ReadAll.Type">
<summary>
设备类型
</summary>
</member>
<member name="M:Asa.RFID.ReadAll.Start(System.Int32)">
<summary>
开始
</summary>
<param name="port">端口号</param>
</member>
<member name="M:Asa.RFID.ReadAll.Stop">
<summary>
停止
</summary>
</member>
<member name="M:Asa.RFID.ReadAll.Read(System.String,System.String)">
<summary>
读取
</summary>
<param name="ip">IP地址</param>
<param name="defaultID">没有找到时返回</param>
<returns></returns>
</member>
<member name="M:Asa.RFID.ReadAll.Read(System.String)">
<summary>
读取所有
</summary>
<param name="defaultID">没有数据时返回</param>
</member>
<member name="M:Asa.RFID.ReadAll.Clear(System.String,System.String)">
<summary>
清除缓存
</summary>
<param name="ip">IP地址</param>
<param name="defaultID">设置初始ID</param>
</member>
<member name="M:Asa.RFID.ReadAll.Clear(System.String)">
<summary>
清除所有缓存
</summary>
<param name="defaultID">设置初始ID</param>
</member>
<member name="T:Asa.RFID.DeviceType">
<summary>
RFID读卡器类型
</summary>
</member>
<member name="F:Asa.RFID.DeviceType.PuYue">
<summary>
普阅（新）
</summary>
</member>
<member name="F:Asa.RFID.DeviceType.HaoBin">
<summary>
浩斌（旧）
</summary>
</member>
</members>
</doc>
source/AssemblyLineClient/App.config
...@@ -67,22 +67,6 @@ ...@@ -67,22 +67,6 @@
<add key="ConfigPath_TrayList" value="\LineConfig\TrayList.data"/> <add key="ConfigPath_TrayList" value="\LineConfig\TrayList.data"/>
<add key="TESTFILE" value="D:\皮带线料盘识别\test.bmp"/> <add key="TESTFILE" value="D:\皮带线料盘识别\test.bmp"/>
</appSettings> </appSettings>
<!-- <log4net> -->
<!-- <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> -->
<!-- <file value="logs/Line-RC1250.log" /> -->
<!-- <param name="Encoding" value="UTF-8" /> -->
<!-- <appendToFile value="true" /> -->
<!-- <rollingStyle value="Date" /> -->
<!-- <datePattern value="yyyy-MM-dd" /> -->
<!-- <layout type="log4net.Layout.PatternLayout"> -->
<!-- <conversionPattern value="[%date][%t]%-5p %m%n" /> -->
<!-- </layout> -->
<!-- </appender> -->
<!-- <root> -->
<!-- <level value="Info" /> -->
<!-- <appender-ref ref="RollingLogFileAppender" /> -->
<!-- </root> -->
<!-- </log4net> -->
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs/Line-RC1250.log"/> <file value="logs/Line-RC1250.log"/>
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
<Reference Include="Asa.Camera.VisionLib"> <Reference Include="Asa.Camera.VisionLib">
<HintPath>..\..\dll\Asa.Camera.VisionLib.dll</HintPath> <HintPath>..\..\dll\Asa.Camera.VisionLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.RFID"> <Reference Include="Asa.RFID.ReadAll">
<HintPath>..\..\dll\RFID\Asa.RFID.dll</HintPath> <HintPath>..\..\dll\RFID\Asa.RFID.ReadAll.dll</HintPath>
</Reference> </Reference>
<Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
......
source/DeviceLibrary/assemblymanager/RFIDManagercs.cs
...@@ -16,7 +16,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,7 +16,8 @@ namespace OnlineStore.DeviceLibrary
public class RFIDManager public class RFIDManager
{ {
public static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum); public static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
private static ReadAll readAll = new ReadAll("TheRFID"); private static Asa.RFID.ReadAll readHao;
private static Asa.RFID.ReadAll readPu;
private static bool IsOpen = false; private static bool IsOpen = false;
private static ConcurrentDictionary<string, List<RfidCacheInfo>> LastRfidMap = new ConcurrentDictionary<string, List<RfidCacheInfo>>(); private static ConcurrentDictionary<string, List<RfidCacheInfo>> LastRfidMap = new ConcurrentDictionary<string, List<RfidCacheInfo>>();
public static void Open() public static void Open()
...@@ -32,9 +33,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,9 +33,13 @@ namespace OnlineStore.DeviceLibrary
{ {
port = 13000; port = 13000;
} }
LogUtil.info("RFID Server Open，port=" + port); LogUtil.info($"RFID Server Open，HaoBin port={port},PuYue port={port+1}");
readAll.Received += ReadAll_Received; readHao = new Asa.RFID.ReadAll("TheRFID") { Type = Asa.RFID.DeviceType.HaoBin };
readAll.Start(); readHao.Received += ReadAll_Received;
readHao.Start(port);
readPu = new Asa.RFID.ReadAll("TheRFID") { Type = Asa.RFID.DeviceType.PuYue };
readPu.Received += ReadAll_Received;
readPu.Start(port+1);
IsOpen = true; IsOpen = true;
} }
catch (Exception ex) catch (Exception ex)
...@@ -239,11 +244,27 @@ namespace OnlineStore.DeviceLibrary ...@@ -239,11 +244,27 @@ namespace OnlineStore.DeviceLibrary
{ {
if (String.IsNullOrEmpty(ip).Equals(false)) if (String.IsNullOrEmpty(ip).Equals(false))
{ {
string outValue = readAll.Read(ip); Dictionary<string,string> allHao= readHao.Read();
string outValue = "";
if (allHao.ContainsKey(ip))
{
outValue = allHao[ip];
if (isClear) if (isClear)
{ {
readAll.Clear(ip); readHao.Clear(ip,"00");
}
}
else
{
Dictionary<string, string> allPu = readPu.Read();
if (allPu.ContainsKey(ip))
{
outValue = allPu[ip];
if (isClear)
{
readPu.Clear(ip,"00");
}
}
} }
if (outValue.Equals("000")) if (outValue.Equals("000"))
{ {
...@@ -265,7 +286,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -265,7 +286,8 @@ namespace OnlineStore.DeviceLibrary
try try
{ {
IsOpen = false; IsOpen = false;
readAll.Stop(); readPu.Stop();
readHao.Stop();
} }
catch (Exception ex) catch (Exception ex)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!