!10759 测试缺陷修复，日志精简

Merge pull request !10759 from 80174847/ST2

Module/mod_HSPScanner/HSPSCanner_LogCode.h

@@ -0,0 +1,35 @@
+#ifndef _HSPSCANNER_USER_LOGRCODE_H
+#define _HSPSCANNER_USER_LOGRCODE_H
+#pragma once
+
+
+/*
+*/
+
+#define CustomLogCode_Start "QLR0402217A0"
+#define CustomLogCode_Reset "QLR0402217A1"
+
+#define CustomLogCode_Preview_Default "QLR0402217A2"
+#define CustomLogCode_CancelPreview_Default "QLR0402217A3"
+
+
+/*
+#define HSPScannerService_LogCode_StartPreview "QLR040221700"
+#define HSPScannerService_LogCode_CancelPreview "QLR040221701"
+#define HSPScannerService_LogCode_ScanImage "QLR040221702"
+#define HSPScannerService_LogCode_ScanImageEx "QLR040221703"
+#define HSPScannerService_LogCode_SetProperty "QLR040221704"
+#define HSPScannerService_LogCode_SetWinPos "QLR040221705"
+#define HSPScannerService_LogCode_ShowProperty "QLR040221706"
+#define HSPScannerService_LogCode_GetDevStatus "QLR040221707"
+#define HSPScannerService_LogCode_GetDevInfo "QLR040221799"
+#define HSPScannerService_LogCode_Exit "QLR040221708"
+#define HSPScannerService_LogCode_StartPreviewJS "QLR040221709"
+#define HSPScannerService_LogCode_CancelPreviewJS "QLR040221710"
+#define HSPScannerService_LogCode_ScanImageJS "QLR040221711"
+#define HSPScannerService_LogCode_SetParamJS "QLR040221712"
+
+*/
+
+
+#endif //_HSPSCANNER_USER_LOGRCODE_H

Module/mod_HSPScanner/HSPSCanner_UserErrorCode.h

@@ -2,10 +2,6 @@
 #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_ERR_HSPS_PREVIEW_FAILED 0x21700003
 #define LOG_EVT_HSPS_CANCEL_PREVIEW_FAILED 0x21700004

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -13,6 +13,7 @@
 #else
 #include <opencv2/opencv.hpp>
 #endif //NOT _WIN32
+#include "HSPSCanner_LogCode.h"
 
 #define RESET_TIMER_ID 1
 #define CHECK_CONNECT_TIMER_ID 2
@@ -111,6 +112,29 @@ CSimpleStringA CombineJsonContext(const char* szMessage)
 	return  result;
 }
 
+CSimpleStringA CombineJsonContext4SetPreview(bool bOpen, const char* szMessage = NULL)
+{
+	CSimpleStringA result(true);
+	if (szMessage == NULL || strlen(szMessage) == 0) {
+		if (bOpen) {
+			result = CSimpleStringA::Format("{\"PreviewSwitch\": ON}");
+		}
+		else {
+			result = CSimpleStringA::Format("{\"PreviewSwitch\": OFF}");
+		}
+	}
+	else {
+		if (bOpen) {
+			result = CSimpleStringA::Format("{\"addition\": \"%s\", \"PreviewSwitch\": ON}", szMessage);
+		}
+		else {
+			result = CSimpleStringA::Format("{\"addition\": \"%s\", \"PreviewSwitch\": OFF}", szMessage);
+		}
+	}
+	return  result;
+}
+
+
 CHSPScannerFSM::CHSPScannerFSM(void)
 	:
 	m_ecSelfTest(Error_Succeed),
@@ -752,7 +776,7 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 				ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 				if (FAILURED(erroCode)) {
 					//RTA2N0B
-					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_Reset, "DevAdapter::Reset", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset);
+					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_Reset, "DevAdapter::Reset", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset);
 					SetDevState(DEVICE_STATUS_FAULT);
 					uRet = 1;
 				} else {
@@ -762,7 +786,7 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 					ullEnd = SP::Module::Comm::RVCGetTickCount();
 					if (FAILURED(eXYW)) {
 						//RTA2N07
-						SetErrorAndLog(eXYW, MEC_DEVAPI_HSPSCANNER_SetViewPos, "DevAdapter::SetViewPos", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset);
+						SetErrorAndLog(eXYW, MEC_DEVAPI_HSPSCANNER_SetViewPos, "DevAdapter::SetViewPos", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset);
 						SetDevState(DEVICE_STATUS_FAULT);
 						uRet = 1;
 						e->SetHandled();
@@ -780,10 +804,10 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 								erroCode = m_hDevHelper->SetPreview(0);
 								ullEnd = SP::Module::Comm::RVCGetTickCount();
 								if (erroCode == Error_Succeed) {
-									DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)();
+									DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode(CustomLogCode_CancelPreview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false));
 								} else {
 									//RTA2N04
-									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::CancelPreview", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset);
+									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::SetPreview", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_CancelPreview_Default, CombineJsonContext4SetPreview(false));
 								}
 							} while (false);
 							do 
