Z991239-1872 #comment 当前状态机状态的获取修改及xml文件更新到res目录

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -18,7 +18,6 @@ class CCardReadAdapterEntity;
 void CCardReadAdapterFSM::s0_on_entry()
 {
 	LOG_FUNCTION();
-	m_currFSM = 0;
 	CSystemStaticInfo sysInfo;
 
 	m_csMachineType = m_csSite = m_terminalNo = "";
@@ -87,7 +86,6 @@ unsigned int CCardReadAdapterFSM::s0_on_event(FSMEvent* pEvt)
 void CCardReadAdapterFSM::s1_on_entry()
 {
 	LOG_FUNCTION();
-	m_currFSM = 1;
 }
 void CCardReadAdapterFSM::s1_on_exit()
 {
@@ -111,7 +109,6 @@ unsigned int CCardReadAdapterFSM::s1_on_event(FSMEvent* pEvt)
 void CCardReadAdapterFSM::s2_on_entry()
 {
 	LOG_FUNCTION();
-	m_currFSM = 2;
 	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_IDLE);
 	Dbg("set reset times 0.");
 	m_resetTimes = 0;
@@ -487,7 +484,6 @@ unsigned int CCardReadAdapterFSM::s2_on_event(FSMEvent* pEvt)
 void CCardReadAdapterFSM::s3_on_entry()
 {
 	LOG_FUNCTION();
-	m_currFSM = 3;
 }
 void CCardReadAdapterFSM::s3_on_exit()
 {
@@ -629,7 +625,6 @@ unsigned int CCardReadAdapterFSM::s3_on_event(FSMEvent* pEvt)
 void CCardReadAdapterFSM::s4_on_entry()
 {
 	LOG_FUNCTION();
-	m_currFSM = 4;
 	m_lastS2Event = m_lastS2EvtParam1 = 0;
 	GetEntityBase()->GetFunction()->SetUserDefineState(USER_CARDISSUER_HOLD);
 }

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -870,7 +870,7 @@ public:
 	int PrintCardIm(SpReqAnsContext<CardReadAdapterService_PrintCardImmediately_Req, CardReadAdapterService_PrintCardImmediately_Ans>::Pointer ctx);
 	void QueryCurrFSMAndLastS2EventInfo(int &currFSM, int& event, int& param1)
 	{
-		currFSM = m_currFSM;
+		currFSM = GetCurrState()->id;
 		event = m_lastS2Event;
 		param1 = m_lastS2EvtParam1;
 	}
@@ -893,7 +893,7 @@ private:
 	int m_CardInWhere;
 	//m_lastModule:0~7
 	//0:all; 1:CardIssuer; 2:ContactlessCard; 4:CardSwiper
-	int m_lastModule,m_currFSM,m_lastS2Event, m_lastS2EvtParam1;
+	int m_lastModule,m_lastS2Event, m_lastS2EvtParam1;
 	//m_eMachineType: 0:unkown; 1:RVC.Stand2S; 2:RVC.PAD; 3:RVC.Wall; 4:RPM.Stand1S
 	MachineType m_eMachineType;
 	WORD m_majorVerion,m_minorVerion;

addin/res/StructConfig/CardIssuer.xml

@@ -394,6 +394,23 @@
 				<param name="reserved3" type="array_string"/>
 				<param name="reserved4" type="array_string"/>				
 			</res>			
+		</twoway>		
+		<twoway name="PrintCardImmediately" overlap="true">
+			<req>
+				<param name="formFile" type="string"/>
+				<param name="printData" type="string"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_int"/>
+				<param name="reserved3" type="array_string"/>
+				<param name="reserved4" type="array_string"/>
+			</req>
+			<res>
+				<param name="ret" type="int"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_int"/>
+				<param name="reserved3" type="array_string"/>
+				<param name="reserved4" type="array_string"/>				
+			</res>			
 		</twoway>															
 		<twoway name="GetDevInfo" overlap="true" method_id="65535">
 			<req>

addin/res/StructConfig/CardReadAdapter.xml

@@ -212,19 +212,6 @@
 				<param name="reserved2" type="string"/>
 			</res>			
 		</twoway>																													
-		<twoway name="GetDevInfo" overlap="true" method_id="65535">
-			<req>
-				<param name="module" type="int" />
-			</req>
-			<res>
-				<param name="ModuleNum" type="int" />
-				<param name="ModuleSN" type="array_int" />
-				<param name="type" type="array_string" />
-				<param name="model" type="array_string" />
-				<param name="version" type="array_string" />
-				<param name="state" type="array_int" />
-			</res>			
-		</twoway>
 		<twoway name="SAMICCommand" overlap="true">
 			<req>
 				<param name="module" type="int"/>
@@ -413,7 +400,79 @@
 				<param name="reserved1" type="array_int"/>
 				<param name="reserved2" type="array_string"/>
 			</res>			
+		</twoway>
+		<twoway name="CrossTermCall" overlap="true">
+			<req>
+				<param name="type" type="int"/>
+				<param name="fromTerminalNo" type="string"/>
+				<param name="toTerminalNo" type="string"/>
+				<param name="nEntityID" type="int"/>
+				<param name="param1" type="string"/>
+				<param name="param2" type="string"/>
+				<param name="param3" type="int"/>
+				<param name="param4" type="int"/>
+				<param name="paramX" type="blob"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_string"/>
+				<param name="reservedX" type="array_blob"/>					
+			</req>
+			<res>
+				<param name="retCode" type="int"/>
+				<param name="retParam1" type="string"/>
+				<param name="retParam2" type="string"/>
+				<param name="retParam3" type="int"/>
+				<param name="retParam4" type="int"/>
+				<param name="retParamX" type="blob"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_string"/>
+				<param name="reservedX" type="array_blob"/>
+			</res>				
+		</twoway>
+		<oneway name="CrossTermInvokeInfo" overlap="true">
+				<param name="type" type="int"/>
+				<param name="result" type="int"/>
+				<param name="fromTerminalNo" type="string"/>
+				<param name="toTerminalNo" type="string"/>
+				<param name="nEntityID" type="int"/>
+				<param name="param1" type="string"/>
+				<param name="param2" type="string"/>
+				<param name="param3" type="int"/>
+				<param name="param4" type="int"/>
+				<param name="paramX" type="blob"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_string"/>
+				<param name="reservedX" type="array_blob"/>	
+		</oneway>
+		<twoway name="PrintCardImmediately" overlap="true">
+			<req>
+				<param name="formFile" type="string"/>
+				<param name="printData" type="string"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_int"/>
+				<param name="reserved3" type="array_string"/>
+				<param name="reserved4" type="array_string"/>
+			</req>
+			<res>
+				<param name="ret" type="int"/>
+				<param name="reserved1" type="array_int"/>
+				<param name="reserved2" type="array_int"/>
+				<param name="reserved3" type="array_string"/>
+				<param name="reserved4" type="array_string"/>				
+			</res>			
 		</twoway>			
+		<twoway name="GetDevInfo" overlap="true" method_id="65535">
+			<req>
+				<param name="module" type="int" />
+			</req>
+			<res>
+				<param name="ModuleNum" type="int" />
+				<param name="ModuleSN" type="array_int" />
+				<param name="type" type="array_string" />
+				<param name="model" type="array_string" />
+				<param name="version" type="array_string" />
+				<param name="state" type="array_int" />
+			</res>			
+		</twoway>								
 	</class>
 
 		<message name="CardIsserFetchCard">