Selaa lähdekoodia

Z991239-5580 #comment feat: 身份证初始化状态标识

陈纪林80310970 1 vuosi sitten
vanhempi
sitoutus
189dde0faa

+ 2 - 0
Module/mod_IDCertificate/IDCertFSM.cpp

@@ -2031,6 +2031,7 @@ int CIDCertFSM::Initial() //windows ver
 	m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 	err = m_hDevHelper->DevOpen(m_adapterInfo.GetPortInt());
 	m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+	m_bOpening = false;
 	if (err == Error_Succeed)
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpen").setCostTime(m_ullEndTime - m_ullBeginTime)
@@ -2168,6 +2169,7 @@ int CIDCertFSM::Initial() //linux ver
 		m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 		err = m_hDevHelper->DevOpen(tmpPort);
 		m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
+		m_bOpening = false;
 		if (err == Error_Succeed)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpen").setCostTime(m_ullEndTime - m_ullBeginTime)

+ 5 - 2
Module/mod_IDCertificate/mod_IDCertificate.h

@@ -133,10 +133,13 @@ public:
 
 	void GetDevInfo(SpReqAnsContext<IDCert_GetDevInfo_Req, IDCert_GetDevInfo_Ans>::Pointer ctx)
 	{
-		if (!m_fsm.GetDevInitFlag())
+		if (m_fsm.m_bOpening)
+		{
+			ctx->Answer(Error_NotInit);
+		}
+		else if(!m_fsm.GetDevInitFlag())
 		{
 			ctx->Answer(Error_DevNotAvailable, IDCertificate_UserErrorCode_DevOpenFailed);
-
 			return;
 		}
 		else