Commit ed66d54e 张东亮

扫码小程序

1 个父辈 da61a318
此文件类型无法预览
此文件类型无法预览
......@@ -103,9 +103,9 @@ namespace OnlineStore.ACPackingStore
try
{
var pss = Process.GetProcessesByName("ScanCodeServer");
if (pss.Length > 0)
return;
if (pss.Length > 0) { }
else
{
var f = "ScanCodeServer\\ScanCodeServer.exe";
if (File.Exists(f))
{
......@@ -113,6 +113,8 @@ namespace OnlineStore.ACPackingStore
p.StartInfo = new ProcessStartInfo(f);
p.Start();
}
}
}catch (Exception ex) { }
......
......@@ -68,7 +68,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error("加载HIK相机出错:" + ex.ToString());
}
}
string[] names = Camera._cam.Name;
string[] names = Camera._cam?.Name;
if (names != null)
......@@ -130,8 +130,8 @@ namespace OnlineStore.DeviceLibrary
bool findRightCode = false;
try
{
ho_Image = Camera._cam.CaptureOnImage(cameraName);
if (ho_Image == null)
ho_Image = Camera._cam.CaptureOnImage(cameraName,out Bitmap bmp);
if (bmp == null)
{
LogUtil.error(deviceName + " 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "],关闭相机");
CloseCamera(cameraName);
......@@ -146,7 +146,7 @@ namespace OnlineStore.DeviceLibrary
codeCount = codeCount,
timeout = codeTimeout
};
cc = RemoteDecodeHelper.DecodeRequest(ho_Image, remoteDecodeParam);
cc = RemoteDecodeHelper.DecodeRequest(bmp, remoteDecodeParam);
if (cc != null)
{
foreach (CodeInfo c in cc)
......@@ -190,7 +190,7 @@ namespace OnlineStore.DeviceLibrary
//}
if (!findRightCode)
{
SaveImageToFile(deviceName, cameraName, ho_Image);
SaveImageToFile(deviceName, cameraName, bmp);
}
if (deviceName != "" || r != "")
{
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!