Z991239-5165 #comment 同步WIN的高拍仪相关的RTA改造

Module/include/DevFSMCommBase.hpp

@@ -619,8 +619,7 @@ public:
 				UpdateDEC(m_errPkg.apiErrCode);
 			else
 				UpdateDEC(wdErrCode);
-		}
-		else if (m_errPkg.apiErrCode != 0) {
+		} else if (m_errPkg.apiErrCode != 0) {
 			UpdateDEC(m_errPkg.apiErrCode);
 		}
 		//oilyang@20200525 if have been set ErrorCode of entity defined (not device),use it directly
@@ -628,9 +627,8 @@ public:
 		if (alarmOrNot) {
             LogErrMsgEx(m_errPkg, csErrMsg, dwCode, bToBusiness);
 		} else {
-            const CSimpleStringA alarmMsg = CSimpleStringA::Format("{\"DevSN\":\"%s\", \"Prefix\":\"%s\", \"Code\":\"%s\", \"Msg\":\"%s\"}"
-                                                                   , m_errPkg.devSN.GetData(), m_errPkg.msgHead.GetData(), SpStrError(m_errPkg.devErrCode), csErrMsg);
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(alarmMsg.GetData());
+			DbgWithLink(bToBusiness ? LOG_LEVEL_ERROR : LOG_LEVEL_WARN, bToBusiness ? LOG_TYPE_USER : LOG_TYPE_SYSTEM).setAPI(m_errPkg.msgHead)("{\"DevSN\":\"%s\", \"Code\":\"%s\", \"Msg\":\"%s\"}"
+				, m_errPkg.devSN.GetData(), SpStrError(m_errPkg.devErrCode), csErrMsg);
 		}
 		return dwCode;
 	}
@@ -1092,39 +1090,33 @@ inline ErrorCodeEnum CCommDevFSM<TFSM, TDevClass>::GetAndSplitDevErrInfo(
 	}
 
 	if (!m_hDevHelper) {
-		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("inst occurs nullptr !!!");
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("inst occurs nullptr !!!");
 		return Error_Param;
 	}
 
 	DevErrorInfo devErrInfo;
 	ZeroMemory(&devErrInfo, sizeof(DevErrorInfo));
 	ErrorCodeEnum erroCode = m_hDevHelper->GetLastErr(devErrInfo);
-	if (erroCode == Error_Succeed)
-	{
+	if (erroCode == Error_Succeed) {
 		if (strlen(devErrInfo.szErrMsg) > 0) {
 			csErrMsg = devErrInfo.szErrMsg;
 		}
-
 		if (devErrInfo.dwErrMsgLen > MAX_DEV_ERROR_MSG_LEN) {
 			wdDevErrCode = (WORD)((devErrInfo.dwErrMsgLen >> 16) & 0x0000FFFF);
 		}
-
 		if (bDisplayFunName) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Invoke <%s> failed, Dev_GLE: DevErrCode[%d], ErrMsg[%s]",
-					lpszFuncNameForDisplay, wdDevErrCode, (LPCTSTR)csErrMsg);
-		
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(lpszFuncNameForDisplay)("Invoke <%s> failed, Dev_GLE: DevErrCode[%d], ErrMsg[%s]",
+				lpszFuncNameForDisplay, wdDevErrCode, (LPCTSTR)csErrMsg);
 		} else {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Dev_GLE: DevErrCode[%d], ErrMsg[%s]", wdDevErrCode, (LPCTSTR)csErrMsg);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Dev_GLE: DevErrCode[%d], ErrMsg[%s]", wdDevErrCode, (LPCTSTR)csErrMsg);
 		}
-	
 	} else {
 		if (bDisplayFunName) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Invoke <%s> failed, and unfortunately Dev_GLE failed returned EC: %s",
-					lpszFuncNameForDisplay, SpStrError(erroCode));
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetLastErr")("Invoke <%s> failed, and unfortunately Dev_GLE failed returned EC: %s",
+				lpszFuncNameForDisplay, SpStrError(erroCode));
 			csErrMsg = CSimpleStringA::Format("Invoke <%s> failed", lpszFuncNameForDisplay);
