Z991239-6255 #comment feat: 大机非接日志精简

Signed-Off-By: commit-hook

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -726,12 +726,10 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 	}
 
 	do{
-
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("open card issuer, port:%d, baudRate:%d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt());
+	
 		l_beginTime = SP::Module::Comm::RVCGetTickCount();
 		hr = m_hDevHelper->DevOpen(m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt());
 		l_endTime = SP::Module::Comm::RVCGetTickCount();
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("port:%d, baudRate:%d, hr:%d",m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt(), hr);
 		
 		if (hr == Error_Succeed)
 		{
@@ -747,7 +745,7 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 			
 			if(eErrDev == Error_Succeed)
 			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevCategory").setCostTime(l_endTime - l_beginTime)("OpenDevice, szVendor:%s, szType:%s, szModel:%s",m_devCatInfo.szVendor, m_devCatInfo.szType, m_devCatInfo.szModel);
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevCategory").setCostTime(l_endTime - l_beginTime)("OpenDevice::GetDevCategory");
 				m_adapterInfo.FulfillCategoryInfo(m_devCatInfo);
 			}
 			else
@@ -755,54 +753,6 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 				SetErrorAndLog(eErrDev, MEC_DEVAPI_RF_GetDevCategory, "DevAdapter::GetDevCategory", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 				return Error_DevCommFailed;
 			}
-//#ifdef RVC_OS_WIN
-//			CSimpleStringA csCMBPrint("CMBPrint.dll");
-//			csCMBPrint = csBinPath + csBackslash + csCMBPrint;
-//			DbgInfo(CSimpleStringA::Format("cmbpath %s", (LPCTSTR)csCMBPrint));
-//			HMODULE hr = LoadLibraryA(csCMBPrint);
-//			if (hr == NULL)
-//			{
-//				DbgWarn(CSimpleStringA::Format("Load CMBPrint failed(%d).", hr));
-//				return Error_DevLoadFileFailed;
-//			}
-//			if ((cmdDecodeMag2 = (lpCMBdecodeMag2)GetProcAddress(hr, "CMBdecodeMag2")) == NULL)
-//			{
-//				DbgWarn("Get Mag2 address failed.");
-//				return Error_DevLoadFileFailed;
-//			}
-//			if ((cmdDecodeEx = (lpCMBdecodeEx)GetProcAddress(hr, "CMBdecodeEx")) == NULL)
-//			{
-//				DbgWarn("Get Mag23Ex address failed.");
-//				return Error_DevLoadFileFailed;
-//			}
-//			initTries = 0;
-//			break;
-//#else
-//			CSimpleStringA csCMBPrint("libCMBPrint.so");
-//			csCMBPrint = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "%s",
-//				csBinPath.GetData(), csCMBPrint.GetData());
-//			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("cmbpath %s", csCMBPrint.GetData());
-//
-//			toolkit_lib_t dlOpen;
-//			int res = toolkit_dlopen(csCMBPrint, &dlOpen);
-//			if (res != 0) {
-//				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("Load CMBPrint failed with error %s.", toolkit_dlerror(&dlOpen));
-//				return Error_DevLoadFileFailed;
-//			}
-//
-//			if ((res = toolkit_dlsym(&dlOpen, "CMBdecodeMag2", (void**)&cmdDecodeMag2)) != 0) {
-//				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("Get Mag2 address failed.");
-//				return Error_DevLoadFileFailed;
-//			}
-//
-//			if ((res = toolkit_dlsym(&dlOpen, "CMBdecodeEx", (void**)&cmdDecodeEx)) != 0) {
-//				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("Get Mag23Ex address failed.");
-//				return Error_DevLoadFileFailed;
-//			}
-//
-//			initTries = 0;
-//			break;
-//#endif // RVC_OS_WIN
 
 			if (!LoadCMBPrint(csBinPath))
 			{
@@ -815,7 +765,7 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 
         } else {
 
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ContactlessCard DevOpen failed , dwPort:%d, dwBaudRate:%d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt());
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ContactlessCard DevOpen failed ,重试:%d, dwPort:%d, dwBaudRate:%d", initTries, m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt());
 			SetErrorAndLog(hr, MEC_DEVAPI_RF_DevOpen, "DevAdapter::DevOpen", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ContactlessCard 启动失败:DevOpen failed.重试:%d", initTries);
             initTries++;
@@ -834,47 +784,17 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 	}
 	else
 	{
-		eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
-		if (eErrDev != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Load, open run cfg file failed!");
-			return eErrDev;
-		}
-		int ret = 0,isIssue = 0;
-		if ((spConfig->ReadConfigValueInt("RunInfo","CardRemains",m_CardRemains) == Error_Succeed)
-			&& (spConfig->ReadConfigValueInt("RunInfo","CardIssued",m_CardIssued) == Error_Succeed)
-			&& (spConfig->ReadConfigValueInt("RunInfo","CardCaptured",m_CardCaptured) == Error_Succeed)
-			&& (spConfig->ReadConfigValueInt("RunInfo","IsIssue",isIssue) == Error_Succeed)
-			&& (spConfig->ReadConfigValueInt("RunInfo","CardMixed",m_CardMixed) == Error_Succeed)
-			&& (spConfig->ReadConfigValueInt("RunInfo","CardInit",m_CardInit) == Error_Succeed)
-			&& (spConfig->ReadConfigValueInt("RunInfo","CardPercent",m_CardPercent) == Error_Succeed))
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardRemains:%d, m_CardIssued:%d, CardCaptured:%d, isIssue:%d, CardMixed:%d, CardInit:%d",
-					m_CardRemains, m_CardIssued, m_CardCaptured, isIssue, m_CardMixed, m_CardInit);
-			m_bIssued = !!(isIssue);
-			//ret = UnAcceptCard();
-		}
-		else
-			return Error_IO;
-		if (ret == 0)
-		{
-			m_devInit = true;
-			LogWarn(Severity_Low, Error_Unexpect, ContactlessCard_UserErrorCode_DevOpen_Success, "非接读卡器打开成功");
-			return Error_Succeed;
-		}
-		else{
-			LogWarn(Severity_Middle, Error_Unexpect, ContactlessCard_UserErrorCode_DevOpen_Failed, "非接读卡器打开失败1");
-			return Error_Unexpect;
-		}
+		m_devInit = true;
+		LogWarn(Severity_Low, Error_Unexpect, ContactlessCard_UserErrorCode_DevOpen_Success, "非接读卡器打开成功");
+		return Error_Succeed;
 	}
 }
 int CContactlessCardFSM::Initial()
 {
 	if (!m_bOpened) {
 		m_bNeedReset = false;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Initial,ret = 1");
 		return 1;//故障模式
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Initial,ret = 0");
 	return 0;
 }
 bool CContactlessCardFSM::GetDevStatus(bool bPrint)
@@ -1618,7 +1538,7 @@ bool CContactlessCardFSM::LoadCMBPrint(CSimpleStringA csBinPath)
 			return false;
 		}
 #endif
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Load %s succ.", (const char*)csCMBPrint);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Load %s succ.", (const char*)csCMBPrint);
 	}
 
 	return true;

Module/mod_ContactlessCard/ContactlessFSM.h

@@ -386,12 +386,12 @@ private:
 	int m_resetTimes;
 	lpCMBdecodeMag2 cmdDecodeMag2;
 	lpCMBdecodeEx cmdDecodeEx;	
-	bool m_devInit, m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore, m_bExit, m_bIssued;
+	bool m_devInit, m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore, m_bExit;
 	ErrorCodeEnum m_testResult;
 	CSimpleStringA m_csMachineType;
 	DevCategoryInfo m_devCatInfo;
 
-	int m_CardInit,m_CardRemains,m_CardIssued,m_CardCaptured,m_CardMixed,m_CardPercent;
+	
 	RFICReaderStatus devStatus;
 	CCardProcess *m_pCardProcess;
 	char *m_pDataToARQC;