Z991239-1475 #comment 更新nantian，grg源码

DevAdapter/CMakeLists.txt

@@ -135,8 +135,8 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 # ͨ¹ýconanµÄ·½Ê½¹ÜÀí³§ÉÌ¿â
 if(RVC_INTEGRATE_BUILD)
     set(KEBA_CONAN_LIB_NAME keba/2020.1231.01@LR04.02_VendorLib/testing)
-	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0104.01@LR04.02_VendorLib/testing)
-	set(GRG_CONAN_LIB_NAME grg/2020.1222.01@LR04.02_VendorLib/testing)
+	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0108.01@LR04.02_VendorLib/testing)
+	set(GRG_CONAN_LIB_NAME grg/2021.0111.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2020.1222.01@LR04.02_VendorLib/testing)
     set(GWI_CONAN_LIB_NAME gwi/2021.0104.01@LR04.02_VendorLib/testing)
 endif(RVC_INTEGRATE_BUILD)

DevAdapter/grg/CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(cmbsz C CXX)
+project(grg C CXX)
 
 set(CMAKE_COLOR_MAKEFILE ON)
 
-# VENDOR_CURRENT_{DEPS|INCLUDE|ASSET|LIB|BIN}_DIR 等定义已集成到该宏内
+ # VENDOR_CURRENT_{DEPS|INCLUDE|ASSET|LIB|BIN}_DIR 等定义已集成到该宏内
 rvc_define_dependen_dirs()
 
 # 遍历当前目录下带有CMakeLists.txt文件的文件夹

DevAdapter/grg/FingerPrint.1.1/CMakeLists.txt

@@ -16,7 +16,7 @@ rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 # ${MODULE_FULL_NAME} ĘÇ TAGET ĂűłĆŁŹÔÚ rvc_dev_config_library ÖĐś¨Ňĺ
 target_include_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_INCLUDE_DIR}")
-target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}")
+target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}/grg")
 
 target_link_libraries(${MODULE_FULL_NAME} grgFpDriverUSB_FGB dl ${VENDOR_LOG_LIB_NAME})
 

DevAdapter/grg/cardissuer.1.1/CMakeLists.txt

@@ -13,7 +13,7 @@ rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 # ${MODULE_FULL_NAME} 是 TAGET 名称，在 rvc_dev_config_library 中定义
 target_include_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_INCLUDE_DIR}")
-target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}")
+target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}/grg")
 
 target_link_libraries(${MODULE_FULL_NAME} grgACTIDCDev dl ${VENDOR_LOG_LIB_NAME})
 

DevAdapter/grg/cardissuer.1.1/cardissuer_impl.cpp

@@ -231,6 +231,10 @@ ErrorCodeEnum CardIssuerClassImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
 	}
 	
 
+
+
+
+
 	if(!m_bDevIsOpen)
 	{
 		return Error_DevConnFailed;
@@ -751,13 +755,20 @@ ErrorCodeEnum CardIssuerClassImpl::MoveCard(CardPosEnum eCardPos, int hopperNo =
 	case CI_MOVECARD_BACK_NOT_HOLD://capture to retain bin //吞卡
 
 		//判断吞卡箱是否已满  
-		//if (l_tIDCStatusInfoEx.byRetainBox == 3)//回收箱已满
-		if (l_tIDCStatusInfoEx.abyRetainUnit[1] == 3)//回收箱已满
+		if (l_tIDCStatusInfoEx.byRetainBox == 3)//回收箱已满
 		{
 			LOG4VTM(INFO,"enter MoveCard : 回收箱已满!!");
 			l_iResult = Error_Hardware;
 
 
+		}
+		else if (l_tIDCStatusInfoEx.abyRetainUnit[0]==0)//回收箱已满或没有回收箱
+		{
+			LOG4VTM(INFO,"enter MoveCard : 回收箱no start!!");
+
+			l_iResult = Error_Hardware;
+			
+
 		}
 		else
 		{

DevAdapter/grg/idcer.1.1/CMakeLists.txt

@@ -10,7 +10,7 @@ set(${MODULE_PREFIX}_SRCS SHARED
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 target_include_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_INCLUDE_DIR}")
-target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}")
+target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}/grg")
 
 target_link_libraries(${MODULE_FULL_NAME}  grgGRGIDRCHKDev ${VENDOR_LOG_LIB_NAME})
 #target_link_libraries(${MODULE_FULL_NAME} GRGIDRCHKDev)

DevAdapter/grg/idcer.1.1/idcer_impl.cpp

@@ -329,12 +329,13 @@ ErrorCodeEnum IDCerClassImpl::IDCerAuthenticate()
 		)
 	{
 		//in
+		LOG4VTM(INFO,__FUNCTION__<<" in");
 
 	}
 	else if (dev.iStatusInputSensorHaveCard == 1)
 	{
 		//out
-
+		LOG4VTM(INFO,__FUNCTION__<<" out");
 	}
 	else
 	{
@@ -769,15 +770,17 @@ ErrorCodeEnum IDCerClassImpl::QueryCardPos(int &pos)
 		return Error_Unexpect;
 	}
 	pos = 0;
