Commit 8ed0bb84 几米阳光

获取图片时若未找到相机重新加载相机

1 个父辈 5338ca7a
...@@ -133,6 +133,8 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,, ...@@ -133,6 +133,8 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,,
20190314修改: 20190314修改:
拿走料盘的过程中增加出库处理。 拿走料盘的过程中增加出库处理。
20190315修改:
启动过程中若未加载到相机,获取图片时重新加载相机。
......
...@@ -972,12 +972,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -972,12 +972,8 @@ namespace OnlineStore.DeviceLibrary
bool result = StartRun(); bool result = StartRun();
if (!result) if (!result)
{ {
LogUtil.info("料仓启动失败,继续等待下次启动!"); LogUtil.info("料仓启动失败,继续等待下次启动!");
int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun); mainTimer.Enabled = true;
if (isAuto == 1)
{
mainTimer.Enabled = true;
}
} }
} }
lastAutoRun = autoSingle; lastAutoRun = autoSingle;
......
...@@ -46,18 +46,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,18 +46,7 @@ namespace OnlineStore.DeviceLibrary
codeTypeList.Add(str.Trim()); codeTypeList.Add(str.Trim());
} }
string[] names = CodeLibrary.HIKCamera.Instance.CameraName; LoadCamera();
hikNameList.AddRange(names);
names = CodeLibrary.BaslerCamera.Instance.CameraName;
balserNameList.AddRange(names);
foreach(string name in hikNameList)
{
LogUtil.info("加载到HIK相机:" + name);
}
foreach (string name in balserNameList)
{
LogUtil.info("加载到Balser相机:" + name);
}
CodeLibrary.HDCodeLearnHelper.LoadConfig(nameStr, codeStr); CodeLibrary.HDCodeLearnHelper.LoadConfig(nameStr, codeStr);
} }
...@@ -66,10 +55,31 @@ namespace OnlineStore.DeviceLibrary ...@@ -66,10 +55,31 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error("解析摄像机配置出错:" + ex.ToString()); LogUtil.error("解析摄像机配置出错:" + ex.ToString());
} }
} }
private static void LoadCamera()
{
string[] names = CodeLibrary.HIKCamera.Instance.CameraName;
hikNameList.AddRange(names);
names = CodeLibrary.BaslerCamera.Instance.CameraName;
balserNameList.AddRange(names);
foreach (string name in hikNameList)
{
LogUtil.info("加载到HIK相机:" + name);
}
foreach (string name in balserNameList)
{
LogUtil.info("加载到Balser相机:" + name);
}
}
public static Bitmap GetCamerImage(string cameraName) public static Bitmap GetCamerImage(string cameraName)
{ {
Bitmap bitm = null; Bitmap bitm = null;
//若未加载到相机,需要重新加载相机
if (balserNameList.Count <= 0 && hikNameList.Count <= 0)
{
LogUtil.error("获取图片时发现未加载到相机,重新加载相机");
LoadCamera();
}
if (balserNameList.Contains(cameraName)) if (balserNameList.Contains(cameraName))
{ {
BaslerCamera.Instance.Open(cameraName); BaslerCamera.Instance.Open(cameraName);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!