Quellcode durchsuchen

Z991239-5993 #comment feat: 去除无效注释

Signed-Off-By: commit-hook
刘文涛80174520 vor 8 Monaten
Ursprung
Commit
d02a9b2067

+ 0 - 9
Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -1204,15 +1204,6 @@ unsigned int CCardIssuerFSM::s10_on_event(FSMEvent* pEvt)
 		pEvt->SetHandled();
 		ret = pEvt->param1;
 		break;
-	//case USER_EVT_JS_ISSUE_FROM_SLOT_FINISHED:
-	//	{
-	//		pEvt->SetHandled();
-	//		ret = pEvt->param1;
-	//		if (ret == 2) {
-	//			setQuickSelfCheck();
-	//		}
-	//	}
-	//	break;
 	case USER_EVT_JS_ISSUE_FROM_BOX_FINISHED:
 		pEvt->SetHandled();
 		ret = pEvt->param1;

+ 0 - 10
Module/mod_cardissuerstore/CardIssuerFSM.h

@@ -1056,7 +1056,6 @@ public:
 		FSM_RULE_ENTRY(s2, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
 		FSM_RULE_ENTRY(s2, s10, USER_EVT_ISSUE_EX, 0)
 		FSM_RULE_ENTRY(s2, s17, USER_EVT_QUERYCARDINFO_ON_STORE, 0)
-
 		FSM_RULE_ENTRY(s2, s17, USER_EVT_JS_READ_BATCHCARDINFO_IN_RANGE, 0)//JS 区间盘库
 		FSM_RULE_ENTRY(s2, s19, USER_EVT_JS_PREONLINE_CROSS, 0)//JS 跨机激活
 		FSM_RULE_ENTRY(s2, s10, USER_EVT_JS_MOVE_AND_READ_CARD_FROMSLOT, 0)//JS 卡槽移卡读卡
@@ -1078,7 +1077,6 @@ public:
 		FSM_RULE_ENTRY(s4, s6, USER_EVT_ISSUE_EX_FINISHED, 6)
 		FSM_RULE_ENTRY(s4, s5, USER_EVT_PREONLINE, 0)
 		FSM_RULE_ENTRY(s4, s5, USER_EVT_POSTONLINE, 0)
-
 		FSM_RULE_ENTRY(s4, s6, USER_EVT_JS_EJECT, 0)//JS 吐卡
 		FSM_RULE_ENTRY(s4, s8, USER_EVT_JS_CAPTURE, 0)//JS 吞卡
 		FSM_RULE_ENTRY(s4, s10, USER_EVT_JS_MOVEBACK_TO_SLOT, 0)//JS 移回卡槽
@@ -1095,27 +1093,22 @@ 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_ANY(s5, s4, USER_EVT_JS_POSTONLINE_FINISHED)//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(s6,s7,USER_EVT_EJECTFINISHED,0)
 		FSM_RULE_ENTRY(s6,s9,USER_EVT_EJECTFINISHED,1)
 		FSM_RULE_ENTRY(s6, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-
 		FSM_RULE_ENTRY(s6, s2, USER_EVT_JS_EJECT_FINISHED, 0)//JS 吐卡且取卡成功,取卡超时吞卡成功
 		FSM_RULE_ENTRY(s6, s9, USER_EVT_JS_EJECT_FINISHED, 1)//JS 吐卡失败,取卡超时吞卡失败
-
 		FSM_RULE_ENTRY(s7,s2,USER_EVT_WAITFINISHED,0)
 		FSM_RULE_ENTRY(s7,s9,USER_EVT_WAITFINISHED,1)
 		FSM_RULE_ENTRY(s7,s8,USER_EVT_WAITFINISHED,2)
 		FSM_RULE_ENTRY(s7, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
 		FSM_RULE_ENTRY(s8,s2,USER_EVT_CAPTUREFINISHED,0)
 		FSM_RULE_ENTRY(s8,s9,USER_EVT_CAPTUREFINISHED,1)
-
 		FSM_RULE_ENTRY(s8, s2, USER_EVT_JS_CAPTURE_FINISHED, 0)//JS 
 		FSM_RULE_ENTRY(s8, s9, USER_EVT_JS_CAPTURE_FINISHED, 1)//JS 吞卡失败
-
 		FSM_RULE_ENTRY(s8, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
 		FSM_RULE_ENTRY(s9, s2, USER_EVT_RESETFINISHED, 0)
 		FSM_RULE_ENTRY(s9, s0, USER_EVT_RESETFINISHED, 2)
@@ -1127,7 +1120,6 @@ public:
 		FSM_RULE_ENTRY(s10, s6, USER_EVT_ISSUE_EX_FINISHED, 6)
 		FSM_RULE_ENTRY(s10, s2, USER_EVT_ISSUE_EX_FINISHED, 8)
 		FSM_RULE_ENTRY(s10, s2, USER_EVT_EXIT, 0)
-
 		FSM_RULE_ENTRY(s10, s4, USER_EVT_JS_MOVE_AND_READ_CARD_FROMSLOT_FINISHED, 0)//JS
 		FSM_RULE_ENTRY(s10, s2, USER_EVT_JS_MOVE_AND_READ_CARD_FROMSLOT_FINISHED, 1)//JS
 		FSM_RULE_ENTRY(s10, s4, USER_EVT_JS_ADD_AND_READ_CRAD_FROMBOX_FINISHED, 0)//JS
@@ -1140,7 +1132,6 @@ public:
 		FSM_RULE_ENTRY(s10, s2, USER_EVT_JS_MOVEBACK_TO_SLOT_FINISHED, 1)//JS
 		FSM_RULE_ENTRY(s10, s4, USER_EVT_JS_ISSUE_FROM_BOX_FINISHED, 0)//JS 
 		FSM_RULE_ENTRY(s10, s2, USER_EVT_JS_ISSUE_FROM_BOX_FINISHED, 1)//JS
-
 		FSM_RULE_ENTRY(s11,s4,USER_EVT_WRITE_FINISHED,0)
 		FSM_RULE_ENTRY(s11,s4,USER_EVT_WRITE_FINISHED,1)
 		FSM_RULE_ENTRY_ANY(s11, s4, USER_EVT_JS_WRITE_TRACK_FINISHED)//JS
@@ -1150,7 +1141,6 @@ public:
 		FSM_RULE_ENTRY(s17, s2, USER_EVT_QUERYCARDINFO_ON_STORE_FINISHED, 2)
 		FSM_RULE_ENTRY(s17, s2, USER_EVT_JS_READ_BATCHCARDINFO_IN_RANGE_FINISHED, 0)//JS 
 		FSM_RULE_ENTRY(s17, s4, USER_EVT_JS_READ_BATCHCARDINFO_IN_RANGE_FINISHED, 1)//JS 读卡,移卡失败
-		//FSM_RULE_ENTRY(s17, s9, USER_EVT_JS_READ_BATCHCARDINFO_IN_RANGE_FINISHED, 1)//JS 吞卡失败
 		FSM_RULE_ENTRY(s18, s4, USER_EVT_PRINT_CARD_IM_FINISHED, 0)
 		FSM_RULE_ENTRY_ANY(s18, s4, USER_EVT_JS_PRINT_CARD_FINISHED)//JS
 		FSM_RULE_ENTRY(s19, s2, USER_EVT_JS_PREONLINE_CROSS_FINISHED, 0)//JS