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

demo

Browse Source
Test
杨威 3 weeks ago
parent 45605775c5
commit eab733f0ad
11 changed files with 95 additions and 58 deletions
Show Stats Download Patch File Download Diff File

8
DNSD_DB/DNSD_DB.csproj
Unescape Escape View File

@ -36,14 +36,14 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="Chloe, Version=5.27.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.5.27.0\lib\net46\Chloe.dll</HintPath>
<Reference Include="Chloe, Version=5.30.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.5.30.0\lib\net46\Chloe.dll</HintPath>
</Reference>
<Reference Include="Chloe.Extension, Version=5.25.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.Extension.5.25.0\lib\net46\Chloe.Extension.dll</HintPath>
</Reference>
<Reference Include="Chloe.SQLite, Version=5.27.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.SQLite.5.27.0\lib\net46\Chloe.SQLite.dll</HintPath>
<Reference Include="Chloe.SQLite, Version=5.30.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.SQLite.5.30.0\lib\net46\Chloe.SQLite.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

4
DNSD_DB/packages.config
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Chloe" version="5.27.0" targetFramework="net48" />
<package id="Chloe.SQLite" version="5.27.0" targetFramework="net48" />
<package id="Chloe" version="5.30.0" targetFramework="net48" />
<package id="Chloe.SQLite" version="5.30.0" targetFramework="net48" />
</packages>

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