@@ -799,7 +823,7 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 									}
 									else {
 										//RTA2N0Q
-										SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
+										SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
 									}
 								}
 							} while (false);
@@ -814,12 +838,12 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 									DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetParam").setCostTime(ullEnd - ullStart)("HSPS_VIEW_HIDE");
 								} else {
 									//RTA2N0Q
-									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
+									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
 								}
 							} while (false);
 						}
 						else {
-							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setLogCode(HSPScannerService_CustomLogCode_Reset)("Recover routine done");
+							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setLogCode(CustomLogCode_Reset)("Recover routine done");
 							uRet = 2;
 						}
 					}
@@ -1485,10 +1509,10 @@ int CHSPScannerFSM::StartPreview(SpReqAnsContext<HSPScannerService_StartPreview_
 		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (FAILURED(erroCode)) {
 			//RTA2N03
-			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_StartPreview, CombineJsonContext("StartPreview::SetPreview(1)"));
+			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_StartPreview, CombineJsonContext4SetPreview(true, "StartPreview"));
 			SetLastUserCode(GetAlarmDEC());
 		} else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreview).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)("StartPreview::SetPreview(1)");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreview).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(true, "StartPreview"));
 		}
 	}
 
@@ -1529,10 +1553,10 @@ int CHSPScannerFSM::StopPreview(SpReqAnsContext<HSPScannerService_CancelPreview_
 		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (ISSUCCEEDED(erroCode)) {
 			nRes = 2;
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreview).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)("SetPreview(0) succ");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreview).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false));
 		} else {
 			//RTA2N04
-			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::CancelPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_CancelPreview, CombineJsonContext("SetPreview(0)"));
+			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_CancelPreview, CombineJsonContext4SetPreview(false));
 			const DWORD dwCode = GetAlarmDEC();
 			CSimpleStringA tmpRTA(true), tmpDesc(true);
 			if (GetEntityBase()->GetFunction()->GetVTMErrMsg(dwCode, tmpDesc, tmpRTA) == Error_Succeed)
@@ -2090,11 +2114,11 @@ ErrorCodeEnum CHSPScannerFSM::OnDevExit()
 				erroCode = m_hDevHelper->SetPreview(0);
 				const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 				if (ISSUCCEEDED(erroCode)) {
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode(__FUNCTION__).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)("OnDevExit::SetPreview(0)");
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode(__FUNCTION__).setLogCode(CustomLogCode_CancelPreview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false, "OnDevExit"));
 					ToSwithLight(false);
 				} else {
 					//RTA2N04
-					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::CancelPreview", __FUNCTION__, false, ullEnd - ullStart, "", CombineJsonContext("OnDevExit::SetPreview(0)"));
+					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::SetPreview", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_CancelPreview_Default, CombineJsonContext4SetPreview(false));
 				}
 			}
 		} else if(ISSUCCEEDED(erroCode) && !status.isConnected){
@@ -2137,15 +2161,16 @@ int CHSPScannerFSM::StartPreviewJS(SpReqAnsContext<HSPScannerService_StartPrevie
 	erroCode = m_hDevHelper->SetPreview(1);
 	ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 	if (FAILURED(erroCode)) {
-		SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_StartPreviewJS, CombineJsonContext("StartPreview::SetPreview(1)"));
+		SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_StartPreviewJS, CombineJsonContext4SetPreview(true));
 		SetLastUserCode(GetAlarmDEC());
 		erroCode = Error_Unexpect;
 		ret = 1;
 	}
 	else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreviewJS).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)("StartPreview::SetPreview(1)");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreviewJS).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(true, "StartPreview"));
 		ToSwithLight();
 	}
