Z991239-2539 #comment fix: 修改授权时超时时间

Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

@@ -149,7 +149,7 @@ unsigned int CCustMngrAuthFSM::s2_on_event(FSMEvent* pEvt)
 			this->PostEventFIFO(e);
 			break;
 		}
-		m_TimeLimit = (queryEvt->ctx->Req.TimeLimit - 3) * 1000;
+		m_TimeLimit = (queryEvt->ctx->Req.TimeLimit - 2) * 1000;
 
 		ErrorCodeEnum eErr;
 		m_bCancelAuthorize = false;

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -16,6 +16,7 @@
 using namespace SP::Module::Comm;
 
 #define FINGERPRINT_SCAN_TIMEOUT 15000
+#define GET_FINGERPRINT_TIMEOUT	 (27*1000)
 #define FINGERPRINT_SCAN_INTERNAL 100
 #define FINGERPRINT_MATCH_TIMEOUT 15000
 #define MAX_FEATURE_LEN 1024
@@ -879,8 +880,8 @@ void CFingerPrintFSM::CollectProcess(ScanParam* pScanParam, SpReqAnsContext<Fing
 	pScanParam->m_FullFilePath = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "%s", pScanParam->m_DepPath.GetData(), fileName.GetData());
 	Dbg("<GetFingerPrint> imageName = %s", fileName.GetData());
 
-	while (pScanParam->m_TimeLeft < FINGERPRINT_SCAN_TIMEOUT
-		&& !m_bCancelRegister && !pScanParam->m_bGetFingerPrintSuc)
+	while (pScanParam->m_TimeLeft < GET_FINGERPRINT_TIMEOUT
+		&& !m_bCancelRegister && !m_bCancelMatch && !pScanParam->m_bGetFingerPrintSuc)
 	{
 		if (m_bExit)
 		{
@@ -957,8 +958,9 @@ void CFingerPrintFSM::ProcessAfterCollect(ScanParam* pScanParam, SpReqAnsContext
 		ctx->Ans.reserved1[0] = 2;
 		ctx->Answer(Error_Succeed);
 	}
-	else if (m_bCancelRegister) {
+	else if (m_bCancelRegister || m_bCancelMatch) {
 		m_bCancelRegister = false;
+		m_bCancelMatch = false;
 		ctx->Ans.reserved1[0] = 3;
 		ctx->Answer(Error_Succeed);
 	}