diff --git a/InfraredTemp/logs/InfraredTemp.log b/InfraredTemp/logs/InfraredTemp.log deleted file mode 100644 index db62ccb..0000000 --- a/InfraredTemp/logs/InfraredTemp.log +++ /dev/null @@ -1,132 +0,0 @@ -2025-10-24 09:43:01,848 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,849 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,849 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,850 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,850 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,850 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,850 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,851 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,851 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,851 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,851 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,852 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,852 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,852 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,852 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,852 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,852 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,852 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,853 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,855 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,855 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,855 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,855 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,855 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,855 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,855 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,856 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,856 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,856 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,856 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,856 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,856 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,856 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,857 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,858 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,859 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,859 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,859 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,859 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,859 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,859 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,859 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,860 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,860 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,860 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,860 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,860 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,860 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,860 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,861 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,861 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:01,861 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:01,861 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:06,128 DEBUG [InfraredTemp.cpp|232] UpdateEnv function is called -2025-10-24 09:43:06,628 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:06,629 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:11,130 DEBUG [InfraredTemp.cpp|236] SetOSD function is called -2025-10-24 09:43:11,630 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:11,630 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:16,133 DEBUG [InfraredTemp.cpp|240] UpdateOSD function is called -2025-10-24 09:43:16,636 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:16,636 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:21,135 DEBUG [InfraredTemp.cpp|244] UpdateColorPalette function is called -2025-10-24 09:43:21,649 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:21,650 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:26,137 DEBUG [InfraredTemp.cpp|248] UpdateOverTurn function is called -2025-10-24 09:43:26,649 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:26,649 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:35,606 DEBUG [InfraredTemp.cpp|252] UpdateAutoFocus function is called -2025-10-24 09:43:35,606 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:35,607 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:36,673 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:36,673 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:43:40,610 DEBUG [InfraredTemp.cpp|256] UpdateTempUnit function is called -2025-10-24 09:43:41,680 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:43:41,680 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,909 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,910 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,910 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,911 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,911 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,911 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,911 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,911 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,912 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,912 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,912 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,912 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,912 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,913 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,914 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,914 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:06,914 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:06,914 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:18,991 DEBUG [InfraredTemp.cpp|232] UpdateEnv function is called -2025-10-24 09:45:18,991 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:18,991 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:18,991 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:18,991 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 -2025-10-24 09:45:21,848 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=1 -2025-10-24 09:45:21,848 DEBUG [SocketServer.cpp|218] recv SetVideoFlag function,flag=0 diff --git a/InfraredTemp/src/InfraredTemp.cpp b/InfraredTemp/src/InfraredTemp.cpp index 5b370be..4ac7674 100644 --- a/InfraredTemp/src/InfraredTemp.cpp +++ b/InfraredTemp/src/InfraredTemp.cpp @@ -43,6 +43,7 @@ InfraredTemp::~InfraredTemp() Disconnect(); sdk_release(); + } bool InfraredTemp::Init() @@ -87,6 +88,14 @@ void InfraredTemp::Disconnect() { { LOG(ERROR) << u8"exit Thermal imaging fail"; } + + unique_lock lck(m_DataMtx); + while (!m_DataQue.empty()) { + SendData sd = m_DataQue.front(); + m_DataQue.pop(); + delete[] sd.data; + } + m_IsConnect = false; } @@ -313,6 +322,9 @@ void InfraredTemp::Run() Sleep(200); count++; if (m_IsConnect) { + m_VideoFlag = true; //主动发送视频数据，初始化设备软件m_VideoDataLength值不为0，防止插入图像日志失败 + Sleep(5); + m_VideoFlag = false; break; } } @@ -588,8 +600,7 @@ void InfraredTemp::TempCallBackHandle(char *pBuffer, long BufferLen, void* pCont void InfraredTemp::VideoCallBackHandle(char *pBuffer, long BufferLen, int width, int height, void* pContext) { InfraredTemp* it = (InfraredTemp*)pContext; - //it->m_VideoSrcDataUpdate = false; - if ((it->m_VideoFlag && !it->m_VideoSrcDataUpdate) || it->m_LogFlag) + if ((it->m_VideoFlag || it->m_LogFlag) && !it->m_VideoSrcDataUpdate) { EnterCriticalSection(&it->m_CS); memcpy(it->m_VideoSrcData, pBuffer, BufferLen); diff --git a/InfraredTemp/src/SocketServer.cpp b/InfraredTemp/src/SocketServer.cpp index 7d5c1e1..7d9bc9c 100644 --- a/InfraredTemp/src/SocketServer.cpp +++ b/InfraredTemp/src/SocketServer.cpp @@ -162,6 +162,7 @@ void SocketServer::run() { lock_guard lck(m_ClientMtx); delete client; m_SocketSet.erase(client); + m_InfraredTemp->Disconnect(); } m_SocketSet.erase(nullptr);