+
 	ctx->Answer(erroCode, GetLastUserCode());
 	return ret;
 }
@@ -2172,12 +2197,12 @@ int CHSPScannerFSM::CancelPreview(SpReqAnsContext<HSPScannerService_CancelPrevie
 		erroCode = m_hDevHelper->SetPreview(0);
 		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (ISSUCCEEDED(erroCode)) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreviewJS).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)("SetPreview(0) succ");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreviewJS).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false, "JS::CancelPreview"));
 			ctx->Answer(Error_Succeed);
 		}
 		else {
 			//RTA2N04
-			SetErrorAndLog(erroCode, LOG_EVT_HSPS_CANCEL_PREVIEW_FAILED, "DevAdapter::CancelPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_CancelPreviewJS, CombineJsonContext("SetPreview(0)"));
+			SetErrorAndLog(erroCode, LOG_EVT_HSPS_CANCEL_PREVIEW_FAILED, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_CancelPreviewJS, CombineJsonContext4SetPreview(false));
 			SetLastUserCode(GetAlarmDEC());
 			ctx->Answer(Error_Unexpect, GetLastUserCode());
 			ret = 1;

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -536,6 +536,12 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 {
 	LOG_FUNCTION();
 
+	ULLINT OpenRFControlTime = 0;
+	ULLINT CloseRFControlTime = 0;
+	ULLINT IDCerAuthenticateTime = 0;
+	ULLINT IDCerGetDataEx2Time = 0;
+	ULLINT ScanIDAndSaveImageTime = 0;
+
 	DWORD elapsed = 0;
 	DWORD dwStart = SP::Module::Comm::RVCGetTickCount();
 	DWORD dwEnd = SP::Module::Comm::RVCGetTickCount();
@@ -589,10 +595,12 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 			m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 			errRfOpen = m_hDevHelper->IDCerRFControl(true);
 			m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+			OpenRFControlTime = m_ullEndTime - m_ullBeginTime;
 			if (Error_Succeed == errRfOpen)
 			{
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
-					.setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime)();
+					.setAPI("DevAdapter::IDCerRFControl").setLogCode(IDCertService_LogCode_OpenIDCerRFControl)
+					.setCostTime(OpenRFControlTime)();
 			}
 			else
 			{
@@ -609,6 +617,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 		m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 		errAuth = m_hDevHelper->IDCerAuthenticate();
 		m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+		IDCerAuthenticateTime = m_ullEndTime - m_ullBeginTime;
 		if (Error_Succeed != errAuth)
 		{
 			dwEnd = SP::Module::Comm::RVCGetTickCount();
@@ -618,12 +627,13 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 		else
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
-				.setAPI("DevAdapter::IDCerAuthenticate").setCostTime(m_ullEndTime - m_ullBeginTime)();
+				.setAPI("DevAdapter::IDCerAuthenticate").setCostTime(IDCerAuthenticateTime)();
 			bIDCerAuthenticate = true;
 
 			m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 			errReadEx2 = m_hDevHelper->IDCerGetDataEx2(idInfoEx2);
 			m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+			IDCerGetDataEx2Time = m_ullEndTime - m_ullBeginTime;
 
 			if (errReadEx2 == Error_NotImpl)
 			{
@@ -659,8 +669,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 					unsigned char IssuedSN[1024]; memset(IssuedSN, 0, 1024); //换证次数
 
 					DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER)
-						.setAPI("DevAdapter::IDCerGetDataEx2").setCostTime(m_ullEndTime - m_ullBeginTime)
-						.setLogCode(IDCertService_LogCode_ReadAndScanUTF8)();
+						.setAPI("DevAdapter::IDCerGetDataEx2").setCostTime(IDCerGetDataEx2Time)();
 					bReadSuccess = true;
 					LogEvent(Severity_Middle, LOG_EVT_IDCERTIFICATE_OP, "IDCertifacate op.");
 
@@ -816,10 +825,13 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 						m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 						eErr = m_hDevHelper->ScanIDAndSaveImage();
 						m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+						ScanIDAndSaveImageTime = m_ullEndTime - m_ullBeginTime;
+
 						if (eErr == Error_Succeed)
 						{
 							curDeleteType = Bmp_ZP | Bmp_SCAN;
-							DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ScanIDAndSaveImage").setCostTime(m_ullEndTime - m_ullBeginTime)();
+							DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ScanIDAndSaveImage")
+								.setCostTime(ScanIDAndSaveImageTime)();
 
 							transImgMsg.Clear();
 							//idfront.bmp" and "idback.bmp
@@ -867,7 +879,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 						{
 							if (eErr != Error_NotImpl)
 								SetErrorAndLog(eErr, MEC_DEVAPI_IDCER_ScanIDAndSaveImage, "DevAdapter::ScanIDAndSaveImage", __FUNCTION__,
-									false, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8);
+									false, ScanIDAndSaveImageTime);
 						}
 					}
 
@@ -907,15 +919,18 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 	ErrorCodeEnum eErr1 = m_hDevHelper->IDCerRFControl(false);
 	m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+	CloseRFControlTime = m_ullEndTime - m_ullBeginTime;
+
 	if (eErr1 != Error_Succeed)
 	{
 		SetErrorAndLog(eErr1, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-			false, m_ullEndTime - m_ullBeginTime, "", SetRFControlContext(false).GetData());
+			false, CloseRFControlTime, IDCertService_LogCode_CloseIDCerRFControl);
 	}
 	else
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl")
-			.setCostTime(m_ullEndTime - m_ullBeginTime)();
+			.setLogCode(IDCertService_LogCode_CloseIDCerRFControl)
+			.setCostTime(CloseRFControlTime)();
 	}
 
 	if (bGetIDCert)
@@ -932,14 +947,14 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 			if (bInvokeReadEx2 && !bReadSuccess) {
 
 				SetErrorAndLog(errReadEx2, MEC_DEVAPI_IDCER_IDCerGetDataEx2, "DevAdapter::IDCerGetDataEx2", __FUNCTION__,
-					true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8);
+					true, IDCerGetDataEx2Time);
 				ctx->Answer(Error_TimeOut, GetAlarmDEC()); //RTA2109
 			}
 		}
 		else if (!bOpenRF)
 		{
 			SetErrorAndLog(errRfOpen, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-				true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8, SetRFControlContext(true).GetData());
+				true, OpenRFControlTime, IDCertService_LogCode_OpenIDCerRFControl);
 			ctx->Answer(Error_TimeOut, GetAlarmDEC());
 		}
 		else