-		
 		} else {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Dev_GLE failed returned EC: %s", SpStrError(erroCode));
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetLastErr")("Dev_GLE failed returned EC: %s", SpStrError(erroCode));
 		}
 	}
 	/** reset vendor device error code to stop reporting to alarm [12/11/2020 Gifur] */

Module/mod_HSPScanner/HSPSCanner_UserErrorCode.h

@@ -2,6 +2,10 @@
 #define _HSPSCANNER_USER_ERRORCODE_H
 #pragma once
 
+#define HSPScannerService_CustomLogCode_Start "QLR040221720"
+#define HSPScannerService_CustomLogCode_Reset "QLR040221721"
+
+
 #define LOG_ERR_HSPS_DEVOPEN_FAILED 0x21700001
 #define LOG_EVT_HSPS_LIGHT_ON 0x21700002
 #define LOG_EVT_HSPS_LIGHT_OFF 0x21700003

Module/mod_HSPScanner/HSPScannerFSM.h

@@ -81,6 +81,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_StartPreview).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -97,6 +98,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_CancelPreview).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -113,6 +115,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_ScanImage).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -129,6 +132,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_ScanImageEx).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -145,6 +149,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_ShowProperty).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -161,6 +166,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_SetProperty).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -177,6 +183,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_SetWinPos).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -193,6 +200,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_GetDevStatus).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -209,6 +217,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(HSPScannerService_LogCode_GetDevInfo).setResultCode("RTA2N0V")();
 			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
@@ -240,9 +249,7 @@ public:
 		FSM_STATE_ENTRY(s8, "Idiot", s8_on_entry, s8_on_exit, s8_on_event)
 	END_FSM_STATE()
 
-		
-
-
+	
 	BEGIN_FSM_RULE(CHSPScannerFSM, s0)
 		//2 reserved in s0 state.
 		FSM_RULE_ENTRY(s0, s1, USER_EVT_STARTPREVIEW_FINISHED, 0)
@@ -365,7 +372,7 @@ public:
 	int StopPreview(SpReqAnsContext<HSPScannerService_CancelPreview_Req,
 		HSPScannerService_CancelPreview_Ans>::Pointer ctx);
 	
-	bool ResizeImage(CSimpleStringA fileName);
+	bool ResizeImage(const CSimpleStringA& fileName);
 	
 	int ScanImage(SpReqAnsContext<HSPScannerService_ScanImage_Req,
 		HSPScannerService_ScanImage_Ans>::Pointer ctx);

Module/mod_ScannerSet/ScannerSetFSM.cpp

@@ -84,6 +84,7 @@ const char* EvtTypeToString(int nEvtType)
 		return "Unknown EventType";
 		break;
 	}
+	return "Unknown EventType";
 }
 
 const char* CameraTypeToString(CapTypeEnum devType)
@@ -161,7 +162,7 @@ CScannerFSM::~CScannerFSM(void)
 ErrorCodeEnum CScannerFSM::OnInit()
 {
 	ErrorCodeEnum erroCode = Error_Succeed;
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Version: %s, Complied at: %s %s", MODULE_VERION_FULL, __DATE__, __TIME__);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Version: %s, Complied at: %s %s", MODULE_VERION_FULL, __DATE__, __TIME__);
 	CSmartPointer<IConfigInfo> spConfig;
 	CSystemStaticInfo sysInfo;
 	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
@@ -180,7 +181,7 @@ ErrorCodeEnum CScannerFSM::OnInit()
 		GetCameraInfors(m_cameralist);
 		HANDLE hEvtThread = (HANDLE)_beginthreadex(NULL, 0, EventRevThread, this, 0, NULL);
 		if(hEvtThread == NULL || hEvtThread == INVALID_HANDLE_VALUE) {
-			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("Create EventRevThread failed");
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Create EventRevThread failed");
 		} else {
 			int times = 0;
 			while(gEventRevWnd == NULL && times < 10) {
@@ -188,7 +189,7 @@ ErrorCodeEnum CScannerFSM::OnInit()
 				times++;
 			}
 			if(times >= 10 && gEventRevWnd == NULL) {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("event recv windows handle is null");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("event recv windows handle is null");
 			}
 		}
 	}
