Skip to content

张东亮 / SO1131-XLRStore

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

打开二维码学习失败问题

1 个父辈 bd56d186
全部展开
内嵌 并排
正在显示 16 个修改的文件 包含 21 行增加 和 216 行删除
dll/Asa.CameraFactory.dll deleted 100644 → 0
此文件类型无法预览
dll/Asa.CameraFactory.xml deleted 100644 → 0
<?xml version="1.0"?>
<doc>
<assembly>
<name>Asa.CameraFactory</name>
</assembly>
<members>
</members>
</doc>
dll/Asa.HIK.IPCamera.dll deleted 100644 → 0
此文件类型无法预览
dll/Asa.HIK.IPCamera.xml deleted 100644 → 0
<?xml version="1.0"?>
<doc>
<assembly>
<name>Asa.HIK.IPCamera</name>
</assembly>
<members>
<member name="T:Asa.HIK.API">
<summary>
CHCNetSDK 的摘要说明。
</summary>
</member>
<member name="F:Asa.HIK.API.NET_DVR_IPADDR.sIpV4">
char[16]
</member>
<member name="F:Asa.HIK.API.NET_DVR_IPADDR.byRes">
BYTE[128]
</member>
<member name="F:Asa.HIK.API.NET_DVR_ATM_FRAMEFORMAT_V30.byRes1">
输入方式:0-网络监听、1网络协议、2-串口监听、3-串口协议
</member>
<member name="F:Asa.HIK.API.NET_VCA_POLYGON.dwPointNum">
DWORD->unsigned int
</member>
<member name="F:Asa.HIK.API.MAX_OVERLAP_ITEM_NUM">
抓拍机
</member>
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.sMonitorIP" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.dwChanIndex" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.dwWidth" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.dwHeight" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.struCheckTime" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byResult" -->
<member name="F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.bySignalResult">
0-未检测 1-正常 2-异常 3-登录失败 4-取流异常
</member>
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byBlurResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byLumaResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byChromaResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.bySnowResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byStreakResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byFreezeResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byPTZResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byContrastResult" -->
<member name="T:Asa.HIK.IPCamera">
<summary>
网络监控摄像机
</summary>
</member>
<member name="M:Asa.HIK.IPCamera.#ctor(System.String,System.String)">
<summary>
网络监控摄像机
</summary>
<param name="configPath"></param>
<param name="logName"></param>
</member>
<member name="P:Asa.HIK.IPCamera.Name">
<summary>
相机名称
</summary>
</member>
<member name="P:Asa.HIK.IPCamera.Count">
<summary>
相机总数
</summary>
</member>
<member name="P:Asa.HIK.IPCamera.IsOpen">
<summary>
相机是否打开
</summary>
</member>
<member name="P:Asa.HIK.IPCamera.Size">
<summary>
图像分辨率
</summary>
</member>
<member name="P:Asa.HIK.IPCamera.Image">
<summary>
相机获取到的图像
</summary>
</member>
<member name="M:Asa.HIK.IPCamera.Load">
<summary>
加载
</summary>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.Dispose">
<summary>
释放所有
</summary>
</member>
<member name="M:Asa.HIK.IPCamera.OpenAll">
<summary>
打开所有摄像机
</summary>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.CloseAll">
<summary>
关闭所有摄像机
</summary>
</member>
<member name="M:Asa.HIK.IPCamera.Open(System.Int32)">
<summary>
打开摄像机
</summary>
<param name="cameraIndex"></param>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.Close(System.Int32)">
<summary>
关闭摄像机
</summary>
<param name="cameraIndex"></param>
</member>
<member name="M:Asa.HIK.IPCamera.GrabOne(System.Drawing.Bitmap[]@)">
<summary>
抓取所有摄像机一张图像
</summary>
<param name="bmp"></param>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.GrabOne(System.Int32)">
<summary>
抓取一张图像
</summary>
<param name="cameraIndex">相机索引</param>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.GrabOne(System.Int32,System.Drawing.Bitmap@)">
<summary>
抓取一张图像
</summary>
<param name="cameraIndex">相机索引</param>
<param name="bmp">Bitmap图像</param>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.GrabOne(System.Int32,System.Byte[]@,System.Drawing.Imaging.PixelFormat@)">
<summary>
抓取一张图像字节
</summary>
<param name="cameraIndex">相机索引</param>
<param name="buff">图像字节数组</param>
<param name="format"></param>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.GrabOne(System.Int32,System.IntPtr@,System.Drawing.Imaging.PixelFormat@)">
<summary>
抓取一张图像指针
</summary>
<param name="cameraIndex"></param>
<param name="handle"></param>
<param name="format"></param>
<returns></returns>
</member>
<member name="T:Asa.HIK.LoginInfo">
<summary>
登录信息
</summary>
</member>
</members>
</doc>
dll/Basler.Pylon.dll
此文件类型无法预览
dll/halcon.dll
此文件太大，无法显示。
source/DeviceLibrary/Config/Camera.json
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
"HIKIPCamera": [ "HIKIPCamera": [
{ {
"Name": "box_A", "Name": "box_A",
"IP": "192.168.109.122", "IP": "192.168.105.25",
"User": "admin", "User": "admin",
"Password": "Acc123456", "Password": "Acc123456",
"Port": 8000 "Port": 8000
......
source/DeviceLibrary/manager/StoreManager.cs
...@@ -58,7 +58,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -58,7 +58,7 @@ namespace OnlineStore.DeviceLibrary
} }
return true; return true;
} }
public static bool Init() public static bool Init(params object[] param)
{ {
try try
{ {
...@@ -122,7 +122,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -122,7 +122,7 @@ namespace OnlineStore.DeviceLibrary
//string drawConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_DrawerPosition); //string drawConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_DrawerPosition);
//CSVPositionReader<DrawerPosition>.AddCSVFile(drawConfigFile); //CSVPositionReader<DrawerPosition>.AddCSVFile(drawConfigFile);
XLRStore = new XLRStoreBean(Config, inputConfig, boxConfig); XLRStore = new XLRStoreBean(Config, inputConfig, boxConfig,param);
LogUtil.info("加载 完成！"); LogUtil.info("加载 完成！");
return true; return true;
} }
......
source/DeviceLibrary/storeBean/XLRStoreBean.cs
...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary
private bool canStart = false; private bool canStart = false;
//public SQLite sQLite = null; //public SQLite sQLite = null;
string title = ConfigAppSettings.GetValue(Setting_Init.App_Title); string title = ConfigAppSettings.GetValue(Setting_Init.App_Title);
public XLRStoreBean(XLRStore_Config config, InputEquip_Config inputConfig, BoxEquip_Config boxConfig) public XLRStoreBean(XLRStore_Config config, InputEquip_Config inputConfig, BoxEquip_Config boxConfig,params object[] param)
{ {
equipsMap = new Dictionary<int, EquipBase>(); equipsMap = new Dictionary<int, EquipBase>();
if (config.IOSingle_TimerOut <= 0) if (config.IOSingle_TimerOut <= 0)
...@@ -60,7 +60,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -60,7 +60,7 @@ namespace OnlineStore.DeviceLibrary
AgvClient.RecvServerInfo+=inputEquip.BoxA.RecvMsgFromServer; AgvClient.RecvServerInfo+=inputEquip.BoxA.RecvMsgFromServer;
inputEquip.BoxB.AgvNode = new AGVLib.Node(int.Parse(boxB[0]), boxB[1]); inputEquip.BoxB.AgvNode = new AGVLib.Node(int.Parse(boxB[0]), boxB[1]);
AgvClient.RecvServerInfo += inputEquip.BoxB.RecvMsgFromServer; AgvClient.RecvServerInfo += inputEquip.BoxB.RecvMsgFromServer;
boxEquip = new BoxEquip("2", boxConfig); boxEquip = new BoxEquip("2", boxConfig,param);
equipsMap.Add(1, inputEquip); equipsMap.Add(1, inputEquip);
equipsMap.Add(2, boxEquip); equipsMap.Add(2, boxEquip);
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -109,7 +109,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -109,7 +109,7 @@ namespace OnlineStore.DeviceLibrary
public List<BoxSlidePos> BoxSlidePos; public List<BoxSlidePos> BoxSlidePos;
public DeviceMoveInfo MoveInfoLineA; public DeviceMoveInfo MoveInfoLineA;
public DeviceMoveInfo MoveInfoLineB; public DeviceMoveInfo MoveInfoLineB;
public BoxEquip(string cid, BoxEquip_Config config) public BoxEquip(string cid, BoxEquip_Config config,params object[] param)
{ {
baseConfig = config; baseConfig = config;
this.Config = config; this.Config = config;
...@@ -129,13 +129,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -129,13 +129,16 @@ namespace OnlineStore.DeviceLibrary
InitRowColumnSig(); InitRowColumnSig();
InitAllAxis(); InitAllAxis();
InitPosititionNumList(); InitPosititionNumList();
LoadCameraConfig();
//库位调试 //库位调试
InitPosDebugInfo(); InitPosDebugInfo();
//加载滑梯位置 //加载滑梯位置
loadSlideData(); loadSlideData();
alarmRedLedType = AlarmType.IoSingleTimeOut; alarmRedLedType = AlarmType.IoSingleTimeOut;
} }
public void LoadCameraConfig(params object[] param)
{
LoadCameraConfig(param[0], param[1]);
}
void loadSlideData() void loadSlideData()
{ {
BoxSlidePos = new List<BoxSlidePos>(); BoxSlidePos = new List<BoxSlidePos>();
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Camera.cs
...@@ -28,7 +28,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -28,7 +28,7 @@ namespace OnlineStore.DeviceLibrary
{ {
camera_event += grabbedEventHandler; camera_event += grabbedEventHandler;
} }
void LoadCameraConfig(string id = "") void LoadCameraConfig(object boxA, object boxB)
{ {
Task.Factory.StartNew(new Action(() => Task.Factory.StartNew(new Action(() =>
{ {
...@@ -40,48 +40,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -40,48 +40,16 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + "找不到监控相机配置文件" + path); LogUtil.error(Name + "找不到监控相机配置文件" + path);
} }
camera = new Asa.Camera.VisionLib(path); camera = new Asa.Camera.VisionLib(path,true);
camerathread = new Thread[2]; camera.PreviewImage(boxACamName, (IntPtr)boxA);
//pictureBox1.Image = bmp; camera.PreviewImage(boxBCamName, (IntPtr)boxB);
StartCamera(); camera.Open(boxACamName);
camera.Open(boxBCamName);
loadCameraState = true; loadCameraState = true;
})); }));
} }
void StartCamera()
{
camera.Open(boxACamName);
camera.Open(boxBCamName);
IsOpen = true;
camerathread[0] = new Thread(new ParameterizedThreadStart(startMonitor));
camerathread[0].IsBackground = true;
camerathread[0].Start(boxACamName);
camerathread[1] = new Thread(new ParameterizedThreadStart(startMonitor));
camerathread[1].IsBackground = true;
camerathread[1].Start(boxBCamName);
}
void startMonitor(object obj)
{
if (!loadCameraState)
{
LogUtil.error(obj + " 监控相机初始化失败,无法开启");
return;
}
string name = (string)obj;
try
{
while (IsOpen)
{
Bitmap bmp = AcqImage(name);
if (bmp != null)
camera_event?.Invoke(new CameraArgs(name, bmp));
Thread.Sleep(300);
}
}
catch
{ }
}
public Bitmap AcqImage(string camName) public Bitmap AcqImage(string camName)
{ {
Bitmap bitmap = camera.GetImage(camName); Bitmap bitmap = camera.GetImage(camName);
......
source/XLRStoreClient/FrmXLRStore.cs
...@@ -90,6 +90,7 @@ namespace OnlineStore.XLRStore ...@@ -90,6 +90,7 @@ namespace OnlineStore.XLRStore
inputEquip = new FrmInputEquip(StoreManager.XLRStore.inputEquip); inputEquip = new FrmInputEquip(StoreManager.XLRStore.inputEquip);
AddForm(" 入料机构 ", inputEquip); AddForm(" 入料机构 ", inputEquip);
box = new FrmBoxEquip(StoreManager.XLRStore.boxEquip); box = new FrmBoxEquip(StoreManager.XLRStore.boxEquip);
StoreBean.boxEquip.LoadCameraConfig(box.picture1,box.picture2);
AddForm(" 存储机构 ", box); AddForm(" 存储机构 ", box);
if (autoValue.Equals(1)) if (autoValue.Equals(1))
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
...@@ -25,12 +25,16 @@ namespace OnlineStore.XLRStore ...@@ -25,12 +25,16 @@ namespace OnlineStore.XLRStore
FrmAxisMove frmAxisMove = null; FrmAxisMove frmAxisMove = null;
private bool IsLoad = false; private bool IsLoad = false;
private BoxEquip boxBean; private BoxEquip boxBean;
public IntPtr picture1 = IntPtr.Zero;
public IntPtr picture2 = IntPtr.Zero;
internal FrmBoxEquip(BoxEquip moveEquip) internal FrmBoxEquip(BoxEquip moveEquip)
{ {
this.boxBean = moveEquip; this.boxBean = moveEquip;
Control.CheckForIllegalCrossThreadCalls = false; Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent(); InitializeComponent();
LoadIOList(); LoadIOList();
picture1 = pictureBox1.Handle;
picture2 = pictureBox2.Handle;
} }
private void FrmStoreIOStatus_Load(object sender, EventArgs e) private void FrmStoreIOStatus_Load(object sender, EventArgs e)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!