Z991239-4486 #comment 完善MatchFingerPrintEx异常处理

Signed-Off-By: commit-hook

Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

@@ -1000,6 +1000,7 @@ ErrorCodeEnum CCustMngrAuthFSM::MatchFingerPrintEx(SpReqAnsContext<CustMngrAuthS
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("GetFingerPrint").setBeginTime(l_beginTime).setEndTime(l_endTime)("MatchFingerPrintEx invoke GetFingerPrint return %s", SpStrError(errCode));
 
 	if (errCode == Error_DevNotAvailable) {
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("FingerPrintEntity DevOpen failed");
 		return errCode;
 	}
 
@@ -1009,6 +1010,12 @@ ErrorCodeEnum CCustMngrAuthFSM::MatchFingerPrintEx(SpReqAnsContext<CustMngrAuthS
 		return Error_DevNotAvailable;
 	}
 
+	if (errCode == Error_Cancel)
+	{
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("FingerPrintEntity is canceled while match before");
+		return Error_Cancel;
+	}
+
 	bStopAuthorize = true;
 	if (m_bCancelAuthorize || GetFingerAns.reserved1[0] == 3) {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetFingerPrint is canceled while match, m_bAuthorizeTimeout:%d", m_bAuthorizeTimeout);

Module/mod_CustMngrAuth/CustMngrAuthFSM.h

@@ -489,8 +489,8 @@ public:
 		FSM_STATE_ENTRY(s0, "Init", s0_on_entry, s0_on_exit, s0_on_event)
 		FSM_STATE_ENTRY(s1, "Initializing", s1_on_entry, s1_on_exit, s1_on_event)
 		FSM_STATE_ENTRY(s2, "Idle", s2_on_entry, s2_on_exit, s2_on_event)
-		FSM_STATE_ENTRY(s3, "Authorizing", s3_on_entry, s3_on_exit, s3_on_event)
-		FSM_STATE_ENTRY(s4, "Registering", s4_on_entry, s4_on_exit, s4_on_event)
+		FSM_STATE_ENTRY(s3, "Authorizing", s3_on_entry, s3_on_exit, s3_on_event)//QUERYAUTHORINFO请求进入
+		FSM_STATE_ENTRY(s4, "Registering", s4_on_entry, s4_on_exit, s4_on_event)//GENERATE_TEMPLATE，CollectFingerPrintInfo请求进入
 		FSM_STATE_ENTRY(s5, "Failed", s5_on_entry, s5_on_exit, s5_on_event)
 	END_FSM_STATE()
 

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -875,7 +875,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹扫描失败,在扫描前,扫描已取消");
 		//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2412")("指纹扫描失败,扫描已取消");
 		ctx->Ans.reserved1[0] = 3;
-		ctx->Answer(Error_Succeed);
+		ctx->Answer(Error_Cancel);
 		return 0;
 
 		//ctx->Answer(Error_Cancel);