@@ -947,26 +962,26 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 			if (errAuth == Error_DevMedia)
 			{
 				LogWarn(Severity_Low, Error_Unexpect, IDCertificate_UserErrorCode_Timeout_OtherCard, "读证超时，插入的卡片非身份.");
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(IDCertService_LogCode_ReadAndScanUTF8)();
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::IDCerAuthenticate").setCostTime(IDCerAuthenticateTime)();
 				ctx->Answer(Error_TimeOut);
 			}
 			else if(errAuth == Error_Dev_IDCardNotFound)
 			{
 				LogWarn(Severity_Low, Error_Unexpect, IDCertificate_UserErrorCode_Timeout_NoCard, "读证超时，未检测到有卡片插入.");
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(IDCertService_LogCode_ReadAndScanUTF8)();
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::IDCerAuthenticate").setCostTime(IDCerAuthenticateTime)();
 				ctx->Answer(Error_TimeOut);
 			}
 			else
 			{
 				SetErrorAndLog(errAuth, MEC_DEVAPI_IDCER_IDCerAuthenticate, "DevAdapter::IDCerAuthenticate", __FUNCTION__,
-					false, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8); //RTA2107
+					false, IDCerAuthenticateTime); //RTA2107
 				ctx->Answer(Error_Unexpect, GetAlarmDEC());
 			}
 		}
 	}
 	else 
 	{
-		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode(IDCertService_LogCode_ReadAndScanUTF8).setResultCode("RTA2104")("ReadAndScanUTF8 some thing wrong.");
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setResultCode("RTA2104")("ReadAndScanUTF8JS some thing wrong.");
 		ctx->Answer(Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed);
 		LogError(Severity_High, Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed, "ReadAndScanUTF8 some thing wrong.");
 	}
