Z991239-5948 #comment m_csCM移除

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -5153,7 +5153,6 @@ int CCardIssuerFSM::SplitDevModelInfo()
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SplitDevModelInfo>, Wrong szModel:%s", m_devCat.szModel);
 		return -1;
 	}
-	m_csCM = "";
 	m_csRF = "";
 	CSimpleStringA csTmpModel(m_devCat.szModel);
 	CAutoArray<CSimpleStringA> arrParam;
@@ -5161,10 +5160,6 @@ int CCardIssuerFSM::SplitDevModelInfo()
 	arrParam = csTmpModel.Split('#');
 	for (int i = 0; i < arrParam.GetCount(); ++i)
 	{
-		if (_strnicmp(arrParam[i], "CM", 2) == 0)
-		{
-			m_csCM = arrParam[i].SubString(3, arrParam[i].GetLength() - 3);
-		}
 		if (_strnicmp(arrParam[i], "RF", 2) == 0)
 		{
 			if (arrParam[i].GetLength()>3) {

Module/mod_CardIssuerStand/CardIssuerFSM.h

@@ -951,8 +951,7 @@ private:
 
 	char *m_pDataToARQC;
 	long xxTest;
-	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_terminalNo, m_addCardNo, m_addCardSerial
-		, m_csCM, m_rfVendorList, m_csRF;
+	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_terminalNo, m_addCardNo, m_addCardSerial, m_rfVendorList, m_csRF;
 	char m_AuthCode[2];
 	vector<CMBBin> m_vBin;
 	int SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData);

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -7021,7 +7021,6 @@ int CCardIssuerFSM::SplitDevModelInfo()
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SplitDevModelInfo>, Wrong szModel:%s", m_devCat.szModel);
 		return -1;
 	}
-	m_csCM = "";
 	m_csRF = "";
 	CSimpleStringA csTmpModel(m_devCat.szModel);
 	CAutoArray<CSimpleStringA> arrParam;
@@ -7029,10 +7028,6 @@ int CCardIssuerFSM::SplitDevModelInfo()
 	arrParam = csTmpModel.Split('#');
 	for (int i = 0; i < arrParam.GetCount(); ++i)
 	{
-		if (_strnicmp(arrParam[i], "CM", 2) == 0)
-		{
-			m_csCM = arrParam[i].SubString(3, arrParam[i].GetLength() - 3);
-		}
 		if (_strnicmp(arrParam[i], "RF", 2) == 0)
 		{
 			if (arrParam[i].GetLength() > 3) {

Module/mod_cardissuerstore/CardIssuerFSM.h

@@ -1314,12 +1314,10 @@ private:
 	pfGetEncrypedData GetEncrypedData;
 	char *m_pDataToARQC;
 	long xxTest;
-	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_terminalNo,m_addCardNo,m_addCardSerial
-		,m_csCM, m_rfVendorList, m_csRF;
+	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_terminalNo,m_addCardNo,m_addCardSerial, m_rfVendorList, m_csRF;
 	char m_AuthCode[2];
 	vector<CMBBin> m_vBin;
 
-
 	UINT64 m_crossStart;
 	int m_bBTChecking;
 	int SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData);

Module/mod_pinpad/mod_PinPad.h

@@ -197,7 +197,6 @@ public:
 			ctx->Answer(Error_DevNotAvailable, PinPad_UserErrorCode_PinPad_DevOpenFailed);
 	}
 	void DoInputCancelJS(SpReqAnsContext<PinPadService_InputCancelJS_Req, PinPadService_InputCancelJS_Ans>::Pointer ctx);
-	bool GetDevInitInfo() { return m_fsm.GetDevInitFlag(); }
 	virtual void OnSysVarEvent(const char *pszKey,
 		const char *pszValue, const char *pszOldValue, const char *pszEntityName);
 	virtual bool IsService()const{return true;}