@ -93,8 +93,6 @@ namespace NDSD_Screwdriver
tool = new DengTool();
tool.Start();
FlashThreadTime();
var memorySetting = MemorySetting.Current;
@ -168,7 +166,7 @@ namespace NDSD_Screwdriver
/// <param name="e"></param>
private void DOTest_Click(object sender, EventArgs e)
{
//string str = serialPort.Read();
ScrewdriverTest screwdriverTest = new ScrewdriverTest(server, DOperateInfo);
screwdriverTest.Show();
}
@ -230,7 +228,7 @@ namespace NDSD_Screwdriver
monitorEntities.Add(new MonitorEntity()
{
RowIndex = i,
RowEntitys = InitRows(i)
RowEntitys = InitRows()
});
}
//更新值
@ -452,7 +450,7 @@ namespace NDSD_Screwdriver
}
if(_flashflag)
timer.Stop();
Thread.Sleep(500);
//刷新IO的状态
for (int i = 0; i < RFIDStatesEntities.Count; i++)
{
@ -507,9 +505,8 @@ namespace NDSD_Screwdriver
/// <summary>
/// 初始化一行
/// </summary>
/// <param name="rowNo">当前的初始化行数</param>
/// <returns></returns>
private List<RowEntity> InitRows(int rowNo)
private List<RowEntity> InitRows()
{
List<RowEntity> rowEntities = new List<RowEntity>();
for (int i = 0; i < 3; i++)

3
NDSD-Screwdriver/MemorySetting.cs
Unescape Escape View File

@ -40,6 +40,9 @@ namespace NDSD_Screwdriver
public String Com { get; set; }
public String ServiceIp { get; set; } = "tcp://127.0.0.1:7789";
}

25
NDSD-Screwdriver/NDSD_Screwdriver.csproj
Unescape Escape View File

@ -33,16 +33,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Chloe, Version=5.27.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.5.27.0\lib\net46\Chloe.dll</HintPath>
<Reference Include="Chloe, Version=5.30.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.5.30.0\lib\net46\Chloe.dll</HintPath>
</Reference>
<Reference Include="Chloe.SQLite, Version=5.27.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.SQLite.5.27.0\lib\net46\Chloe.SQLite.dll</HintPath>
<Reference Include="Chloe.SQLite, Version=5.30.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Chloe.SQLite.5.30.0\lib\net46\Chloe.SQLite.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="mscorlib" />
<Reference Include="NewLife.Core, Version=10.10.2024.803, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.Core.10.10.2024.803\lib\net461\NewLife.Core.dll</HintPath>
<Reference Include="NewLife.Core, Version=11.0.2024.826, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.Core.11.0.2024.826-beta0719\lib\net461\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@ -57,8 +57,8 @@
<HintPath>..\Dll\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Ports, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Ports.8.0.0\lib\net462\System.IO.Ports.dll</HintPath>
<Reference Include="System.IO.Ports, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Ports.9.0.0-preview.7.24405.7\lib\net462\System.IO.Ports.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@ -88,13 +88,13 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="TouchSocket, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5f39d7da98dac6a9, processorArchitecture=MSIL">
<HintPath>..\packages\TouchSocket.2.1.0-rc.11\lib\net472\TouchSocket.dll</HintPath>
<HintPath>..\packages\TouchSocket.2.1.0-rc.17\lib\net472\TouchSocket.dll</HintPath>
</Reference>
<Reference Include="TouchSocket.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=d6c415a2f58eda72, processorArchitecture=MSIL">
<HintPath>..\packages\TouchSocket.Core.2.1.0-rc.11\lib\net472\TouchSocket.Core.dll</HintPath>
<HintPath>..\packages\TouchSocket.Core.2.1.0-rc.17\lib\net472\TouchSocket.Core.dll</HintPath>
</Reference>
<Reference Include="TouchSocket.SerialPorts, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b0dfdf1c6b51c716, processorArchitecture=MSIL">
<HintPath>..\packages\TouchSocket.SerialPorts.2.1.0-rc.11\lib\net472\TouchSocket.SerialPorts.dll</HintPath>
<HintPath>..\packages\TouchSocket.SerialPorts.2.1.0-rc.17\lib\net472\TouchSocket.SerialPorts.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -122,6 +122,7 @@
</Compile>
<Compile Include="FormUtils.cs" />
<Compile Include="TestDataFactory.cs" />
<Compile Include="Tool\ClientFactory.cs" />
<Compile Include="Tool\DengTool.cs" />
<Compile Include="Tool\MyFixedHeaderRequestInfo.cs" />
<Compile Include="Tool\SerialPortFactory1.cs" />
@ -182,7 +183,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.11\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
<Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.17\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

46
NDSD-Screwdriver/Tool/ClientFactory.cs
Unescape Escape View File

@ -0,0 +1,46 @@
using System;
using System.Text;
using TouchSocket.Sockets;
namespace NDSD_Screwdriver.Tool
{
public class ClientFactory
{
TcpClient client = new TcpClient();
private IWaitingClient<ITcpClient, IReceiverResult> waitClient;
public ClientFactory(string ip)
{
client.ConnectAsync(ip).ConfigureAwait(false).GetAwaiter().GetResult();
//调用CreateWaitingClient获取到IWaitingClient的对象。
waitClient = client.CreateWaitingClient(new WaitingOptions()
{
FilterFunc = response => //设置用于筛选的fun委托，当返回为true时，才会响应返回
true
});
}
public byte[] Send(string str)
{
//然后使用SendThenReturn。
byte[] returnData = waitClient.SendThenReturn(Encoding.UTF8.GetBytes(str));
Console.WriteLine($"收到回应消息：{Encoding.UTF8.GetString(returnData)}");
return returnData;
//同时，如果适配器收到数据后，返回的并不是字节，而是IRequestInfo对象时，可以使用SendThenResponse.
//ResponsedData responsedData = await waitClient.SendThenResponse(Encoding.UTF8.GetBytes("RRQM"));
//IRequestInfo requestInfo = responsedData.RequestInfo;//同步收到的RequestInfo
}
}
}

5
NDSD-Screwdriver/Tool/SerialPortFactory1.cs
Unescape Escape View File

@ -3,7 +3,8 @@ using NewLife.Log;
using NewLife;
using System.IO.Ports;
using System.Net.Http;
using NewLife.Http;
using TouchSocket.Core;
using TouchSocket.SerialPorts;
using TouchSocket.Sockets;
@ -18,7 +19,7 @@ namespace NDSD_Screwdriver.Tool
public SerialPortFactory(string portName)
{
clientSerialPortClient.Connecting = (client, e) => EasyTask.CompletedTask;//即将连接到端口
clientSerialPortClient.Connected = (client, e) => { return EasyTask.CompletedTask; };//成功连接到端口
clientSerialPortClient.Connected = (client, e) => EasyTask.CompletedTask;//成功连接到端口
clientSerialPortClient.Setup(new TouchSocket.Core.TouchSocketConfig()
.SetSerialPortOption(new SerialPortOption()
{

14
NDSD-Screwdriver/packages.config
Unescape Escape View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Chloe" version="5.27.0" targetFramework="net48" />
<package id="Chloe.SQLite" version="5.27.0" targetFramework="net48" />
<package id="NewLife.Core" version="10.10.2024.803" targetFramework="net48" />
<package id="Chloe" version="5.30.0" targetFramework="net48" />
<package id="Chloe.SQLite" version="5.30.0" targetFramework="net48" />
<package id="NewLife.Core" version="11.0.2024.826-beta0719" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.IO.Ports" version="8.0.0" targetFramework="net48" />
<package id="System.IO.Ports" version="9.0.0-preview.7.24405.7" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
<package id="TouchSocket" version="2.1.0-rc.11" targetFramework="net48" />
<package id="TouchSocket.Core" version="2.1.0-rc.11" targetFramework="net48" />
<package id="TouchSocket.SerialPorts" version="2.1.0-rc.11" targetFramework="net48" />
<package id="TouchSocket" version="2.1.0-rc.17" targetFramework="net48" />
<package id="TouchSocket.Core" version="2.1.0-rc.17" targetFramework="net48" />
<package id="TouchSocket.SerialPorts" version="2.1.0-rc.17" targetFramework="net48" />
</packages>

16
NDSD-TouchSocket/NDSD_TouchSocket.csproj
Unescape Escape View File

@ -33,8 +33,8 @@
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="mscorlib" />
<Reference Include="NewLife.Core, Version=10.10.2024.803, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.Core.10.10.2024.803\lib\net461\NewLife.Core.dll</HintPath>
<Reference Include="NewLife.Core, Version=11.0.2024.826, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.Core.11.0.2024.826-beta0719\lib\net461\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\NDSD-Screwdriver\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@ -45,8 +45,8 @@
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Ports, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Ports.8.0.0\lib\net462\System.IO.Ports.dll</HintPath>
<Reference Include="System.IO.Ports, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Ports.9.0.0-preview.7.24405.7\lib\net462\System.IO.Ports.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@ -74,13 +74,13 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="TouchSocket, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5f39d7da98dac6a9, processorArchitecture=MSIL">
<HintPath>..\packages\TouchSocket.2.1.0-rc.11\lib\net472\TouchSocket.dll</HintPath>
<HintPath>..\packages\TouchSocket.2.1.0-rc.17\lib\net472\TouchSocket.dll</HintPath>
</Reference>
<Reference Include="TouchSocket.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=d6c415a2f58eda72, processorArchitecture=MSIL">
<HintPath>..\packages\TouchSocket.Core.2.1.0-rc.11\lib\net472\TouchSocket.Core.dll</HintPath>
<HintPath>..\packages\TouchSocket.Core.2.1.0-rc.17\lib\net472\TouchSocket.Core.dll</HintPath>
</Reference>
<Reference Include="TouchSocket.SerialPorts, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b0dfdf1c6b51c716, processorArchitecture=MSIL">
<HintPath>..\packages\TouchSocket.SerialPorts.2.1.0-rc.11\lib\net472\TouchSocket.SerialPorts.dll</HintPath>
<HintPath>..\packages\TouchSocket.SerialPorts.2.1.0-rc.17\lib\net472\TouchSocket.SerialPorts.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -96,7 +96,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.11\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
<Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.17\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

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

@ -178,17 +178,6 @@ namespace NDSD_TouchSocket
}
}
//private void BufferMemory(byte[] bytes)
//{
// if (bytes[4] == 0x00 && bytes[5] == 0xB9)
// {
// BufferAnalysis.JudgeSingle(false);
// }
// else if (bytes[4] == 0xFF && bytes[5] == 0xF9)
// {
// BufferAnalysis.JudgeSingle(true);
// }
//}
}
}

10
NDSD-TouchSocket/packages.config
Unescape Escape View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NewLife.Core" version="10.10.2024.803" targetFramework="net48" />
<package id="NewLife.Core" version="11.0.2024.826-beta0719" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.IO.Ports" version="8.0.0" targetFramework="net48" />
<package id="System.IO.Ports" version="9.0.0-preview.7.24405.7" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
<package id="TouchSocket" version="2.1.0-rc.11" targetFramework="net48" />
<package id="TouchSocket.Core" version="2.1.0-rc.11" targetFramework="net48" />
<package id="TouchSocket.SerialPorts" version="2.1.0-rc.11" targetFramework="net48" />
<package id="TouchSocket" version="2.1.0-rc.17" targetFramework="net48" />
<package id="TouchSocket.Core" version="2.1.0-rc.17" targetFramework="net48" />
<package id="TouchSocket.SerialPorts" version="2.1.0-rc.17" targetFramework="net48" />
</packages>
Write Preview
Loading…
Cancel
Save