#IQRV #comment bugfix: 处理调用高拍仪功能集接口时实体Lost问题，SafeDelete

Module/mod_ScannerSet/ScannerSetFSM.cpp

@@ -658,7 +658,7 @@ int CScannerFSM::StartPreview(SpReqAnsContext<ScannerService_StartPreview_Req,
 
 		erroCode = m_pHSPSClient->StartPreview(req, ans, MILLISECOND_WAIT_TIMEOUT_STARTPREVIEW);
 		if(FAILURED(erroCode)) {
-			Dbg("StartPreview context failed 0x%x(%d).", erroCode, erroCode);
+			Dbg("StartPreview context failed: %s.", SpStrError(erroCode));
 			nRes = 1;
 		}
 		else {
@@ -676,7 +676,7 @@ int CScannerFSM::StartPreview(SpReqAnsContext<ScannerService_StartPreview_Req,
 
 		erroCode = m_pPortableClient->StartPreview(req, ans, MILLISECOND_WAIT_TIMEOUT_STARTPREVIEW);
 		if(FAILURED(erroCode)) {
-			Dbg("StartPreview context failed 0x%x(%d).", erroCode, erroCode); nRes = 1;
+			Dbg("StartPreview context failed %s.", SpStrError(erroCode)); nRes = 1;
 		}
 		else {
 			ctx->Ans.retCode = ans.retCode;
@@ -723,7 +723,7 @@ int CScannerFSM::StopPreview(SpReqAnsContext<ScannerService_CancelPreview_Req,
 		ctx->Answer(erroCode);
 
 		if(FAILURED(erroCode)) {
-			Dbg("CancelPreview context failed 0x%x(%d).", erroCode, erroCode);
+			Dbg("CancelPreview context failed %s.", SpStrError(erroCode));
 			nRes = 1;
 		}else {
 			Dbg("CancelPreview context suc.");
@@ -738,7 +738,7 @@ int CScannerFSM::StopPreview(SpReqAnsContext<ScannerService_CancelPreview_Req,
 		ctx->Answer(erroCode);
 
 		if(FAILURED(erroCode)) {
-			Dbg("CancelPreview context failed 0x%x(%d).", erroCode, erroCode);
+			Dbg("CancelPreview context failed %s.", SpStrError(erroCode));
 			nRes = 1;
 		}else {
 			Dbg("CancelPreview context suc.");
@@ -783,7 +783,7 @@ int CScannerFSM::ScanImage(SpReqAnsContext<ScannerService_ScanImage_Req,
 			erroCode = m_pHSPSClient->ScanImage(req, ans, MILLISECOND_WAIT_TIMEOUT_SCANIMAGE);
 
 			if(FAILURED(erroCode)) {
-				Dbg("ScanImage context failed 0x%x(%d).", erroCode, erroCode);
+				Dbg("ScanImage context failed %s.", SpStrError(erroCode));
 				nRes = 1;
 			} else {
 				Dbg("ScanImage context suc.");
@@ -1242,7 +1242,6 @@ ErrorCodeEnum CScannerFSM::ConnectToHSPScanner()
 	if(m_pHSPSClient)
 	{
 		m_pHSPSClient->GetFunction()->CloseSession();
-		//m_pHSPSClient->SafeDelete();
 		m_pHSPSClient = NULL;
 	}
 
@@ -1252,8 +1251,7 @@ ErrorCodeEnum CScannerFSM::ConnectToHSPScanner()
 	{
 		m_pHSPSClient->SafeDelete();
 		m_pHSPSClient = NULL;
-		LogWarn(Severity_Middle, Error_InvalidState, LOG_EVT_SCANNERSET_HSPSCNT_FAILED, 
-			"Connect to HSPScanner entity failed.");
+		LogWarn(Severity_Middle, Error_InvalidState, LOG_EVT_SCANNERSET_HSPSCNT_FAILED, "Connect to HSPScanner entity failed.");
 		GetHSPSInfo();
 		return Error_InvalidState;
 	}
@@ -1307,7 +1305,6 @@ ErrorCodeEnum CScannerFSM::ConnectToPortableScanner()
 {
 	if(m_pPortableClient) {
 		m_pPortableClient->GetFunction()->CloseSession();
-		//m_pPortableClient->SafeDelete();
 		m_pPortableClient = NULL;
 	}
 
@@ -1586,7 +1583,7 @@ void CScannerFSM::OnDeviceInsert()
 								if(ISSUCCEEDED(ec)) {
 									Dbg("Bind Portable scanner -force succ.");
 								}else {
-									Dbg("Bind Portable scanner -force failed RC=0X%X", ec); 
+									Dbg("Bind Portable scanner -force failed RC=%s.", SpStrError(ec));
 								}
 							}
 						}
@@ -1633,13 +1630,13 @@ void CScannerFSM::OnDeviceRemoved()
 							if(ISSUCCEEDED(ec)) {
 								Dbg("Bind Portable scanner -force succ.");
 							}else {
-								Dbg("Bind Portable scanner -force failed RC=0X%X", ec); 
+								Dbg("Bind Portable scanner -force failed RC=%s.", SpStrError(ec));
 							}
 						}else {
 							Dbg("Thera are no any appropriate device, send drop message.");
 							auto rc = DropOffPortScannerDevice();
 							if(FAILURED(rc)) {
-								Dbg("Opps! DropOffPortScannerDevice failed RC=0x%X", rc);
+								Dbg("Opps! DropOffPortScannerDevice failed RC=%s.", SpStrError(rc));
 							}else {
 								bReBind = true;
 							}
@@ -1700,7 +1697,7 @@ void CScannerFSM::PSEntityPostCameraError(LPCTSTR lpcszCameraName)
 		Dbg("There are no advanced device could be used, so drop off the current one");
 		auto rc = DropOffPortScannerDevice();
 		if(FAILURED(rc)) {
-			Dbg("Opps! DropOffPortScannerDevice failed RC=0x%X", rc);
+			Dbg("Opps! DropOffPortScannerDevice failed RC=%s.", SpStrError(rc));
 		}
 		ec = Error_DevNotAvailable;
 	}

Module/mod_ScannerSet/ScannerSetFSM.h

@@ -462,7 +462,6 @@ public:
 		if(m_pHSPSClient)
 		{
 			m_pHSPSClient->GetFunction()->CloseSession();
-			m_pHSPSClient->SafeDelete();
 			m_pHSPSClient = NULL;
 		}
 	}