Explorar o código

回退串口同步操作;

scbc.sat2 %!s(int64=5) %!d(string=hai) anos
pai
achega
d2f30659a9

+ 1 - 1
SATHelper/SATHelper/IOCPModel.cpp

@@ -930,7 +930,7 @@ void CIOCPModel::_DeviceProc(PER_IO_CONTEXT* pIoContext, Package* pak)
 
 	// Ïò´®¿Ú·¢ËÍÖ¸Áî;
 	auto dev = iter->second;
-	std::string readdata = dev->SendCommond(reqj.device_cmd, reqj.device_timeout);
+	std::string readdata = dev->SendCommond(reqj.device_cmd);
 
 	ResponseJson repj;
 	repj.device_id = reqj.device_id;

+ 12 - 3
SATHelper/SATHelper/MemoryClient.cpp

@@ -274,6 +274,7 @@ BOOL CMemoryClient::CaptureImage(const CMD_CaputerImage& cmd, BOOL bSingle)
 			}
 		}
 
+		// 内部线程截图;
 		m_pView->CaptureMultiImageEx(cmd.szSaveDir, cmd.szPrefix, bIsJPG, cmd.nKeepTime);
 	}
 	else
@@ -308,16 +309,24 @@ BOOL CMemoryClient::CaptureImage(const CMD_CaputerImage& cmd, BOOL bSingle)
 					strFile.append(_T("\\"));
 			}
 
-			m_pView->CaptureSingleImageAutoNameEx(strFile.c_str(), bIsJPG);
+			std::string strImg = m_pView->CaptureSingleImageAutoNameEx(strFile.c_str(), bIsJPG);
+			if ( !PathFileExists(strImg.c_str()) )
+			{
+				Global::WriteTextLog(_T("自动命名截图失败=%s"), strImg.c_str());
+				return FALSE;
+			}
 		}
 		else
 		{
 			TCHAR szFile[MAX_PATH] = { 0 };
 			_stprintf_s(szFile, _T("%s"), cmd.szSaveDir);
 			m_pView->CaptureSingleImageEx(szFile, bIsJPG);
+			if (!PathFileExists(szFile))
+			{
+				Global::WriteTextLog(_T("截图失败=%s"), szFile);
+				return FALSE;
+			}
 		}
-		// 等待磁盘完成写入;
-		//Sleep(bIsJPG ? 200 : 200);
 	}
 
 	return TRUE;

+ 1 - 0
SATHelper/SATHelper/SATHelper.vcxproj

@@ -208,6 +208,7 @@
     <ClInclude Include="..\UI\TreeComboBox.h" />
     <ClInclude Include="..\UI\XColorStatic.h" />
     <ClInclude Include="calendarbar.h" />
+    <ClInclude Include="CaptureDef.h" />
     <ClInclude Include="DeviceView.h" />
     <ClInclude Include="ChildFrm.h" />
     <ClInclude Include="ClassView.h" />

+ 3 - 0
SATHelper/SATHelper/SATHelper.vcxproj.filters

@@ -162,6 +162,9 @@
     <ClInclude Include="DeviceView.h">
       <Filter>视图</Filter>
     </ClInclude>
+    <ClInclude Include="CaptureDef.h">
+      <Filter>iocp</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SATHelper.cpp">