Z991239-6139 #comment feat: 修复发卡，读卡状态机跳转问题

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -743,6 +743,23 @@ unsigned int CCardIssuerFSM::s5_on_event(FSMEvent* pEvt)
 	int ret = 0;
 	switch(pEvt->iEvt)
 	{
+	case USER_EVT_JS_POSTONLINE_FINISHED:
+		{
+			pEvt->SetHandled();
+			ret = 0;
+		}
+		break;
+	case USER_EVT_JS_READ_FINISHED:
+		{
+			pEvt->SetHandled();
+			if (pEvt->param1 == 0) {
+				ret = 0;
+			}
+			else if (pEvt->param1 == 1) {
+				ret = 1;
+			}
+		}
+		break;
 	case USER_EVT_READ_FINISHED:
 		{
 			pEvt->SetHandled();
@@ -1135,6 +1152,10 @@ unsigned int CCardIssuerFSM::s10_on_event(FSMEvent* pEvt)
 	int ret = 0;
 	switch(pEvt->iEvt)
 	{
+	case USER_EVT_JS_ISSUE_FROM_BOX_FINISHED:
+		pEvt->SetHandled();
+		ret = pEvt->param1;
+		break;
 	case USER_EVT_ISSUE_FINISHED:
 		pEvt->SetHandled();
 		ret = pEvt->param1;

Module/mod_CardIssuerStand/CardIssuerFSM.h

@@ -883,7 +883,7 @@ public:
 		FSM_RULE_ENTRY(s5, s4, USER_EVT_EXIT, 0)
 		FSM_RULE_ENTRY(s5, s4, USER_EVT_PREONLINEFINISHED, 0)
 		FSM_RULE_ENTRY(s5, s4, USER_EVT_POSTONLINEFINISHED, 0)
-		FSM_RULE_ENTRY(s5, s4, USER_EVT_READ_FINISHED, 0)//JS 读卡结果返回
+		FSM_RULE_ENTRY(s5, s4, USER_EVT_JS_READ_FINISHED, 0)//JS 读卡结果返回
 		FSM_RULE_ENTRY(s5, s2, USER_EVT_JS_READ_FINISHED, 1)//JS 无卡
 		FSM_RULE_ENTRY(s5, s4, USER_EVT_JS_POSTONLINE_FINISHED, 0)//JS
 		FSM_RULE_ENTRY(s6,s7,USER_EVT_EJECTFINISHED,0)