#IQRV #comment [Vendor] grg/2021.0528.01

DevAdapter/CMakeLists.txt

@@ -141,7 +141,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 if(DEVADAPTER_USING_CONAN)
     set(KEBA_CONAN_LIB_NAME keba/2021.0520.01@LR04.02_VendorLib/testing)
 	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0519.01@LR04.02_VendorLib/testing)
-	set(GRG_CONAN_LIB_NAME grg/2021.0519.01@LR04.02_VendorLib/testing)
+	set(GRG_CONAN_LIB_NAME grg/2021.0528.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2021.0527.01@LR04.02_VendorLib/testing)
     set(GWI_CONAN_LIB_NAME gwi/2021.0402.01@LR04.02_VendorLib/testing)
 endif(DEVADAPTER_USING_CONAN)

DevAdapter/grg/cardissuer.1.1/cardissuer_impl.cpp

@@ -15,7 +15,6 @@ CardIssuerClassImpl::CardIssuerClassImpl()
         :m_mode(0)
 {
 
-	LOG4VTM(INFO,"Enter CardIssuer::Constructor::location1");
 	m_pCardIssuerDev = new OACTIDCDev("ACTIDCDev");
 	m_ptIDCVersionInfo	= new tIDCVersionInfo;
 	m_bDevIsOpen		= false;
@@ -25,7 +24,6 @@ CardIssuerClassImpl::CardIssuerClassImpl()
 	m_bcapSucc = false;
 
 	memset(&m_cap,0,sizeof(m_cap));
-	LOG4VTM(INFO,"Enter CardIssuer::Constructor::location2");
 }
 
 CardIssuerClassImpl::~CardIssuerClassImpl()