@@ -993,6 +1008,12 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 {
 	LOG_FUNCTION();
 
+	ULLINT OpenRFControlTime = 0;
+	ULLINT CloseRFControlTime = 0;
+	ULLINT IDCerAuthenticateTime = 0;
+	ULLINT IDCerGetDataEx2Time = 0;
+	ULLINT ScanIDAndSaveImageTime = 0;
+
 	DWORD elapsed = 0;
 	DWORD dwStart = SP::Module::Comm::RVCGetTickCount();
 	DWORD dwEnd = SP::Module::Comm::RVCGetTickCount();
@@ -1046,11 +1067,13 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 			m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 			errRfOpen = m_hDevHelper->IDCerRFControl(true);
 			m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+			OpenRFControlTime = m_ullEndTime - m_ullBeginTime;
 			
 			if (Error_Succeed == errRfOpen)
 			{
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
-					.setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime)();
+					.setAPI("DevAdapter::IDCerRFControl").setLogCode(IDCertService_LogCode_OpenIDCerRFControl)
+					.setCostTime(OpenRFControlTime)();
 			}
 			else
 			{
@@ -1067,6 +1090,8 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 		m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 		errAuth = m_hDevHelper->IDCerAuthenticate();
 		m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+		IDCerAuthenticateTime = m_ullEndTime - m_ullBeginTime;
+
 		if (Error_Succeed != errAuth)
 		{
 			dwEnd = SP::Module::Comm::RVCGetTickCount();
@@ -1076,12 +1101,14 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 		else
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
-				.setAPI("DevAdapter::IDCerAuthenticate").setCostTime(m_ullEndTime - m_ullBeginTime)();
+				.setAPI("DevAdapter::IDCerAuthenticate").setCostTime(IDCerAuthenticateTime)();
 			bIDCerAuthenticate = true;
 
 			m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 			errReadEx2 = m_hDevHelper->IDCerGetDataEx2(idInfoEx2);
 			m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+			IDCerGetDataEx2Time = m_ullEndTime - m_ullBeginTime;
+
 			if (errReadEx2 == Error_NotImpl)
 			{
 				ctx->Ans.msgtype = 0; //旧字段传递，GBK、字符串传递文字信息
@@ -1116,8 +1143,7 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 					unsigned char IssuedSN[1024]; memset(IssuedSN, 0, 1024); //换证次数
 
 					DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER)
-						.setAPI("DevAdapter::IDCerGetDataEx2").setCostTime(m_ullEndTime - m_ullBeginTime)
-						.setLogCode(IDCertService_LogCode_ReadAndScanUTF8JS)();
+						.setAPI("DevAdapter::IDCerGetDataEx2").setCostTime(IDCerGetDataEx2Time)();
 					bReadSuccess = true;
 					LogEvent(Severity_Middle, LOG_EVT_IDCERTIFICATE_OP, "IDCertifacate op.");
 
@@ -1273,10 +1299,13 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 						m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 						eErr = m_hDevHelper->ScanIDAndSaveImage();
 						m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+						ScanIDAndSaveImageTime = m_ullEndTime - m_ullBeginTime;
+
 						if (eErr == Error_Succeed)
 						{
 							curDeleteType = Bmp_ZP | Bmp_SCAN;
-							DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ScanIDAndSaveImage").setCostTime(m_ullEndTime - m_ullBeginTime)();
+							DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ScanIDAndSaveImage")
+								.setCostTime(ScanIDAndSaveImageTime)();
 							
 							transImgMsg.Clear();
 							//idfront.bmp" and "idback.bmp
@@ -1324,7 +1353,7 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 						{
 							if(eErr != Error_NotImpl)
 							SetErrorAndLog(eErr, MEC_DEVAPI_IDCER_ScanIDAndSaveImage, "DevAdapter::ScanIDAndSaveImage", __FUNCTION__,
-								false, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8JS);
+								false, ScanIDAndSaveImageTime);
 						}
 					}
 
@@ -1364,15 +1393,18 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 	ErrorCodeEnum eErr1 = m_hDevHelper->IDCerRFControl(false);
 	m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+	CloseRFControlTime = m_ullEndTime - m_ullBeginTime;
+
 	if (eErr1 != Error_Succeed)
 	{
 		SetErrorAndLog(eErr1, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-			false, m_ullEndTime - m_ullBeginTime, "", SetRFControlContext(false).GetData());
+			false, CloseRFControlTime, IDCertService_LogCode_CloseIDCerRFControl);
 	}
 	else
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl")
-			.setCostTime(m_ullEndTime - m_ullBeginTime)();
+			.setLogCode(IDCertService_LogCode_CloseIDCerRFControl)
+			.setCostTime(CloseRFControlTime)();
 	}
 
 	if (bGetIDCert)
