From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 29 九月 2020 13:27:50 +0800
Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy,原来是为了避免内存泄漏,但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收,怀疑其中也有非托管对象资源,测试确实起到内存回收作用

---
 src/Bro.Device.HikCamera/HikCameraDriver.cs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Bro.Device.HikCamera/HikCameraDriver.cs b/src/Bro.Device.HikCamera/HikCameraDriver.cs
index f308873..b77232f 100644
--- a/src/Bro.Device.HikCamera/HikCameraDriver.cs
+++ b/src/Bro.Device.HikCamera/HikCameraDriver.cs
@@ -463,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();
@@ -484,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