@@ -219,29 +220,6 @@ ErrorCodeEnum CScannerFSM::OnExit()
 void CScannerFSM::s0_on_entry()
 {
 	m_nFatalTimes = 0;
-	/*
-	if(m_bStand2SMachine) //Stand2S
-	{
-		ErrorCodeEnum erroCode = CheckHSPSConnectStatus();
-		if(FAILED(erroCode)) {
-			PostEventFIFO(new FSMEvent(USER_EVT_DEV_INVALID));
-		}
-	}
-	
-	else if(m_bUsePortableScanner)
-	{
-		ErrorCodeEnum erroCode = CheckPortableConnectStatus();
-		if(FAILED(erroCode)) {
-			PostEventFIFO(new FSMEvent(USER_EVT_DEV_INVALID));
-		}
-	}
-	else if(m_bJBMachine) {
-		ErrorCodeEnum errorCode = CheckHeartbeatConnectStatus();
-	}
-	else {
-		PostEventFIFO(new FSMEvent(USER_EVT_DEV_INVALID));
-	}
-	*/
 	m_ecSelfTest = Error_Succeed;
 }
 
@@ -490,26 +468,10 @@ unsigned int CScannerFSM::s2_on_event(FSMEvent* e)
 			}
 		}
 		break;
-	//case USER_EVT_SETWINPOS:
-	//{
-	//	SetWinPosEvent* pEvt = dynamic_cast<SetWinPosEvent*>(e);
-	//	SetWinPosTask* pTask = new SetWinPosTask(this);
-	//	pTask->SetContext(pEvt->m_ctx);
-
-	//	LogWarn(Severity_Low, Error_Debug, LOG_WARN_INVALID_SETWINPOS
-	//		, CSimpleStringA::Format("%d,%d,%d,%d,%d"
-	//			, pTask->m_ctx->Req.type, pTask->m_ctx->Req.pointX, pTask->m_ctx->Req.pointY
-	//			, pTask->m_ctx->Req.nWidth, pTask->m_ctx->Req.reserved4));
-
-	//	GetEntityBase()->GetFunction()->PostThreadPoolTask(pTask);
-	//}
-	//e->SetHandled();
-	//break;
 	case USER_EVT_GETSTATUS_FINISHED:
 		{
 			if(m_iEvt == USER_EVT_GETSTATUS)
 			{
-				//uRet = e->param1;
 				uRet = 1;
 				e->SetHandled();
 			}
@@ -519,7 +481,6 @@ unsigned int CScannerFSM::s2_on_event(FSMEvent* e)
 		{
 			if(m_iEvt == USER_EVT_GETINFO)
 			{
-				//uRet = e->param1;
 				uRet = 1;
 				e->SetHandled();
 			}
@@ -547,7 +508,7 @@ void CScannerFSM::s3_on_exit()
 
 unsigned int CScannerFSM::s3_on_event(FSMEvent* e)
 {
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s3_on_event: %s(%d), %d.", EvtTypeToString(e->iEvt), e->iEvt, e->param1);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("s3_on_event: %s(%d), %d.", EvtTypeToString(e->iEvt), e->iEvt, e->param1);
 	unsigned int uRet = 0;
 	switch(e->iEvt)
 	{
@@ -656,6 +617,7 @@ int CScannerFSM::StartPreview(SpReqAnsContext<ScannerService_StartPreview_Req,
 
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_StartPreview).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -667,18 +629,17 @@ int CScannerFSM::StartPreview(SpReqAnsContext<ScannerService_StartPreview_Req,
 		req.scanType = ctx->Req.scanType;
 		req.colorType = ctx->Req.colorType;
 		erroCode = (*m_pHSPSClient)(EntityResource::getLink().upgradeLink())->StartPreview(req, ans, MILLISECOND_WAIT_TIMEOUT_STARTPREVIEW, dwUserCode);
-		if(FAILURED(erroCode)) {
+		if (FAILURED(erroCode)) {
 			nRes = 1;
 			if (MapErrorCode2Level(erroCode)) {
 				LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_StartPreview,
-					CSimpleStringA::Format("StartPreview context failed, retCode: %s(%d).", SpStrError(erroCode), dwUserCode));
+					CSimpleStringA::Format("StartPreview context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 				erroCode = Error_DevNotAvailable;
-				} else {
+			} else {
 				LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_StartPreview,
-					CSimpleStringA::Format("StartPreview context failed, retCode: %s(%d).", SpStrError(erroCode), dwUserCode));
-				}
-		}
-		else {
+					CSimpleStringA::Format("StartPreview context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
+			}
+		} else {
 			ctx->Ans.retCode = ans.retCode;
 		}
 	} 
@@ -693,7 +654,7 @@ int CScannerFSM::StartPreview(SpReqAnsContext<ScannerService_StartPreview_Req,
 		erroCode = (*m_pPortableClient)(EntityResource::getLink().upgradeLink())->StartPreview(req, ans, MILLISECOND_WAIT_TIMEOUT_STARTPREVIEW, dwUserCode);
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_StartPreview,
-				CSimpleStringA::Format("StartPreview context failed, retCode: %s(%d).", SpStrError(erroCode), dwUserCode));
+				CSimpleStringA::Format("StartPreview context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			nRes = 1;
 		}
 		else {
@@ -713,6 +674,7 @@ int CScannerFSM::StopPreview(SpReqAnsContext<ScannerService_CancelPreview_Req,
 	int nRes = 0;
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_CancelPreview).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -725,12 +687,12 @@ int CScannerFSM::StopPreview(SpReqAnsContext<ScannerService_CancelPreview_Req,
 		erroCode = (*m_pHSPSClient)(EntityResource::getLink().upgradeLink())->CancelPreview(req, ans, MILLISECOND_WAIT_TIMEOUT_DEFAULT, dwUserCode);
 		ctx->Answer(erroCode, dwUserCode);
 
-		if(FAILURED(erroCode)) {
+		if (FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_CancelPreview,
-				CSimpleStringA::Format("CancelPreview context failed: 0x%x(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("CancelPreview context failed: ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			nRes = 1;
-		}else {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("CancelPreview context suc.");
+		} else {
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER).setAPI(__FUNCTION__)("CancelPreview context suc.");
 		}
 	}else if(m_bUsePortableScanner) {
 
@@ -743,10 +705,10 @@ int CScannerFSM::StopPreview(SpReqAnsContext<ScannerService_CancelPreview_Req,
 
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_CancelPreview,
-				CSimpleStringA::Format("CancelPreview context failed: 0x%x(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("CancelPreview context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			nRes = 1;
 		}else {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("CancelPreview context suc.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER).setAPI(__FUNCTION__)("CancelPreview context suc.");
 		}
 	}
 	return nRes;
@@ -761,6 +723,7 @@ int CScannerFSM::ScanImage(SpReqAnsContext<ScannerService_ScanImage_Req,
 
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_ScanImage).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -774,11 +737,11 @@ int CScannerFSM::ScanImage(SpReqAnsContext<ScannerService_ScanImage_Req,
 			if(FAILURED(erroCode)) {
 				if (MapErrorCode2Level(erroCode)) {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImage,
-						CSimpleStringA::Format("ScanImage context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImage context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 					erroCode = Error_DevNotAvailable;
 				} else {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImage,
-						CSimpleStringA::Format("ScanImage context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImage context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 				}
 				nRes = 1;
 			} else {
@@ -794,15 +757,15 @@ int CScannerFSM::ScanImage(SpReqAnsContext<ScannerService_ScanImage_Req,
 			if(FAILURED(erroCode)) {
 				if (MapErrorCode2Level(erroCode)) {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImage,
-						CSimpleStringA::Format("ScanImage context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImage context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 					erroCode = Error_DevNotAvailable;
 				} else {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImage,
-						CSimpleStringA::Format("ScanImage context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImage context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 				}
 				nRes = 1;
 			} else {
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("ScanImage context suc.");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER).setAPI(__FUNCTION__)("ScanImage context suc.");
 				ctx->Ans.filePath = ans.filePath;
 				ctx->Ans.imageData = ans.imageData;
 			}
@@ -817,11 +780,11 @@ int CScannerFSM::ScanImage(SpReqAnsContext<ScannerService_ScanImage_Req,
 			if(FAILURED(erroCode)) {
 				if (MapErrorCode2Level(erroCode)) {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImageEx,
-						CSimpleStringA::Format("ScanImageEx context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImageEx context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 					erroCode = Error_DevNotAvailable;
 				} else {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImageEx,
-						CSimpleStringA::Format("ScanImageEx context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImageEx context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 				}
 				nRes = 1;
 			} else {
@@ -837,11 +800,11 @@ int CScannerFSM::ScanImage(SpReqAnsContext<ScannerService_ScanImage_Req,
 			if(FAILURED(erroCode)) {
 				if (MapErrorCode2Level(erroCode)) {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImageEx,
-						CSimpleStringA::Format("ScanImageEx context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImageEx context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 					erroCode = Error_DevNotAvailable;
 				} else {
 					LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ScanImageEx,
-						CSimpleStringA::Format("ScanImageEx context failed %s(%d).", SpStrError(erroCode), dwUserCode));
+						CSimpleStringA::Format("ScanImageEx context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 				}
 				nRes = 1;
 			} else {
@@ -864,6 +827,7 @@ int CScannerFSM::SetProperty(SpReqAnsContext<ScannerService_SetProperty_Req,
 	int nRes = 0;
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_SetProperty).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -878,7 +842,7 @@ int CScannerFSM::SetProperty(SpReqAnsContext<ScannerService_SetProperty_Req,
 		erroCode = (*m_pHSPSClient)(EntityResource::getLink().upgradeLink())->SetProperty(req, ans, MILLISECOND_WAIT_TIMEOUT_DEFAULT, dwUserCode);
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_SetProperty,
-				CSimpleStringA::Format("SetProperty context suc, retCode: ans(%d), ctx(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("SetProperty context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			nRes = 1;
 		} else {
 			ctx->Ans.retCode = ans.retCode;
@@ -896,7 +860,7 @@ int CScannerFSM::SetProperty(SpReqAnsContext<ScannerService_SetProperty_Req,
 		erroCode = (*m_pPortableClient)(EntityResource::getLink().upgradeLink())->SetProperty(req, ans, MILLISECOND_WAIT_TIMEOUT_DEFAULT, dwUserCode);
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_SetProperty,
-				CSimpleStringA::Format("SetProperty context error, retCode: ans(%d), ctx(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("SetProperty context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			nRes = 1;
 		} else {
 			ctx->Ans.retCode = ans.retCode;
@@ -918,6 +882,7 @@ int CScannerFSM::ShowLTProperty(SpReqAnsContext<ScannerService_ShowProperty_Req,
 	int retCode = 0;
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_ShowProperty).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -934,7 +899,7 @@ int CScannerFSM::ShowLTProperty(SpReqAnsContext<ScannerService_ShowProperty_Req,
 	if(FAILURED(erroCode)) 
 	{
 		LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_ShowProperty,
-			CSimpleStringA::Format("ShowLTProperty context suc, retCode: ans(%d), ctx(%d).", erroCode, dwUserCode));
+			CSimpleStringA::Format("ShowLTProperty context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 		nRes = 1;
 		if(erroCode == Error_TimeOut)
 		{
@@ -957,6 +922,7 @@ int CScannerFSM::SetWinPos(SpReqAnsContext<ScannerService_SetWindowPos_Req,
 	DWORD dwUserCode(0);
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_SetWindowPos).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -986,11 +952,11 @@ int CScannerFSM::SetWinPos(SpReqAnsContext<ScannerService_SetWindowPos_Req,
 	if(FAILURED(erroCode)) {
 		if (MapErrorCode2Level(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_SetWinPos,
-				CSimpleStringA::Format("SetWinPos context failed, retCode: ans(%s), ctx(%d).", SpStrError(erroCode), dwUserCode));
+				CSimpleStringA::Format("SetWinPos context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			erroCode = Error_DevNotAvailable;
 		} else {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_SetWinPos,
-				CSimpleStringA::Format("SetWinPos context failed, retCode: ans(%s), ctx(%d).", SpStrError(erroCode), dwUserCode));
+				CSimpleStringA::Format("SetWinPos context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 		}
 		nRes = 1;
 	} else  {
@@ -1009,6 +975,7 @@ int CScannerFSM::GetDevStatus(SpReqAnsContext<ScannerService_GetDevStatus_Req,
 
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_GetDevStatus).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -1018,9 +985,9 @@ int CScannerFSM::GetDevStatus(SpReqAnsContext<ScannerService_GetDevStatus_Req,
 		erroCode = (*m_pHSPSClient)(EntityResource::getLink().upgradeLink())->GetDevStatus(req, ans, MILLISECOND_WAIT_TIMEOUT_DEFAULT, dwUserCode);
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_GetDevStatus,
-				CSimpleStringA::Format("GetDevStatus context suc, retCode: ans(%d), ctx(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("GetDevStatus context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 		} else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("connected: %d, showing: %d, preview: %d.",
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("connected: %d, showing: %d, preview: %d.",
 				ans.connected, ans.showing, ans.previewing);
 
 			ctx->Ans.bInvalid = ans.connected == 0 ? false : true;
@@ -1033,7 +1000,7 @@ int CScannerFSM::GetDevStatus(SpReqAnsContext<ScannerService_GetDevStatus_Req,
 		erroCode = (*m_pPortableClient)(EntityResource::getLink().upgradeLink())->GetDevStatus(req, ans, MILLISECOND_WAIT_TIMEOUT_DEFAULT, dwUserCode);
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_GetDevStatus,
-				CSimpleStringA::Format("GetDevStatus context suc, retCode: ans(%d), ctx(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("GetDevStatus context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 		}
 		else 
 		{
@@ -1058,6 +1025,7 @@ int CScannerFSM::GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req,
 
 	if(!IsSuitableEntityAvailable())
 	{
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setAPI(__FUNCTION__).setLogCode(ScannerService_LogCode_GetDevInfo).setResultCode("RTA2O01")();
 		ctx->Answer(Error_DevNotAvailable, LOG_WARN_MODULE_INVALID);
 		return 1;
 	}
@@ -1068,7 +1036,7 @@ int CScannerFSM::GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req,
 
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_GetDevInfo,
-				CSimpleStringA::Format("GetDevInfo context suc, retCode: ans(%d), ctx(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("GetDevInfo context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			nRes = 1;
 		}
 		else
@@ -1090,7 +1058,7 @@ int CScannerFSM::GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req,
 		erroCode = (*m_pPortableClient)(EntityResource::getLink().upgradeLink())->GetDevInfo(req, ans, MILLISECOND_WAIT_TIMEOUT_DEFAULT, dwUserCode);
 		if(FAILURED(erroCode)) {
 			LogWarn(Severity_Middle, erroCode, LOG_ERR_SCANNERSET_API_INVOKE_GetDevInfo,
-				CSimpleStringA::Format("GetDevInfo context suc, retCode: ans(%d), ctx(%d).", erroCode, dwUserCode));
+				CSimpleStringA::Format("GetDevInfo context failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(erroCode), dwUserCode));
 			nRes = 1;
 		}
 		else
@@ -1163,7 +1131,7 @@ void CScannerFSM::SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionCo
 
 void CScannerFSM::OnStateTrans(int iSrcState, int iDstState)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("FSM state from state %s to %s", GetStateName(iSrcState), GetStateName(iDstState));
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("FSM state from state %s to %s", GetStateName(iSrcState), GetStateName(iDstState));
 	m_nSrcState = iSrcState;
 }
 
@@ -1179,7 +1147,7 @@ ErrorCodeEnum CScannerFSM::ConnectToHSPScanner()
 			m_pHSPSClient->SafeDelete();
 			m_pHSPSClient = NULL;
 			LogWarn(Severity_Middle, Error_InvalidState, LOG_WARN_MODULE_INVALID,
-					CSimpleStringA::Format("Connect to HSPScanner entity failed:%s", SpStrError(erroCode)));
+					CSimpleStringA::Format("Connect to HSPScanner entity failed: %s", SpStrError(erroCode)));
 			GetHSPSInfo();
 			return Error_InvalidState;
 		}
@@ -1194,7 +1162,9 @@ ErrorCodeEnum CScannerFSM::GetHSPSInfo()
 	CSmartPointer<IEntityFunctionPrivilege> pFuncPrivilege = pFunc.ConvertCase<IEntityFunctionPrivilege>();
 	CEntityRunInfo info = {0};
 	ErrorCodeEnum ecInfo = pFunc->GetEntityRunInfo("HSPScanner", info);
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("HSPScanner entity state: %d", (int)info.eState);
+	if (info.eState != EntityState_Idle) {
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("HSPScanner entity illegal state: %d", (int)info.eState);
+	}
 	return ecInfo;
 }
 
@@ -1239,7 +1209,7 @@ ErrorCodeEnum CScannerFSM::ConnectToPortableScanner()
 			m_pPortableClient->SafeDelete();
 			m_pPortableClient = NULL;
 			LogWarn(Severity_Middle, Error_InvalidState, LOG_WARN_MODULE_INVALID,
-				CSimpleStringA::Format("Connect to Portable Scanner entity failed: 0x%X", erroCode));
+				CSimpleStringA::Format("Connect to Portable Scanner entity failed: %s", SpStrError(erroCode)));
 
 			GetPortableScannerInfo();
 			return Error_DevNotAvailable;
@@ -1285,9 +1255,9 @@ ErrorCodeEnum CScannerFSM::LoadConfigAboutCamera()
 			nOptID = strOptCamera.GetLength() > 1 ? /*GetVideoDeviceID(strOptCamera)*/ 0 : -2;
 			nEwsID = strEwsCamera.GetLength() > 1 ? /*GetVideoDeviceID(strEwsCamera)*/ 0 : -2;
 			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("EnvID: [%d](%s)", nEnvID, strEnvCamera.GetData());
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OptID: [%d](%s)", nOptID, strOptCamera.GetData());
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("EwsID: [%d](%s)", nEwsID, strEwsCamera.GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EnvID: [%d](%s)", nEnvID, strEnvCamera.GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OptID: [%d](%s)", nOptID, strOptCamera.GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("EwsID: [%d](%s)", nEwsID, strEwsCamera.GetData());
 
 				m_fixedCamera[CAMTYPE_ENV-1].strDevName = strEnvCamera;
 				m_fixedCamera[CAMTYPE_ENV-1].devType = CAMTYPE_ENV;
@@ -1791,12 +1761,12 @@ ErrorCodeEnum CScannerFSM::AttachCheck()
 			if(nDevID >= 0) {
 				ec = TryBindPSDevice(nDevID, info.strDevName);
 				if(ISSUCCEEDED(ec)) {
-					LogWarn(Severity_Low, Error_Debug, LOG_EVT_SCANNERSET_BIND_CAMERA, "AttachCheck::TryBindPSDevice succ.");
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("AttachCheck::TryBindPSDevice [%d][%s] succ", nDevID, info.strDevName.GetData());
 					Sleep(200);
 				} else {
 					/** 为抹平 Level3 所加的告警 Gifur@2023222]*/
 					if (ec != Error_DevNotAvailable) {
-						LogError(Severity_Middle, ec, LOG_ERR_SCANNERSET_BIND_CAMERA, CSimpleStringA::Format("AttachCheck::TryBindPSDevice failed: %s", SpStrError(ec)));
+						LogError(Severity_Middle, ec, LOG_ERR_SCANNERSET_BIND_CAMERA, CSimpleStringA::Format("AttachCheck::TryBindPSDevice [%d][%s] failed: %s", nDevID, info.strDevName.GetData(), SpStrError(ec)));
 					}
 				}
  			} else {
@@ -1862,7 +1832,7 @@ ErrorCodeEnum CScannerFSM::_BindPSDevice(int nDevID, LPCTSTR lpcszDevName,  bool
 		rc = (*m_pPortableClient)(EntityResource::getLink().upgradeLink())->BindCameraDevice(req, ans, MILLISECOND_WAIT_TIMEOUT_DEFAULT, dwUserCode);
 		if(ISSUCCEEDED(rc)) {
 			LogWarn(Severity_Low, rc, LOG_ERR_SCANNERSET_BIND_CAMERA,
-				CSimpleStringA::Format("Bind portable scan device (%d)[%s] suc, previous one: [%d](%s)",
+				CSimpleStringA::Format("Bind portable scan device (%d)[%s] suc, previous one: (%d)[%s]",
 				req.devId, (LPCTSTR)req.devName,
 				ans.usedId, (LPCTSTR)ans.checkcode));
 			
@@ -1876,10 +1846,10 @@ ErrorCodeEnum CScannerFSM::_BindPSDevice(int nDevID, LPCTSTR lpcszDevName,  bool
 
 		} else {
 			if (MapErrorCode2Level(rc)) {
-				LogWarn(Severity_Middle, rc, LOG_ERR_SCANNERSET_API_INVOKE_BindCameraDevice, CSimpleStringA::Format("Bind portable scan device failed, EC=%u(0x%X)", rc, dwUserCode));
+				LogWarn(Severity_Middle, rc, LOG_ERR_SCANNERSET_API_INVOKE_BindCameraDevice, CSimpleStringA::Format("Bind portable scan device failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(rc), dwUserCode));
 				rc = Error_DevNotAvailable;
 			} else {
-				LogWarn(Severity_Middle, rc, LOG_ERR_SCANNERSET_API_INVOKE_BindCameraDevice, CSimpleStringA::Format("Bind portable scan device failed, EC=%u(0x%X)", rc, dwUserCode));
+				LogWarn(Severity_Middle, rc, LOG_ERR_SCANNERSET_API_INVOKE_BindCameraDevice, CSimpleStringA::Format("Bind portable scan device failed, ErrCode:%s, userCode: 0x%08X.", SpStrError(rc), dwUserCode));
 			}
 		}
 	} else {
@@ -2004,7 +1974,6 @@ void CScannerFSM::InitializeMehodQueue()
 	m_methods[8].dwMethodSig = ScannerService_Method_CrossTermCall;
 	m_methods[9].dwMethodSig = ScannerService_Method_GetDevInfo;
 	m_methods[10].dwMethodSig = ScannerService_Method_Exit;
-	LOG_ASSERT(11 == SS_MAX_METHOD_COUNT);
 }
 
 void CScannerFSM::DestoryMethodQueue()
@@ -2112,10 +2081,9 @@ ErrorCodeEnum CScannerFSM::HandleCamereAccessPriviledge(bool fWinOver, int nCame
 				result = Error_Unexpect;
 			}
 		}
-
 		if(result != Error_Succeed) {
 			LogWarn(Severity_Middle, result, LOG_ERR_SCANNERSET_MEDIACONTROLLER_MANIPULATE_FAILED,
-				CSimpleStringA::Format("Manipulate media device failed: ec:0x%X, ret: %d", result, ans.retCode));
+				CSimpleStringA::Format("Manipulate media device failed: ec: %s, ret: %d", SpStrError(result), ans.retCode));
 		}
 	} else {
 		EntityStateEnum state;
@@ -2126,9 +2094,9 @@ ErrorCodeEnum CScannerFSM::HandleCamereAccessPriviledge(bool fWinOver, int nCame
 	}
 
 	if(result != Error_Succeed) {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("%s: %s 0x%X", __FUNCTION__, fWinOver ? "GetIt":"GiveUp", result);
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s 0x%X", fWinOver ? "GetIt":"GiveUp", result);
 	} else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s: %s %s succ !", __FUNCTION__, fWinOver ? "GetIt":"GiveUp",CameraTypeToString((CapTypeEnum)nCameraType));
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s %s succ !", fWinOver ? "GetIt":"GiveUp",CameraTypeToString((CapTypeEnum)nCameraType));
 	}
 	return result;
 #else
@@ -2146,7 +2114,6 @@ UINT CScannerFSM::UnitTest()
 
 #if defined(RVC_OS_WIN)
 
-///*TODO:  (80374374@11/23/2023)*/
 GUID* StrToGUID(const WCHAR *guid_string)
 {
 	char buffer[64];