From 78584911d0457ad9fc26d9dfc6f374b7ef531c0f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期日, 22 十一月 2020 13:45:09 +0800
Subject: [PATCH] 1. 添加操作员输入和界面显示 2. 添加通过输入窗体 3. 添加webservice调用帮助类 4. M071添加MES数据检查和数据上传功能，添加相关界面显示和流程控制
---
src/Bro.Device.HikCamera/HikCameraDriver.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/Bro.Device.HikCamera/HikCameraDriver.cs b/src/Bro.Device.HikCamera/HikCameraDriver.cs
index 02864f5..b77232f 100644
--- a/src/Bro.Device.HikCamera/HikCameraDriver.cs
+++ b/src/Bro.Device.HikCamera/HikCameraDriver.cs
@@ -392,9 +392,11 @@
}
}
- public override ImageSet Snapshot(IOperationConfig config)
+ public override IImageSet Snapshot(IOperationConfig config)
{
- ImageSet set = base.Snapshot(config);
+ ImageSet set = new ImageSet();
+ InitialImageSet(set, (config as CameraOprerationConfigBase).ImageSaveOption);
+
MyCamera.MV_FRAME_OUT frameInfo = new MyCamera.MV_FRAME_OUT();
nRet = MyCamera.MV_OK;
@@ -461,15 +463,14 @@
{
if (nMsgType == MyCamera.MV_EXCEPTION_DEV_DISCONNECT)
{
- Thread.Sleep(1000);
-
- Stop();
-
if (CurrentState != EnumHelper.DeviceState.DSClose)
{
int reTryTimes = 3;
do
{
+ Thread.Sleep(1000);
+ Stop();
+
try
{
Start();
@@ -482,7 +483,7 @@
if (reTryTimes > 0)
{
//OnLog?.Invoke(DateTime.Now, this, "閲嶆柊杩炴帴鐩告満寮傚父\r\n" + ex.GetExceptionMessage());
- LogAsync(DateTime.Now, "閲嶆柊杩炴帴寮傚父", ex.GetExceptionMessage());
+ LogAsync(DateTime.Now, $"{this.Name}閲嶆柊杩炴帴寮傚父", ex.GetExceptionMessage());
}
else
{
--
Gitblit v1.8.0