Skip to content

张东亮 / SO1057-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 9d8c1f31 由 张东亮
选项

1

1 个父辈 763c406e
内嵌 并排
正在显示 7 个修改的文件 包含 3 行增加 和 105 行删除
SO1057-XLRStore.sln
......@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XLRStore", "source\XLRStore
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HuichuanLibrary", "source\HuichuanLibrary\HuichuanLibrary.csproj", "{C9575C5E-9D4B-4B4F-BE41-926652B8985F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DL.CV", "source\DL.CV\DL.CV.csproj", "{938FFF9D-9E84-457A-A692-C46E916208E0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -41,10 +39,6 @@ Global
{C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Release|Any CPU.Build.0 = Release|Any CPU
{938FFF9D-9E84-457A-A692-C46E916208E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{938FFF9D-9E84-457A-A692-C46E916208E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{938FFF9D-9E84-457A-A692-C46E916208E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{938FFF9D-9E84-457A-A692-C46E916208E0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -183,10 +183,6 @@
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name>
</ProjectReference>
<ProjectReference Include="..\DL.CV\DL.CV.csproj">
<Project>{938fff9d-9e84-457a-a692-c46e916208e0}</Project>
<Name>DL.CV</Name>
</ProjectReference>
<ProjectReference Include="..\HuichuanLibrary\HuichuanLibrary.csproj">
<Project>{c9575c5e-9d4b-4b4f-be41-926652b8985f}</Project>
<Name>HuichuanLibrary</Name>
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
......@@ -124,7 +124,6 @@ namespace OnlineStore.DeviceLibrary
InitRowColumnSig();
InitAllAxis();
InitPosititionNumList();
LoadCameraConfig();
//库位调试
InitPosDebugInfo();
alarmRedLedType = AlarmType.IoSingleTimeOut;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Camera.cs
using DL.CV;
using OnlineStore.Common;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using OnlineStore.Common;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using static Dolen.CV.IPCamera;
namespace OnlineStore.DeviceLibrary
{
......@@ -18,41 +7,6 @@ namespace OnlineStore.DeviceLibrary
{
public const string boxACamName = "box_A";
public const string boxBCamName = "box_B";
bool loadCameraState = false;
void LoadCameraConfig(string id = "")
{
if (loadCameraState)
return;
string path = @".\Config\IPCamera.json";
if (!File.Exists(path))
{
LogUtil.error(Name + "找不到监控相机配置文件:" + path);
}
IPCameraManager.LoadConfig(path);
loadCameraState = true;
}
public void RegisterCameraAGrabImage(ImageGrabbedEventHandler grabbedEventHandler)
{
IPCameraManager.GetCamera(boxACamName).ImageGrabbed += grabbedEventHandler;
IPCameraManager.GetCamera(boxACamName).StartLive();
}
public void RegisterCameraBGrabImage(ImageGrabbedEventHandler grabbedEventHandler)
{
IPCameraManager.GetCamera(boxBCamName).ImageGrabbed += grabbedEventHandler;
IPCameraManager.GetCamera(boxBCamName).StartLive();
}
public void UnRegisterCameraAGrabImage(ImageGrabbedEventHandler grabbedEventHandler)
{
IPCameraManager.GetCamera(boxACamName).ImageGrabbed -= grabbedEventHandler;
IPCameraManager.GetCamera(boxACamName).StopLive();
}
public void UnRegisterCameraBGrabImage(ImageGrabbedEventHandler grabbedEventHandler)
{
IPCameraManager.GetCamera(boxBCamName).ImageGrabbed -= grabbedEventHandler;
IPCameraManager.GetCamera(boxBCamName).StopLive();
}
string imgPath = ConfigAppSettings.GetValue(Setting_Init.ImagePath);
void StartRecord() { }
void StopRecord() { }
......
source/DeviceLibrary/storeBean/boxBean/Humiture/HumitureBean.cs
using Emgu.CV.DepthAI;
using OnlineStore.Common;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
......
source/XLRStoreClient/XLRStore.csproj
......@@ -331,10 +331,6 @@
<Project>{513bc1c9-800d-43a6-9499-3700baec3554}</Project>
<Name>DeviceLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\DL.CV\DL.CV.csproj">
<Project>{938FFF9D-9E84-457A-A692-C46E916208E0}</Project>
<Name>DL.CV</Name>
</ProjectReference>
<ProjectReference Include="..\LoadCVSLibrary\LoadCSVLibrary.csproj">
<Project>{064bebf5-8faa-4ea2-a5f3-a06e6e7d9251}</Project>
<Name>LoadCSVLibrary</Name>
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
using Dolen.CV;
using OnlineStore.Common;
using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -37,44 +36,8 @@ namespace OnlineStore.XLRStore
chbDebug.Checked = boxBean.IsDebug;
FrmPosDebug frmPosDebug = new FrmPosDebug();
AddForm(tabControl1, " 库位调试 ", frmPosDebug);
boxBean.RegisterCameraAGrabImage(BoxBean_camera_A_event);
boxBean.RegisterCameraBGrabImage(BoxBean_camera_B_event);
IsLoad = true;
}
/// <summary>
/// 监控相机A采集图像事件
/// </summary>
/// <param name="cameraArgs"></param>
private void BoxBean_camera_A_event(IPCameraEventArgs cameraArgs)
{
//if (!this.IsHandleCreated) return;
//try
//{
// this.Invoke(new Action(() =>
// {
// if (!groupBox2.Text.Contains("-"))
// groupBox2.Text = $"A相机-{cameraArgs.IP}-ch{cameraArgs.ChannelNum}";
// pictureBox1.Image = cameraArgs.Image;
// }));
//}
//catch { }
}
private void BoxBean_camera_B_event(IPCameraEventArgs cameraArgs)
{
//if (!this.IsHandleCreated) return;
//try
//{
// this.Invoke(new Action(() =>
// {
// if (!groupBox5.Text.Contains("-"))
// groupBox5.Text = $"B相机-{cameraArgs.IP}-ch{cameraArgs.ChannelNum}";
// pictureBox2.Image = cameraArgs.Image;
// }));
//}
//catch { }
}
protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
protected void ReadIOList()
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!