-	if (DevStatusEx.iStatusInputSensorHaveCard > 0) {
-		pos = 2;
-	}
-	else if (DevStatusEx.iStatusMiddleSensorHaveCard > 0 ||
+
+	if (DevStatusEx.iStatusMiddleSensorHaveCard > 0 ||
 		DevStatusEx.iStatusScanSensorHaveCard > 0 ||
 		DevStatusEx.iStatusCardJam > 0)
 	{
 		pos = 1;
+	}else if (DevStatusEx.iStatusInputSensorHaveCard > 0)
+	{
+		pos = 2;
 	}
+	LOG4VTM(INFO,__FUNCTION__<<" pos = "<<pos);
 	LOG4VTM(INFO,__FUNCTION__<<" OK");
 	return Error_Succeed;
 }

DevAdapter/grg/pinpad.1.1/CMakeLists.txt

@@ -26,7 +26,7 @@ rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 #target_link_libraries(${MODULE_FULL_NAME} EPPDevDll ${VENDOR_LOG_LIB_NAME})
 
 target_include_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_INCLUDE_DIR}")
-target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}")
+target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}/grg")
 
 #target_link_libraries(${MODULE_FULL_NAME} EPPDevDll log4vendor)
 target_link_libraries(${MODULE_FULL_NAME} grgEPPDevDll ${VENDOR_LOG_LIB_NAME})

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

@@ -320,7 +320,7 @@ ErrorCodeEnum IDCardReaderNantian::DevOpen(DWORD dwPort)
 			LOG4VTM(ERROR, "<IDCerAuthenticate> - "<<"NO Card In device");
             g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_ERROR, "IDCerAuthenticate",
 				"卡未插入");
-            throw Error_DevMedia;
+            throw Error_Unexpect;
         }
       
 		for (int i = 0; i < MIN_LEN; i++)
@@ -345,28 +345,26 @@ ErrorCodeEnum IDCardReaderNantian::DevOpen(DWORD dwPort)
 			{
 				if (atoi(sDevStatus[2]) == IDCARDREADER_MEDIAPRESENT)
 				{
-					//第2个传感器（读卡位置）检测有卡
-					//读卡
-					/*for (size_t i = 0; i < MID_LEN; i++)
+					LOG4VTM(WARN, "<IDCerAuthenticate> - "<<"Card present");
+					
+					g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_INFO, "IDCerAuthenticate",
+							"卡在卡机内部");
+					for (size_t i = 0; i < MID_LEN; i++)
 					{
 						sIDXData[i] = new char[MAX_LEN];
 						memset(sIDXData[i], 0, MAX_LEN);
-					}
-					g_pGvar.ReadFlg = true;
+					}			
 					iRet = g_pGvar.m_pDRVObj->ReadIDXData(sIDXData);
 					if (iRet != E_DRVBASE_SUCCESS)
 					{
-						g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_ERROR, "IDCerAuthenticate",
-							"ReadIDXData error,return:%d", iRet);
+						LOG4VTM(ERROR, "<IDCerAuthenticate> - "<<"ReadIDXData error");
+						g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_ERROR, "IDCerGetDataEx",
+							"ReadAllIDInfo error,return:%d", iRet);
 						memset(g_pGvar.m_errMsg, 0, MAX_LEN);
 						sprintf(g_pGvar.m_errMsg, "read card error, code:%d", iRet);
-						throw Error_DevMedia;*/
-						LOG4VTM(WARN, "<IDCerAuthenticate> - "<<"Card present");
-						g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_INFO, "IDCerAuthenticate",
-							"卡在卡机内部");
-						throw Error_Succeed;
-					
-					
+						throw Error_DevMedia;
+					}
+					throw Error_Succeed;	
 				}
 				else
 				{
@@ -445,8 +443,7 @@ ErrorCodeEnum IDCardReaderNantian::DevOpen(DWORD dwPort)
 				throw Error_DevMedia;
 			}
 		}
-				
-   
+				 
 		for (size_t i = 0; i < MID_LEN; i++)
 		{
 			sIDXData[i] = new char[MAX_LEN];