Skip to content

李娜 / SO664-AssemblyLine

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

更改rfiddll

1 个父辈 2795400b
全部展开
内嵌 并排
正在显示 24 个修改的文件 包含 66 行增加 和 77 行删除
dll/RFID/Asa.RFID.HiStation.dll 0 → 100644
此文件类型无法预览
dll/RFID/Asa.RFID.IReadAll.dll 0 → 100644
此文件类型无法预览
dll/RFID/Asa.RFID.dll deleted 100644 → 0
此文件类型无法预览
dll/RFID/Asa.RFID.xml deleted 100644 → 0
<?xml version="1.0"?>
<doc>
<assembly>
<name>Asa.RFID</name>
</assembly>
<members>
<member name="T:Asa.RFID.ReadAll">
<summary>
读取所有RFID
</summary>
</member>
<member name="T:Asa.RFID.ReadAll.ReceivedEvent">
<summary>
接收数据包事件
</summary>
<param name="ip"></param>
<param name="id"></param>
</member>
<member name="E:Asa.RFID.ReadAll.Received">
<summary>
接收数据包
</summary>
</member>
<member name="T:Asa.RFID.ReadAll.ReceiveBufferEvent">
<summary>
接收网卡缓存事件
</summary>
<param name="ip"></param>
<param name="buffer"></param>
</member>
<member name="E:Asa.RFID.ReadAll.ReceiveBuffer">
<summary>
接收网卡缓存
</summary>
</member>
<member name="M:Asa.RFID.ReadAll.#ctor(System.String)">
<summary>
读取所有RFID
</summary>
<param name="logName">日志名称</param>
</member>
<member name="M:Asa.RFID.ReadAll.Start(System.Int32)">
<summary>
开启
</summary>
<param name="port">RFID设备的端口</param>
</member>
<member name="M:Asa.RFID.ReadAll.Stop">
<summary>
停止
</summary>
</member>
<member name="M:Asa.RFID.ReadAll.Read(System.String)">
<summary>
读取ID号
</summary>
<param name="ip"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.ReadAll.Clear(System.String)">
<summary>
清除缓存
</summary>
<param name="ip"></param>
</member>
</members>
</doc>
dll/RFID/Basic.dll deleted 100644 → 0
此文件类型无法预览
dll/RFID/HFReader9CSharp.dll deleted 100644 → 0
此文件类型无法预览
dll/RFID/ReadMe.txt deleted 100644 → 0
1.0.0.0 2019-11-19
1、钉盘上传
\ No newline at end of file \ No newline at end of file
dll/RFID/log4net.dll 0 → 100644
此文件类型无法预览
source/AssemblyLineClient/AssemblyLineClient.csproj
...@@ -284,6 +284,9 @@ ...@@ -284,6 +284,9 @@
<Content Include="image\green1.png"> <Content Include="image\green1.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="image\line.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\red0.png"> <Content Include="image\red0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
source/AssemblyLineClient/FrmBase.Designer.cs
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
this.Name = "FrmBase"; this.Name = "FrmBase";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmBase"; this.Text = "FrmBase";
this.Load += new System.EventHandler(this.FrmBase_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
......
source/AssemblyLineClient/FrmBase.cs
...@@ -57,5 +57,9 @@ namespace OnlineStore.AssemblyLine ...@@ -57,5 +57,9 @@ namespace OnlineStore.AssemblyLine
InitializeComponent(); InitializeComponent();
} }
private void FrmBase_Load(object sender, EventArgs e)
{
}
} }
} }
source/AssemblyLineClient/FrmBase.resx
...@@ -112,12 +112,12 @@ ...@@ -112,12 +112,12 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, internalKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, internalKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, internalKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAA8AMDAQAAEABABoBgAA9gAAACgoEAABAAQAyAQAAF4HAAAgIBAAAQAEAOgCAAAmDAAAGBgQAAEA AAABAA8AMDAQAAEABABoBgAA9gAAACgoEAABAAQAyAQAAF4HAAAgIBAAAQAEAOgCAAAmDAAAGBgQAAEA
......
source/AssemblyLineClient/FrmHYEquip.cs
...@@ -244,7 +244,6 @@ namespace OnlineStore.AssemblyLine ...@@ -244,7 +244,6 @@ namespace OnlineStore.AssemblyLine
{ {
btnStart.Enabled = !isStart; btnStart.Enabled = !isStart;
btnStop.Enabled = true; btnStop.Enabled = true;
btnReset.Enabled = isStart;
//btnInStore.Enabled = isStart; //btnInStore.Enabled = isStart;
btnOutStore.Enabled = isStart; btnOutStore.Enabled = isStart;
} }
...@@ -256,9 +255,17 @@ namespace OnlineStore.AssemblyLine ...@@ -256,9 +255,17 @@ namespace OnlineStore.AssemblyLine
private void btnStart_Click(object sender, EventArgs e) private void btnStart_Click(object sender, EventArgs e)
{ {
LogUtil.info(equipBean.Name + "点击：启动调试"); if (equipBase.runStatus.Equals(LineRunStatus.Wait))
{
LogUtil.info(equipBean.Name + "点击：启用调试");
StartDebug(); StartDebug();
} }
else
{
LogUtil.info(equipBean.Name + "点击：复位");
Reset();
}
}
private void btnStop_Click(object sender, EventArgs e) private void btnStop_Click(object sender, EventArgs e)
{ {
LogUtil.info(equipBean.Name + "点击：停止"); LogUtil.info(equipBean.Name + "点击：停止");
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -130,7 +130,8 @@ namespace OnlineStore.AssemblyLine ...@@ -130,7 +130,8 @@ namespace OnlineStore.AssemblyLine
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
tabControl1.TabPages.Remove(tabPage4); tabControl1.TabPages.Remove(tabPage4);
tabControl1.TabPages.Remove(tabPage5); //tabControl1.TabPages.Remove(tabPage5);
picLine.Image = ManagerUtil.M_Line;
timer1.Start(); timer1.Start();
} }
......
source/AssemblyLineClient/ManagerUtil.cs
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
...@@ -29,5 +31,40 @@ namespace OnlineStore.AssemblyLine ...@@ -29,5 +31,40 @@ namespace OnlineStore.AssemblyLine
MessageBox.Show(ex.ToString()); MessageBox.Show(ex.ToString());
} }
} }
public static Image M_Line;
/// <summary>
/// 是否已经初始化过了
/// </summary>
public static bool IsInit = false;
public static Image GetImage(string file)
{
Image result = null;
if (File.Exists(file))
{
Image image = Image.FromFile(file);
result = new System.Drawing.Bitmap(image);
image.Dispose();
}
else
{
}
return result;
}
public static void Init()
{
try
{
IsInit = true;
M_Line = GetImage(Application.StartupPath + "\\image\\line.png");
}
catch (Exception ex)
{
Console.Write(ex.ToString());
}
}
} }
} }
source/AssemblyLineClient/Program.cs
...@@ -102,6 +102,7 @@ namespace OnlineStore.AssemblyLine ...@@ -102,6 +102,7 @@ namespace OnlineStore.AssemblyLine
XmlConfigurator.Configure(); XmlConfigurator.Configure();
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
ManagerUtil.Init();
Application.Run(new FrmLineStore()); Application.Run(new FrmLineStore());
} }
} }
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -36,8 +36,11 @@ ...@@ -36,8 +36,11 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Asa.RFID"> <Reference Include="Asa.RFID.HiStation">
<HintPath>..\..\dll\RFID\Asa.RFID.dll</HintPath> <HintPath>..\..\dll\RFID\Asa.RFID.HiStation.dll</HintPath>
</Reference>
<Reference Include="Asa.RFID.IReadAll">
<HintPath>..\..\dll\RFID\Asa.RFID.IReadAll.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
...@@ -14,6 +14,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,6 +14,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public class RFIDManager public class RFIDManager
{ {
private static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum); private static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
private static ReadAll readAll = new ReadAll("TheRFID"); private static ReadAll readAll = new ReadAll("TheRFID");
private static bool IsOpen = false; private static bool IsOpen = false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!