@@ -1389,7 +1421,7 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 			if (bInvokeReadEx2 && !bReadSuccess) {
 
 				SetErrorAndLog(errReadEx2, MEC_DEVAPI_IDCER_IDCerGetDataEx2, "DevAdapter::IDCerGetDataEx2", __FUNCTION__,
-					true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8JS);
+					true, IDCerGetDataEx2Time);
 				//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Invoke IDCerGetDataEx2(Timeout) failed: %s", SpStrError(errReadEx2));
 
 				ctx->Answer(Error_TimeOut, GetAlarmDEC()); //RTA2109
@@ -1398,7 +1430,7 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 		else if (!bOpenRF)
 		{
 			SetErrorAndLog(errRfOpen, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-				true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8JS, SetRFControlContext(true).GetData());
+				true, OpenRFControlTime, IDCertService_LogCode_OpenIDCerRFControl);
 			//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Open IDCerRFControl(Timeout) failed: %s", SpStrError(errRfOpen));
 
 			ctx->Answer(Error_TimeOut, GetAlarmDEC());
@@ -1409,26 +1441,26 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 			if (errAuth == Error_DevMedia)
 			{
 				LogWarn(Severity_Low, Error_Unexpect, IDCertificate_UserErrorCode_Timeout_OtherCard, "读证超时，插入的卡片非身份.");
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(IDCertService_LogCode_ReadAndScanUTF8JS)();
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::IDCerAuthenticate").setCostTime(IDCerAuthenticateTime)();
 				ctx->Answer(Error_TimeOut);
 			}
 			else if (errAuth == Error_Dev_IDCardNotFound)
 			{
 				LogWarn(Severity_Low, Error_Unexpect, IDCertificate_UserErrorCode_Timeout_NoCard, "读证超时，未检测到有卡片插入.");
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(IDCertService_LogCode_ReadAndScanUTF8JS)();
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::IDCerAuthenticate").setCostTime(IDCerAuthenticateTime)();
 				ctx->Answer(Error_TimeOut);
 			}
 			else
 			{
 				SetErrorAndLog(errAuth, MEC_DEVAPI_IDCER_IDCerAuthenticate, "DevAdapter::IDCerAuthenticate", __FUNCTION__,
-					false, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8JS); //RTA2107
+					false, IDCerAuthenticateTime); //RTA2107
 				ctx->Answer(Error_Unexpect, GetAlarmDEC());
 			}
 		}
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode(IDCertService_LogCode_ReadAndScanUTF8JS).setResultCode("RTA2104")("ReadAndScanUTF8JS some thing wrong.");
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setResultCode("RTA2104")("ReadAndScanUTF8JS some thing wrong.");
 		ctx->Answer(Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed);
 		LogError(Severity_High, Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed, "ReadAndScanUTF8 some thing wrong.");
 	}
@@ -2137,26 +2169,6 @@ CSimpleStringA CIDCertFSM::GetFileLastModifyTime(CSimpleStringA filePath)
 #endif
 }
 
-CSimpleStringA CIDCertFSM::SetRFControlContext(bool bControl)
-{
-	CSimpleStringA keyContext = "";
-	if (bControl) //true
-	{
-		keyContext = "Open";
-	}
-	else //false
-	{
-		keyContext = "Close";
-	}
-	std::map<std::string, std::string> msgInfo;
-	msgInfo["RFControlFlag"] = keyContext.GetData();
-	std::pair<bool, std::string> strResult;
-	strResult = generateJsonStr(msgInfo);
-	CSimpleStringA rfContext = strResult.second.c_str();
-
-	return rfContext;
-}
-
 #ifdef RVC_OS_WIN
 void CIDCertFSM::HttpsLogCallBack(const char* logtxt)
 {

Module/mod_IDCertificate/IDCertFSM.h

@@ -93,6 +93,7 @@ enum BmpType
 
 #include "IDCerClass.h"
 #include "IDCertificate_def_g.h"
+#include "IDCertificate_LogCode.h"
 #pragma region forsonar
 typedef IDCertificate::IDCertService_CancelRead_Info IDCert_CancelRead_Info;
 typedef IDCertificate::IDCertService_ReadAndScanUTF8_Req IDCert_ReadAndScanUTF8_Req; //ex2
@@ -240,8 +241,6 @@ public:
 	int ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCert_ReadAndScanUTF8_Ans>::Pointer ctx); 
 	int ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req, IDCert_ReadAndScanUTF8JS_Ans>::Pointer ctx);
 
