From 2a0a4b67235484c150f190a8a30dbe878cf049cc Mon Sep 17 00:00:00 2001
From: bestlqiang <bestlqiang@163.com>
Date: Tue, 15 Dec 2020 16:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=BF=85=E9=A1=BB=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?=E5=8F=A6=E4=B8=80=E8=BD=A8=E9=81=93=E4=B8=8B=E6=96=99=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90,=E5=8D=B3=E5=8F=AF=E4=B8=8B=E6=96=99=20=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=87=AA=E5=8A=A8=E5=90=8C=E6=97=B6=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaiPuLaser/DlgDnCutCamera.cpp              |  16 ++++++++++++++++
 LaiPuLaser/LaiPuLaser.rc                   | Bin 136884 -> 136884 bytes
 LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp |   6 ++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/LaiPuLaser/DlgDnCutCamera.cpp b/LaiPuLaser/DlgDnCutCamera.cpp
index a92e80e..fe94cd3 100644
--- a/LaiPuLaser/DlgDnCutCamera.cpp
+++ b/LaiPuLaser/DlgDnCutCamera.cpp
@@ -474,6 +474,22 @@ void DlgHawkvisCamera::OnBnClickedSaveCatchTemp()
 		else
 			str += " 失败!";
 		gLogMgr->WriteDebugLog(str);
+
+		if (m_pHawkvisCtrl == &m_HawkvisCtrl1)
+		{
+			m_pHawkvisCtrl = &m_HawkvisCtrl2;
+			Sleep(100);
+			OnBnClickedLoadCatchTemp();
+			m_pHawkvisCtrl = &m_HawkvisCtrl1;//恢复
+		}
+		else
+		{
+			m_pHawkvisCtrl = &m_HawkvisCtrl1;
+			Sleep(100);
+			OnBnClickedLoadCatchTemp();
+			m_pHawkvisCtrl = &m_HawkvisCtrl2;//恢复
+		}
+		
 	}
 	catch (...)
 	{
diff --git a/LaiPuLaser/LaiPuLaser.rc b/LaiPuLaser/LaiPuLaser.rc
index d635a9bb531a7456a2fc3c162acd3851754f3295..ac87040cd2b4baab6745e27b9a14ccb22833aa32 100644
GIT binary patch
delta 42
rcmdn8mSf9Wj)pCaETNnh3_1+PKxjUlH<WQYlxxUfv3+eQBl|%B^%x3=

delta 42
tcmdn8mSf9Wj)pCaETNnx3_1+P42BGr(|JP~r$f2M4CdR{hBC4r1OW7F3V;9r

diff --git a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
index 257b0f5..fce1db7 100644
--- a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
+++ b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
@@ -1459,15 +1459,17 @@ void CTrackWorkFlow::UnLoad()
 	//如果另外一个轴在unload ,要等待其unload 完成
 	if (gProgram_SZ_XL->IsbAutoWorkMode())
 	{
+		int cnt = 0;
 		while (!gExitApp)
 		{
-			Sleep(200);
+			Sleep(500);
 			//获取另外一个轴的状态
 			ETrackWorkStep OtherTrackWorkStep = gProgram_SZ_XL->GetOtherTrackWorkStep(m_TrackType);
-			if (OtherTrackWorkStep != _ETrack_Step_Unload)
+			if ((OtherTrackWorkStep != _ETrack_Step_Unload)||cnt>10)
 			{
 				break;
 			}
+			cnt++;
 		}
 	}