@@ -35,7 +33,7 @@ CardIssuerClassImpl::~CardIssuerClassImpl()
 
 ErrorCodeEnum CardIssuerClassImpl::GetDevCategory(DevCategoryInfo &devCategory)
 {
-
+    
 	//设备初始化失败
 	if(m_pCardIssuerDev == NULL) 
 	{
@@ -140,6 +138,8 @@ ErrorCodeEnum CardIssuerClassImpl::GetDevCategory(DevCategoryInfo &devCategory)
 
 ErrorCodeEnum CardIssuerClassImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
 {
+    int log = 0;
+    TRACE4VTM_FUNCTION(&log);
 	LOG4VTM(INFO,"Enter CardIssuer::DevOpen: Begin");
 	//打开通讯
 	int tryCnt =0;
@@ -245,7 +245,8 @@ ErrorCodeEnum CardIssuerClassImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
 
 ErrorCodeEnum CardIssuerClassImpl::DevOpenEx(DWORD dwPort, DWORD dwBaudRate, BYTE btOpenType, const char *pDevSN, BYTE &btType)
 {
-	LOG4VTM(INFO,"Enter CardIssuer::DevOpenEx: Begin");
+    int log = 0;
+	TRACE4VTM_FUNCTION(&log);
 	//打开通讯
 	btType = 2;
 	int tryCnt =0;
@@ -277,7 +278,6 @@ ErrorCodeEnum CardIssuerClassImpl::DevOpenEx(DWORD dwPort, DWORD dwBaudRate, BYT
 		
 	}
 	
-	LOG4VTM(INFO,"Enter CardIssuer::DevOpenEx:location1");
 	//打开设备，设备初始化，如果设备内有卡，吞卡操作
 	tryCnt =0;
 	bl = false;
@@ -351,7 +351,8 @@ ErrorCodeEnum CardIssuerClassImpl::DevOpenEx(DWORD dwPort, DWORD dwBaudRate, BYT
 
 ErrorCodeEnum CardIssuerClassImpl::GetDevStatus(CardIssuerStatus &devStatus)
 {
-
+    int log = 0;
+    TRACE4VTM_FUNCTION(&log);
 	int l_iResult = FAIL;
 	bool blCardIssuerDev = false;
 
@@ -562,7 +563,8 @@ ErrorCodeEnum CardIssuerClassImpl::GetDevStatus(CardIssuerStatus &devStatus)
 ErrorCodeEnum CardIssuerClassImpl::GetDeviceSN(char *&pDevSN)
 {
 	//m_log.info(_T("Enter GetDeviceSN()"));
-
+    int log = 0;
+    TRACE4VTM_FUNCTION(&log);
 	//设备初始化失败
 	if(m_pCardIssuerDev == NULL) 
 	{
@@ -606,7 +608,8 @@ ErrorCodeEnum CardIssuerClassImpl::GetDeviceSN(char *&pDevSN)
 //
 ErrorCodeEnum CardIssuerClassImpl::MoveCard(CardPosEnum eCardPos, int hopperNo = 1)
 {
-
+   int log = 0;
+    TRACE4VTM_FUNCTION(&log);
 	CardPosEnum eCardPoss = eCardPos;
 	int hopperNoo = hopperNo;
 
@@ -984,7 +987,8 @@ ErrorCodeEnum CardIssuerClassImpl::MoveCard(CardPosEnum eCardPos, int hopperNo =
 
 ErrorCodeEnum CardIssuerClassImpl::SetCardInType(CardInEnum eCardIn)
 {
-
+   int log = 0;
+    TRACE4VTM_FUNCTION(&log);
 	int l_iResult = FAIL;
 	bool blCardIssuerDev = false;
 
@@ -1118,7 +1122,8 @@ ErrorCodeEnum CardIssuerClassImpl::SetCardInType(CardInEnum eCardIn)
 
 ErrorCodeEnum CardIssuerClassImpl::MagRead(MagTracks &magTracks)
 {
-
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	int l_iResult = FAIL;
 	bool blCardIssuerDev = false;
 
@@ -1345,6 +1350,8 @@ ErrorCodeEnum CardIssuerClassImpl::MagWrite(MagTracks magTracks, MagWriteModeEnu
 {
 
 
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	int l_iResult = FAIL;
 	bool blCardIssuerDev = false;
 
@@ -1666,6 +1673,8 @@ ErrorCodeEnum CardIssuerClassImpl::SetRetractCounter(DWORD dwCount)
 {
 	//m_log.info(_T("Enter SetRetractCounter() dwCount=[%d]"),dwCount);
 
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	//设备初始化失败
 	if(m_pCardIssuerDev == NULL)
 	{
@@ -1688,6 +1697,8 @@ ErrorCodeEnum CardIssuerClassImpl::SetRetractCounter(DWORD dwCount)
 ErrorCodeEnum CardIssuerClassImpl::SetIssuerCounter(DWORD dwCount, int hopperNo = 1)
 {
 
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	//m_log.info(_T("Enter SetIssuerCounter() dwCount=[%d] hopperNo=[%d]"),dwCount,hopperNo);
 
 	//设备初始化失败
@@ -1716,6 +1727,8 @@ ErrorCodeEnum CardIssuerClassImpl::SetIssuerCounter(DWORD dwCount, int hopperNo
 ErrorCodeEnum CardIssuerClassImpl::ActiveICCard()
 {
 
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	int l_iResult = -1;
 	bool blCardIssuerDev = false;
 
@@ -1781,6 +1794,9 @@ ErrorCodeEnum CardIssuerClassImpl::ActiveICCard()
 
 ErrorCodeEnum CardIssuerClassImpl::ContactIC()
 {
+
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	//m_log.info(_T("Enter ContactIC()"));
 	//设备初始化失败
 	if(m_pCardIssuerDev == NULL) {
@@ -1802,6 +1818,9 @@ ErrorCodeEnum CardIssuerClassImpl::ContactIC()
 
 ErrorCodeEnum CardIssuerClassImpl::ReleaseIC()
 {
+
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	////m_log.info(_T("Enter ReleaseIC()"));
 	////设备初始化失败
 	//if(m_pCardIssuerDev == NULL) {
@@ -1880,6 +1899,9 @@ ErrorCodeEnum CardIssuerClassImpl::ReleaseIC()
 
 ErrorCodeEnum CardIssuerClassImpl::WarmReset()
 {
+
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	//m_log.info(_T("Enter WarmReset()"));
 	//设备初始化失败
 	if(m_pCardIssuerDev == NULL) {
@@ -1913,7 +1935,9 @@ ErrorCodeEnum CardIssuerClassImpl::WarmReset()
 
 ErrorCodeEnum CardIssuerClassImpl::ICCommand(CmdInfo sendBuf, CmdInfo &recvBuf)
 {
-
+    
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
 	//PAPCReturn	pAPCRet = NULL;
 	//pAPCRet = (PAPCReturn)dwPARAM;
 	//OCardIssuer *p_OCardIssuer = (OCardIssuer*)(pAPCRet->m_Object);
@@ -2001,6 +2025,9 @@ ErrorCodeEnum CardIssuerClassImpl::ICCommand(CmdInfo sendBuf, CmdInfo &recvBuf)
 
 ErrorCodeEnum CardIssuerClassImpl::Reset()
 {
+
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
     ErrorCodeEnum err = Error_Succeed;
     m_mode = 0;
     return err;
@@ -2008,12 +2035,18 @@ ErrorCodeEnum CardIssuerClassImpl::Reset()
 
 ErrorCodeEnum CardIssuerClassImpl::DevClose()
 {
+
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
     ErrorCodeEnum err = Error_Succeed;
     return err;
 }
 
 ErrorCodeEnum CardIssuerClassImpl::GetLastErr(DevErrorInfo &devErrInfo)
 {
+
+   int log = 0;
+   TRACE4VTM_FUNCTION(&log);
     static int times = 0;
     char szMessage[128];
     sprintf(szMessage, "this is the %d times error message", ++times);

DevAdapter/grg/contactlesscard.1.1/contactless_impl.cpp

@@ -159,6 +159,18 @@ ErrorCodeEnum ContactlessCardImpl::GetDevStatus(RFICReaderStatus &devStatus)
 
 	if(l_srStatusInfo.byMedia == 4)
 	{
+		//bhj 确认有卡后发送蜂鸣器操作指令
+		tDevReturn tReturnInfo;
+		memset(&tReturnInfo, 0, sizeof(tReturnInfo));
+		int BeepResult = m_pCardRFIDCDev->iConfig(C_SPEAKER_SETTING,0x00010011,&tReturnInfo);
+		if(BeepResult!=0)
+		{
+			LOG4VTM(INFO,"iConfig:Error");
+		}else
+		{
+			LOG4VTM(INFO,"iConfig:Success");
+		}
+
 		if(l_srStatusInfo.byICType =='A')
 		{
 			devStatus.eMediaPos = CI_MEDIA_RF;
@@ -516,22 +528,10 @@ ErrorCodeEnum ContactlessCardImpl::RFTypeABCommand(CmdInfo sendBuf,CmdInfo &recv
 	
 		recvBuf.dwSize = 0;
 		memset(&recvBuf,0,sizeof(recvBuf));
-	
-		
 		return Error_DevCommFailed;
 	}else
 	{
-		//bhj 卡交互成功以后，发送蜂鸣器操作指令
-		tDevReturn tReturnInfo;
-		memset(&tReturnInfo, 0, sizeof(tReturnInfo));
-		int BeepResult = m_pCardRFIDCDev->iConfig(C_SPEAKER_SETTING,0x00010011,&tReturnInfo);
-		if(BeepResult!=0)
-		{
-			LOG4VTM(INFO,"iConfig:Error");
-		}else
-		{
-			LOG4VTM(INFO,"iConfig:Success");
-		}
+		
 	}
 	recvBuf.dwSize = l_uiDataLen;
 	memcpy(recvBuf.data,l_acData,l_uiDataLen);