-	CSimpleStringA SetRFControlContext(bool bControl);
-
 	int WaitFetchIDCard();
 	void SetReadMore(){m_bWaitReadMore = true;}
 	void SetExitFlag(){m_bExit = true;}

Module/mod_IDCertificate/IDCertificate_LogCode.h

@@ -0,0 +1,11 @@
+#pragma once
+#ifndef _IDCERTIFICATE_LOGCODE_H
+#define _IDCERTIFICATE_LOGCODE_H
+
+namespace IDCertificate {
+
+#define IDCertService_LogCode_OpenIDCerRFControl "QLR040220121"
+#define IDCertService_LogCode_CloseIDCerRFControl "QLR040220122"
+
+}
+#endif

Module/mod_gpio/GpioFSM.cpp

@@ -247,7 +247,7 @@ CSimpleStringA CombineJsonContext(const char* szMessage)
 	return  result;
 }
 
-CGPIOFSM::CGPIOFSM(void) :m_bVibrationFlag(false), m_bOpenFlag(false), m_bMoveFlag(false), m_bCardGateFlag(false)
+CGPIOFSM::CGPIOFSM(void) :m_ePickUpFlag(UnknownStatus),m_bVibrationFlag(false), m_bOpenFlag(false), m_bMoveFlag(false), m_bCardGateFlag(false)
 	, m_moveHoldTimes(0)
 	, m_moveDisappearTimes(0)
 	, m_bNewVersion(FALSE), m_bFuncVer2(FALSE), m_btLastRevcInput(-1), m_RecvErrTims(0)

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -757,6 +757,7 @@ void CHealthManagerFSM::ToLogWarnTermAboutInfo()
 		termStartInfo["AccessAuthResult"] = CSimpleStringA::Format("%d", m_iAccessAuth);
 		
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("TerminalStartCost")("%s", generateJsonStr(termStartInfo).second.c_str());
+		LogWarn(Severity_Low, Error_Debug, HealthManager_UserErrorCode_TerminalAppLoadInfo, generateJsonStr(termStartInfo).second.c_str());
 	}
 	QueryAndSaveDNS();
 	QueryAndSendCPUInfo();

Module/mod_healthmanager/HealthManagerFSM.h

@@ -45,7 +45,7 @@ enum HealthManger_UserErrorCode {
 	HealthManager_UserErrorCode_Need_Guardian = 0x50100210,				//健康需要启动guardian
 	HealthManager_UserErrorCode_Need_No_Guardian = 0x50100211,			//健康不需要启动guardian	
 	HealthManager_UserErrorCode_WaitForAccessAuthEntityIdle = 0x50100212,	//健康等待准入启动正常
-	HealthManager_UserErrorCode_First_Info_AboutPC = 0x50100213,			//健康启动结束后第一次上送计算机信息(主要是确定pad的归属厂商信息)
+	HealthManager_UserErrorCode_TerminalAppLoadInfo = 0x50100213,			//终端应用启动过程信息
 	//
 	HealthManager_UserErrorCode_PrivilegeCMD = 0x50100215,				//上送终端收到的启动、重启事件（非关门页、用户桌面？需要调查后理清楚）
 	HealthManager_UserErrorCode_SogouInput_UsingSys = 0x50100216,    // 使用普通调用的搜狗输入法

Module/mod_pinpad/PinPadFSM.cpp

@@ -800,10 +800,13 @@ Err:
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 	errCode = m_hDevHelper->GetPinBlock(pinBlk);
 	m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
-
 	
-	LogWarn(Severity_Low, Error_Succeed, PinPad_UserErrorCode_PinPad_GetPinBlock_Call
-		, CSimpleStringA::Format("{\"cost\":%d}", m_ullEndTime - m_ullBeginTime));
+	ULLINT ullGetPinBlockCost = m_ullEndTime - m_ullBeginTime;
+	char* tmpCheckCode = new char[MAX_PIN_BLOCK_SIZE];
+	if (tmpCheckCode == NULL)
+		return Error_Resource;
+	memset(tmpCheckCode, 0, MAX_PIN_BLOCK_SIZE);
+
 	if (errCode == Error_Succeed)
 	{
 		char* tmpPinData = new char[MAX_PIN_BLOCK_SIZE];
@@ -853,15 +856,9 @@ Err:
 		}
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::EncryptData").setCostTime(m_ullEndTime - m_ullBeginTime)();
 
-		char* tmpCheckCode = new char[MAX_PIN_BLOCK_SIZE];
-		if (tmpCheckCode == NULL)
-			return Error_Resource;
-		memset(tmpCheckCode, 0, MAX_PIN_BLOCK_SIZE);
 		//HexBuf2StrBuf(dstInfo.data,&tmpCheckCode,dstInfo.dwSize);
 		memcpy(tmpCheckCode, dstInfo.data, dstInfo.dwSize);
 
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ckckck[%s], m_keySNSM:%s", tmpCheckCode, m_keySNSM.GetData());
-
 
 		if (strnicmp(tmpCheckCode, "9F1F7BFF6F5511384D9430531E538FD3", strlen("9F1F7BFF6F5511384D9430531E538FD3")) == 0)
 			SetErrorAndLog(Error_Unexpect, PinPad_UserErrorCode_KEY_LOST_SM, "", __FUNCTION__);
@@ -895,8 +892,14 @@ Err:
 		ctxSM->Answer(Error_DevCommFailed, dwUserCode);
 		return Error_DevCommFailed;
 	}
