wangsr
/
NDSD-RFIDLight
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test

Browse Source
Test
杨威 3 weeks ago
parent d649cbbd8a
commit 954bac5bc8
4 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File

48
NDSD-Screwdriver/MainForm.cs
Unescape Escape View File

@ -111,14 +111,12 @@ namespace NDSD_Screwdriver
{ {
serialPort = new SerialPortFactory(memorySetting.Com); serialPort = new SerialPortFactory(memorySetting.Com);
for (int w = 0; w < 2; w++) Thread.Sleep(5000);
{
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
DOperateInfo.DClose(i); DOperateInfo.DClose(i);
Thread.Sleep(300); Thread.Sleep(300);
} }
}
} }
catch (Exception e) catch (Exception e)
@ -533,7 +531,7 @@ namespace NDSD_Screwdriver
{ {
var read = serialPort?.Read(); var read = serialPort?.Read();
// var read = ""; XTrace.WriteLine("读取条码:"+read);
if (read.Length == 16) if (read.Length == 16)
{ {
@ -547,34 +545,30 @@ namespace NDSD_Screwdriver
var monitorEntitiesCount = monitorEntities.Count; var monitorEntitiesCount = monitorEntities.Count;
var last = monitorEntities[FlashIndex].RFIDState;
if (FlashIndex < monitorEntitiesCount) if (FlashIndex < monitorEntitiesCount)
{ {
if (last != 100 && last==1) var rfidState = monitorEntities[FlashIndex].RFIDState;
var last = rfidState;
string no = monitorEntities[FlashIndex].RFIDValue;
if (last != 100 && no==read)
{ {
quClient2.Enable(); quClient2.Enable();
dateTime = DateTime.Now; dateTime = DateTime.Now;
if (FlashIndex < monitorEntitiesCount) if (FlashIndex < monitorEntitiesCount)
{ {
XTrace.WriteLine("a");
//状态修改
monitorEntities[FlashIndex].RFIDState = 1; monitorEntities[FlashIndex].RFIDState = 1;
DOperateInfo.DOpen(monitorEntities[FlashIndex].Yellow);
timer.Start();
} }
} }
} }
} }
else else
{ {
XTrace.WriteLine("aa");
var total = DateTime.Now - dateTime; var total = DateTime.Now - dateTime;
if (total.TotalSeconds > 2) if (total.TotalSeconds > 2)
{ {
@ -633,11 +627,10 @@ namespace NDSD_Screwdriver
if (RFIDState == 2) if (RFIDState == 2)
{ {
DOperateInfo.DClose(monitorEntities[id].Red);
Thread.Sleep(300);
DOperateInfo.DClose(monitorEntities[id].Green);
Thread.Sleep(300);
// DOperateInfo.DClose(monitorEntities[id].Green);
// Thread.Sleep(300);
XTrace.WriteLine("亮黄灯延迟");
DOperateInfo.DTimeOpen(monitorEntities[id].Yellow, 1); DOperateInfo.DTimeOpen(monitorEntities[id].Yellow, 1);
monitorEntities[id].RowEntitys[2].Color = Brushes.Yellow; monitorEntities[id].RowEntitys[2].Color = Brushes.Yellow;
} }
@ -668,6 +661,13 @@ namespace NDSD_Screwdriver
{ {
dictionary[monitorEntities[id].RFIDValue] = 1; dictionary[monitorEntities[id].RFIDValue] = 1;
} }
XTrace.WriteLine("读取Rfid 亮黄灯");
//状态修改
DOperateInfo.DOpen(monitorEntities[FlashIndex].Yellow);
timer.Start();
monitorEntities[id].RowEntitys[2].Color = Brushes.Yellow; monitorEntities[id].RowEntitys[2].Color = Brushes.Yellow;
} }
@ -675,23 +675,19 @@ namespace NDSD_Screwdriver
RFIDState = monitorEntities[id].RFIDState; RFIDState = monitorEntities[id].RFIDState;
if (RFIDState == 3) if (RFIDState == 3)
{ {
timer.Stop();
DOperateInfo.DClose(monitorEntities[id].Red); quClient2.Close();
Thread.Sleep(300); Thread.Sleep(300);
DOperateInfo.DClose(monitorEntities[id].Yellow); DOperateInfo.DClose(monitorEntities[id].Yellow);
Thread.Sleep(300); Thread.Sleep(300);
DOperateInfo.DOpen(monitorEntities[id].Green);
FormUtils.LogInsert(LogContext, "RFID {0} 发送绿灯", monitorEntities[id].RFIDValue);
XTrace.WriteLine("========================================================================");
DOperateInfo.DOpen(monitorEntities[id].Green);
Thread.Sleep(300);
DOperateInfo.DOpen(monitorEntities[id].Green);
quClient2.Close();
monitorEntities[id].RowEntitys[2].Color = Brushes.Green; monitorEntities[id].RowEntitys[2].Color = Brushes.Green;
monitorEntities[id].RFIDState=100; monitorEntities[id].RFIDState=100;
timer.Stop();
FlashIndex += 1; FlashIndex += 1;
timer.Start(); timer.Start();

2
NDSD-Screwdriver/Tool/QingTcpClient2.cs
Unescape Escape View File

@ -117,12 +117,14 @@ namespace NDSD_Screwdriver.Tool
public void Enable() public void Enable()
{ {
// XTrace.WriteLine("枪发送使能");
tcpClient.Send("00200043 \0"); tcpClient.Send("00200043 \0");
} }
public void Close() public void Close()
{ {
// XTrace.WriteLine("枪发送关闭");
tcpClient.Send("00200042 \0"); tcpClient.Send("00200042 \0");
} }

4
NDSD-TouchSocket/DOperate.cs
Unescape Escape View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using NewLife; using NewLife;
using NewLife.Log;
namespace NDSD_TouchSocket namespace NDSD_TouchSocket
{ {
@ -37,6 +38,7 @@ namespace NDSD_TouchSocket
/// <param name="delay">延迟，1代表0.1s/100ms</param> /// <param name="delay">延迟，1代表0.1s/100ms</param>
public void DTimeOpen(int port, int delay) public void DTimeOpen(int port, int delay)
{ {
XTrace.WriteLine("发送延迟开灯指令:"+(int)port);
DTimeOpen((Port)(port + 4), delay); DTimeOpen((Port)(port + 4), delay);
} }
@ -55,6 +57,7 @@ namespace NDSD_TouchSocket
/// <param name="port">int1-16</param> /// <param name="port">int1-16</param>
public void DOpen(int port) public void DOpen(int port)
{ {
XTrace.WriteLine("发送开灯指令:"+(int)port);
DOpen((Port)(port + 4)); DOpen((Port)(port + 4));
} }
@ -75,6 +78,7 @@ namespace NDSD_TouchSocket
/// <param name="port">int1-16</param> /// <param name="port">int1-16</param>
public void DClose(int port) public void DClose(int port)
{ {
XTrace.WriteLine("发送关灯指令:"+(int)port);
DClose((Port)(port + 4)); DClose((Port)(port + 4));
} }
} }

13
NDSD-TouchSocket/TcpServer.cs
Unescape Escape View File

@ -3,6 +3,8 @@ 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 NewLife;
using NewLife.Log;
using TouchSocket.Core; using TouchSocket.Core;
using TouchSocket.Sockets; using TouchSocket.Sockets;
@ -28,12 +30,12 @@ namespace NDSD_TouchSocket
{ {
service.Connecting = (client, e) => service.Connecting = (client, e) =>
{ {
Console.WriteLine(client.IP + " 正在连接"); XTrace.WriteLine(client.IP + " 正在连接");
return EasyTask.CompletedTask; return EasyTask.CompletedTask;
};//有客户端正在连接 };//有客户端正在连接
service.Connected = (client, e) => service.Connected = (client, e) =>
{ {
Console.WriteLine(client.IP + " 成功连接"); XTrace.WriteLine(client.IP + " 成功连接");
service.ResetIdAsync(client.Id, client.IP); service.ResetIdAsync(client.Id, client.IP);
this.ClientIP = client.IP; this.ClientIP = client.IP;
this.ClientPort = client.Port.ToString(); this.ClientPort = client.Port.ToString();
@ -41,12 +43,12 @@ namespace NDSD_TouchSocket
};//有客户端成功连接 };//有客户端成功连接
service.Closing = (client, e) => service.Closing = (client, e) =>
{ {
Console.WriteLine(client.IP + " 正在断开连接"); XTrace.WriteLine(client.IP + " 正在断开连接");
return EasyTask.CompletedTask; return EasyTask.CompletedTask;
};//有客户端正在断开连接，只有当主动断开时才有效。 };//有客户端正在断开连接，只有当主动断开时才有效。
service.Closed = (client, e) => service.Closed = (client, e) =>
{ {
Console.WriteLine(client.IP + " 断开连接"); XTrace.WriteLine(client.IP + " 断开连接");
return EasyTask.CompletedTask; return EasyTask.CompletedTask;
};//有客户端断开连接 };//有客户端断开连接
service.Received = (client, e) => service.Received = (client, e) =>
@ -56,7 +58,8 @@ namespace NDSD_TouchSocket
//logHelper.Info($"已从{client.IP}:{client.Port}接收到信息：{mes}"); //logHelper.Info($"已从{client.IP}:{client.Port}接收到信息：{mes}");
//BufferMemory(BufferAnalysis.SplitByteArray(e.ByteBlock.Span.ToArray(), 0, e.ByteBlock.Length)); //BufferMemory(BufferAnalysis.SplitByteArray(e.ByteBlock.Span.ToArray(), 0, e.ByteBlock.Length));
var byte2 = BufferAnalysis.SplitByteArray(e.ByteBlock.Span.ToArray(), 0, e.ByteBlock.Length);
XTrace.WriteLine(byte2.ToHex(" "));
return EasyTask.CompletedTask; return EasyTask.CompletedTask;
}; };

Write Preview
Loading…
Cancel
Save