Z991239-5580 #comment feat: 身份证getDevinfo字段功能校正“2、打开成功。GetDevInfo返回Error_Succeed，state放获取模块信息（GetDevCategory这个适配器接口调用）的返回值”

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -1899,6 +1899,9 @@ ErrorCodeEnum CIDCertFSM::DeleteFileIfExisted(LPCTSTR fileName)
 
 ErrorCodeEnum CIDCertFSM::GetDevCatInfo(DevCategoryInfo &devInfo, CSimpleStringA& devType)
 {
+	if (m_getDevCategory != Error_Succeed)
+		return m_getDevCategory;
+
 #ifdef RVC_OS_LINUX
 	LOG_FUNCTION();
 	strncpy(devInfo.szModel, m_devCatInfo.szModel, (MAX_DEV_MODEL_LEN > strlen(m_devCatInfo.szModel)) ? strlen(m_devCatInfo.szModel) + 1 : MAX_DEV_MODEL_LEN);
@@ -2057,6 +2060,7 @@ int CIDCertFSM::Initial() //windows ver
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 	eErrDev = m_hDevHelper->GetDevCategory(m_devCatInfo);
 	m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+	m_getDevCategory = err; //获取设备信息的api执行结果
 	if (eErrDev == Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevCategory").setCostTime(m_ullEndTime - m_ullBeginTime)
@@ -2209,6 +2213,7 @@ int CIDCertFSM::Initial() //linux ver
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 	err = m_hDevHelper->GetDevCategory(m_devCatInfo);
 	m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+	m_getDevCategory = err; //获取设备信息的api执行结果
 	if (err == Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevCategory").setCostTime(m_ullEndTime - m_ullBeginTime)

Module/mod_IDCertificate/IDCertFSM.h

@@ -223,7 +223,7 @@ public:
 
 #ifdef RVC_OS_LINUX
 		CIDCertFSM() :m_devInit(false), m_bCancelRead(false), m_bReading(false), m_bWaitReadMore(false),
-		m_bExit(false), m_testResult(Error_Succeed), m_csMachineType(""), m_csSite(""), m_terminalNo(""), m_devSN("")
+		m_bExit(false), m_testResult(Error_Succeed), m_getDevCategory(Error_Unexpect),m_csMachineType(""), m_csSite(""), m_terminalNo(""), m_devSN("")
 		, m_devVendor(""), m_devVer(""), m_devBatch(""){
 		HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x201);
 		m_FirstStart = TRUE;
@@ -231,7 +231,7 @@ public:
 	};
 #else
 		CIDCertFSM():m_bCancelRead(false),m_bReading(false),m_bWaitReadMore(false),
-	m_bExit(false),m_testResult(Error_Succeed), m_csMachineType(""), m_csSite(""), m_terminalNo("")
+	m_bExit(false),m_testResult(Error_Succeed), m_getDevCategory(Error_Unexpect), m_csMachineType(""), m_csSite(""), m_terminalNo("")
 	,m_devVendor(""), m_devVer(""), m_devBatch(""), invalidBreak(false), m_logBefore(false), transImgMsg("")
 	{
 		HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x201);
@@ -330,6 +330,7 @@ private:
 #endif
 	bool m_bCancelRead, m_bReading, m_bWaitReadMore, m_bExit;
 	ErrorCodeEnum m_testResult;
+	ErrorCodeEnum m_getDevCategory;
 	DevCategoryInfo m_devCatInfo;
 	DevStateEnum m_devState;
 	CSimpleStringA m_csMachineType, m_csSite, m_terminalNo;