+	map<string, string> encryptTextInfo;
+	encryptTextInfo["text"] = "获取密文成功";
+	encryptTextInfo["ckCode"] = tmpCheckCode;
+	encryptTextInfo["keySN"] = m_keySNSM.GetData();
+	encryptTextInfo["getPinBlockCost"] = CSimpleStringA::Format("%d",ullGetPinBlockCost).GetData();
+
 	DbgWithLink(LOG_LEVEL_INFO, ctxSM->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setLogCode(PinPadService_LogCode_GetInputSM)
-		.setAPI("DevAdapter::GetPinBlock").setCostTime(m_ullEndTime - m_ullBeginTime)("获取密文成功");
+		.setAPI("DevAdapter::GetPinBlock").setCostTime(m_ullEndTime - m_ullBeginTime)("%s", generateJsonStr(encryptTextInfo).second.c_str());
 	//oilyang@20240410 move to out space,after stopinput & turn off the light
 	//Sleep(100);
 	//ctxSM->Answer(Error_Succeed);

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1553,8 +1553,8 @@ void CVtmLoaderFSM::NoticeEntityLoad(int evtCode)
 	{
 		if (m_csEntityList.IndexOf(strEntityNames[i]) != -1)
 		{
-			LogWarn(Severity_Low, Error_Debug, LOG_TRACE_ENTITY_START_TIME,
-				SP::Module::Util::generateConsumeTimeJson(strEntityNames[i], SP::Module::Util::formatTime(Infos[i].startTime).c_str(), GetDualTime(Infos[i].startTime, Infos[i].startEndTime)).GetData());
+			//LogWarn(Severity_Low, Error_Debug, LOG_TRACE_ENTITY_START_TIME,
+			//	SP::Module::Util::generateConsumeTimeJson(strEntityNames[i], SP::Module::Util::formatTime(Infos[i].startTime).c_str(), GetDualTime(Infos[i].startTime, Infos[i].startEndTime)).GetData());
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("EntityStartCost")
 				(SP::Module::Util::generateConsumeTimeJson(strEntityNames[i], SP::Module::Util::formatTime(Infos[i].startTime).c_str(), GetDualTime(Infos[i].startTime, Infos[i].startEndTime)).GetData());
 		}
@@ -1974,6 +1974,15 @@ void CVtmLoaderFSM::CheckDeviceEntity(SpReqAnsContext<VtmLoaderService_CheckDevi
 	CEntityStaticInfo staticInfo;
 	ErrorCodeEnum eErrCode = Error_Unexpect;
 	CSimpleStringA csEntityName = ctx->Req.entityName;
+
+	//oiltmp@20240415 to be delete after x months
+	if (ctx->Req.entityName.Compare("CardIssuer") == 0)
+	{
+		if (m_sysInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
+			csEntityName = "CardIssuerStore";
+		else
+			csEntityName = "CardIssuerStand";
+	}
 	
 	if ((eErrCode = m_pEntity->GetFunction()->GetEntityStaticInfo(csEntityName.GetData(), staticInfo)) != Error_Succeed)
 	{