Z991239-5596 #comment feat: 身份证、密码键盘配置错时的标志设置

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -1998,6 +1998,7 @@ int CIDCertFSM::Initial() //windows ver
 	if (eErrDev != Error_Succeed) {
 		LogWarn(Severity_Middle, eErrDev, IDCertificate_UserErrorCode_Open_RootCfg_Failed, "open cfg file failed!");
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("open cfg file failed!");
+		m_bOpening = false;
 		return 2;
 	}
 
@@ -2005,6 +2006,7 @@ int CIDCertFSM::Initial() //windows ver
 	eErrDev = pEntity->LoadVendorLibName();
 	if (eErrDev != Error_Succeed) {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("get vendor dll(%s)name failed.", pEntity->GetVendorLibName().GetData());
+		m_bOpening = false;
 		return 2;
 	}
 
@@ -2024,6 +2026,7 @@ int CIDCertFSM::Initial() //windows ver
 	if (!IS_SUCCEED(eErrDev)) {
 		LogWarn(Severity_Middle, Error_Unexpect, IDCertificate_UserErrorCode_DllLoadFailed, 
 			CSimpleStringA::Format("身份证加载厂商适配器失败！GLE=%d.", GetLastError()).GetData());
+		m_bOpening = false;
 		return 2;
 	}
 

Module/mod_pinpad/PinPadFSM.cpp

@@ -328,6 +328,7 @@ int CPinPadFSM::Initial()
 	{
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("SpGetDevAdaptorPath(%d) failed.", eErrDev);
 		LogWarn(Severity_Middle, eErrDev, PinPad_UserErrorCode_Get_DevAdapter_Path_Failed, "Initial:SpGetDevAdaptorPath");
+		m_bOpening = false;
 		return Error_DevLoadFileFailed;
 	}
 	FulfillAdapterInfoFrom(pEntity->vendorLibInfo);
@@ -342,6 +343,7 @@ int CPinPadFSM::Initial()
 	if (!IS_SUCCEED(eErrDev))
 	{
 		LogWarn(Severity_Middle, Error_NotInit, PinPad_UserErrorCode_Load_Dll_File_Failed, "密码键盘加载厂商适配器失败！请检查root.ini配置是否正确。");
+		m_bOpening = false;
 		return Error_DevLoadFileFailed;
 	}
 	else {
@@ -376,6 +378,7 @@ int CPinPadFSM::Initial()
 					SetErrorAndLog(errCode3, MEC_DEVAPI_EPP_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), m_ullEndTime - m_ullBeginTime);
 				if (errCode4 != Error_Succeed)
 					SetErrorAndLog(errCode4, MEC_DEVAPI_EPP_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), m_ullEndTime - m_ullBeginTime);
+				m_bOpening = false;
 				return 1;
 			}
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetParam").setCostTime(m_ullEndTime - m_ullBeginTime)();