#IQRV #comment [Vendor] nantian/2021.0918.01

DevAdapter/CMakeLists.txt

@@ -140,7 +140,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 # 通过conan的方式管理厂商库
 if(DEVADAPTER_USING_CONAN)
     set(KEBA_CONAN_LIB_NAME keba/2021.0625.01@LR04.02_VendorLib/testing)
-	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0831.01@LR04.02_VendorLib/testing)
+	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0918.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2021.0826.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2021.0701.01@LR04.02_VendorLib/testing)
     set(GWI_CONAN_LIB_NAME gwi/2021.0830.01@LR04.02_VendorLib/testing)

DevAdapter/nantian/cardissuer.1.1/cardissuer.nantian.1.1.cpp

@@ -9,9 +9,6 @@ CardIssuerClassImpl::CardIssuerClassImpl()
 	m_isDevOpened = false;
 	m_isCanceled = false;
 
-	m_SetCardInTypeFlag = 0;
-	m_CardInTypeFlag = false;
-
 	RetainBox = 0;
 
 	m_trace = NULL;
@@ -298,6 +295,7 @@ ErrorCodeEnum CardIssuerClassImpl::GetDevStatus(CardIssuerStatus &devStatus)
 	if(mtx.try_lock() == false)
 	{
 		statusMtx.lock();
+		m_trace->WriteTrace(CILIXTRACE_L_INFO, "GetDevStatus", "status not change!");
 		devStatus = statusCache;
 		statusMtx.unlock();
 		return m_StatusErrorCode;
@@ -340,8 +338,7 @@ ErrorCodeEnum CardIssuerClassImpl::GetDevStatus(CardIssuerStatus &devStatus)
 		//***判断设备状态
 		if ((atoi(sDevice) != CARDDISPENSER_DEVONLINE) && ((atoi(sDevice) != CARDDISPENSER_DEVBUSY)))
 		{
-			LOG4VTM(WARN, "<GetDevStatus> - "
-							  << "hardware error");
+			m_trace->WriteTrace(CILIXTRACE_L_INFO, "GetDevStatus", "hardware error");
 			strcpy(m_errorInfo.szErrMsg, "hardware error");
 			m_errorInfo.dwErrMsgLen = strlen(m_errorInfo.szErrMsg);
 			iRet = Error_Hardware;
@@ -445,6 +442,9 @@ ErrorCodeEnum CardIssuerClassImpl::GetDevStatus(CardIssuerStatus &devStatus)
 	statusMtx.lock();
 	statusCache = tempStatus;
 	devStatus = statusCache;
+	std::string mediaStr = std::to_string(tempStatus.eMedia);
+	mediaStr = "devStatus.eMedia:" + mediaStr;
+	m_trace->WriteTrace(CILIXTRACE_L_INFO, "GetDevStatus", mediaStr.c_str());
 	statusMtx.unlock();
 	
 	// m_signal_get_flag = false;
@@ -544,8 +544,6 @@ ErrorCodeEnum CardIssuerClassImpl::MoveCard(CardPosEnum eCardPos, int hopperNo)
 				iRet = Error_Hardware;
 				throw(iRet);
 			}
-			m_SetCardInTypeFlag = 0;
-			m_CardInTypeFlag = false;
 		}
 		break;
 			//吞卡
@@ -599,8 +597,6 @@ ErrorCodeEnum CardIssuerClassImpl::MoveCard(CardPosEnum eCardPos, int hopperNo)
 				iRet = Error_Hardware;
 				throw(iRet);
 			}
-			m_SetCardInTypeFlag = 0;
-			m_CardInTypeFlag = false;
 		}
 		break;
 			//发卡
@@ -644,15 +640,6 @@ ErrorCodeEnum CardIssuerClassImpl::SetCardInType(CardInEnum eCardIn)
 					  << "WaitGetStatus");
 	LOG4VTM(WARN, "<SetCardInType> - "
 					  << "WaitSetCardInTypeEnd");
-	if ((m_SetCardInTypeFlag != 0) && (!m_CardInTypeFlag))
-	{
-		while (1)
-		{
-			if (m_SetCardInTypeFlag == 2)
-				break;
-			usleep(5000);
-		}
-	}
 	LOG4VTM(WARN, "<SetCardInType> - "
 					  << "SetCardInType Enter Count:" << FunSum);
 	memset(m_errorInfo.szErrMsg, 0, sizeof(m_errorInfo.szErrMsg));
@@ -660,14 +647,12 @@ ErrorCodeEnum CardIssuerClassImpl::SetCardInType(CardInEnum eCardIn)
 	int iRet = Error_Succeed;
 	try
 	{
-		m_SetCardInTypeFlag = 1;
 		int iInsertAction = 0;
 		switch (eCardIn)
 		{
 		case CI_CARD_IN_TYPE_FORBIDDEN:
 		{
 			iInsertAction = 0;
-			m_CardInTypeFlag = false;
 		}
 		break;
 		case CI_CARD_IN_TYPE_MAG:
@@ -681,9 +666,6 @@ ErrorCodeEnum CardIssuerClassImpl::SetCardInType(CardInEnum eCardIn)
 		}
 		break;
 		}
-
-		if (m_CardInTypeFlag)
-			throw 0;
 		LOG4VTM(WARN, "<SetCardInType> - "
 						  << "InsertCard-iInsertAction" << iInsertAction);
 		iRet = DRVCardDispenser->InsertCard(iInsertAction);
@@ -696,8 +678,6 @@ ErrorCodeEnum CardIssuerClassImpl::SetCardInType(CardInEnum eCardIn)
 			iRet = Error_Hardware;
 			throw(iRet);
 		}
-		if (eCardIn != CI_CARD_IN_TYPE_FORBIDDEN)
-			m_CardInTypeFlag = true;
 
 		iRet = Error_Succeed;
 	}
@@ -708,7 +688,6 @@ ErrorCodeEnum CardIssuerClassImpl::SetCardInType(CardInEnum eCardIn)
 	LOG4VTM(WARN, "<SetCardInType> - "
 					  << "SetCardInType Exit Count:" << FunSum);
 	FunSum++;
-	m_SetCardInTypeFlag = 2;
 	mtx.unlock();
 	return (ErrorCodeEnum)iRet;
 }

DevAdapter/nantian/cardissuer.1.1/cardissuer.nantian.1.1.h

@@ -196,15 +196,12 @@ public:
 	DevErrorInfo m_errorInfo;
 	bool  m_isDevOpened;
 	bool  m_isCanceled;
-
-	int   m_SetCardInTypeFlag;
 	
 	bool LoadNTDRVDLL();
 	
 
     std::mutex mtx;
     std::mutex statusMtx;
-	bool m_CardInTypeFlag;
 
 	ErrorCodeEnum m_StatusErrorCode;
 	CardIssuerStatus statusCache;

DevAdapter/nantian/idcer.1.1/idcertificate.nantian.1.1.cpp

@@ -1115,9 +1115,7 @@ void* thread( void *arg )
 				{
 					if (g_pGvar.TheardEnd == false)
 						break;
-					usleep(100000);
 				}
-			g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_INFO, "IDCerRFControl","while is end");
 				//查询设备状态
 			for(int i = 1; i <4; i++)
 			{