Z991239-6139 #comment feat: 完善吐卡和吞卡js接口跳转

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -368,6 +368,15 @@ unsigned int CCardIssuerFSM::s2_on_event(FSMEvent* pEvt)
 		pEvt->SetHandled();
 	}
 		break;
+	case USER_EVT_JS_CAPTURE:
+	{
+		CaptureJSEvent* cje = dynamic_cast<CaptureJSEvent*>(pEvt);
+		CaptureJSTask* task = new CaptureJSTask(this);
+		task->ctx = cje->ctx;
+		GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
+		pEvt->SetHandled();
+	}
+		break;
 	default:
 		break;
 	}
@@ -423,7 +432,11 @@ unsigned int CCardIssuerFSM::s3_on_event(FSMEvent* pEvt)
 	case USER_EVT_JS_INSERT_FINISHED:
 		{
 			ret = pEvt->param1;
-			if (ret == 4) {
+			if (ret == 1) {
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("插卡时查询设备状态故障");
+				setQuickSelfCheck();
+			}
+			else if (ret == 4) {
 				//吐卡
 				EjectJSEvent* eje = dynamic_cast<EjectJSEvent*>(pEvt);
 				EjectJSTask* task = new EjectJSTask(this);
@@ -1197,8 +1210,10 @@ unsigned int CCardIssuerFSM::s10_on_event(FSMEvent* pEvt)
 	switch(pEvt->iEvt)
 	{
 	case USER_EVT_JS_ISSUE_FROM_BOX_FINISHED:
-		pEvt->SetHandled();
-		ret = pEvt->param1;
+		{
+			pEvt->SetHandled();
+			ret = pEvt->param1;
+		}
 		break;
 	case USER_EVT_EXIT_MIAN_PAGE:
 		pEvt->SetHandled();
@@ -5625,7 +5640,7 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStandService_CaptureJS_R
 			if (ctx != NULL) {
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader, m_currCardNo=%s", maskCardno.GetData());
 				LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_Capture_NoCard_Failed, "Capture card, No card found in cardReader");
-				ctx->Answer(Error_Exception, CardIssuer_UserErrorCode_Capture_NoCard_Failed);//读卡器无卡
+				ctx->Answer(Error_Unexpect, CardIssuer_UserErrorCode_Capture_NoCard_Failed);//读卡器无卡
 			}
 			else {
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader");

Module/mod_CardIssuerStand/CardIssuerFSM.h

@@ -847,6 +847,7 @@ public:
 		FSM_RULE_ENTRY(s2, s10, USER_EVT_ISSUE_EX, 0)
 		FSM_RULE_ENTRY(s2, s3, USER_EVT_JS_INSERT, 0)//JS 插卡
 		FSM_RULE_ENTRY(s2, s10, USER_EVT_JS_ISSUE_FROM_BOX, 0)//JS 卡箱发卡
+		FSM_RULE_ENTRY(s2, s8, USER_EVT_JS_CAPTURE, 0)//JS 吞卡
 		FSM_RULE_ENTRY(s3,s4,USER_EVT_ACCEPTFINISHED,0)
 		FSM_RULE_ENTRY(s3,s9,USER_EVT_ACCEPTFINISHED,1)
 		FSM_RULE_ENTRY(s3,s2,USER_EVT_ACCEPTFINISHED,2)