!10145 卡机非接支持szmodel判断

Merge pull request !10145 from 80174520/ST2_1227_forinstall

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -5216,6 +5216,7 @@ int CCardIssuerFSM::SplitDevModelInfo()
 		return -1;
 	}
 	m_csCM = "";
+	m_csRF = "";
 	CSimpleStringA csTmpModel(m_devCat.szModel);
 	CAutoArray<CSimpleStringA> arrParam;
 	arrParam.Init(16);
@@ -5226,6 +5227,11 @@ int CCardIssuerFSM::SplitDevModelInfo()
 		{
 			m_csCM = arrParam[i].SubString(3, arrParam[i].GetLength() - 3);
 		}
+		if (_strnicmp(arrParam[i], "RF", 2) == 0)
+		{
+			m_csRF = arrParam[i].GetData();//获取非接支持的字段值
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("szModel: RF=%s", m_csRF.GetData());
+		}
 	}
 	return 0;
 }
@@ -5354,7 +5360,12 @@ bool CCardIssuerFSM::IfUseRf()
 {
 	if (m_bStopUseRF)
 		return false;
-	
+
+	//加入szmodel非接字段属性判断
+	if (m_csRF.Compare("Y") == 0) {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("szModel,RF=%s", m_csRF.GetData());
+		return true;
+	}	
 	CAutoArray<CSimpleStringA> arr = m_rfVendorList.Split('|');
 	//Dbg("%s,%d", m_rfVendorList.GetData(),arr.GetCount());
 	for (int i = 0; i < arr.GetCount(); ++i)
@@ -5363,5 +5374,6 @@ bool CCardIssuerFSM::IfUseRf()
 		if (m_adapterInfo.adapterFilePath.IndexOf(arr[i].GetData()) > 0)
 			return true;
 	}
+
 	return false;
 }

Module/mod_CardIssuerStand/CardIssuerFSM.h

@@ -956,8 +956,8 @@ 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_csDevSN;
+	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_terminalNo, m_addCardNo, m_addCardSerial
+		, m_csCM, m_rfVendorList, m_csDevSN, m_csRF;
 	char m_AuthCode[2];
 	vector<CMBBin> m_vBin;
 	int SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData);

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -1516,6 +1516,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 
 		if (eErrDev == Error_Succeed)
 		{
+			ToLogRootINIInfo();
 			m_bOpened = true;
 			m_devOpenFailedCount = 0;
 			ZeroMemory(m_devCat.szModel, sizeof(m_devCat.szModel));
@@ -5070,7 +5071,6 @@ void CCardIssuerFSM::GetVendorDllName(CSimpleStringA& strDevAdaptorPath)
 	pEntity->LoadVendorLibName();
 	FulfillAdapterInfoFrom(pEntity->vendorLibInfo);
 	strDevAdaptorPath = m_adapterInfo.adapterFilePath;
-	ToLogRootINIInfo();
 	return;
 }
 bool CCardIssuerFSM::AccountExchange(const char *origAcc, CSimpleStringA &acc, int dir)
@@ -5218,6 +5218,7 @@ int CCardIssuerFSM::SplitDevModelInfo()
 		return -1;
 	}
 	m_csCM = "";
+	m_csRF = "";
 	CSimpleStringA csTmpModel(m_devCat.szModel);
 	CAutoArray<CSimpleStringA> arrParam;
 	arrParam.Init(16);
@@ -5228,6 +5229,11 @@ int CCardIssuerFSM::SplitDevModelInfo()
 		{
 			m_csCM = arrParam[i].SubString(3, arrParam[i].GetLength() - 3);
 		}
+		if (_strnicmp(arrParam[i], "RF", 2) == 0)
+		{
+			m_csRF = arrParam[i].GetData();//获取非接支持的字段值
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("szModel: RF=%s", m_csRF.GetData());
+		}
 	}
 	return 0;
 }
@@ -5356,7 +5362,12 @@ bool CCardIssuerFSM::IfUseRf()
 {
 	if (m_bStopUseRF)
 		return false;
-	
+
+	//加入szmodel非接字段属性判断
+	if (m_csRF.Compare("Y") == 0) {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("szModel,RF=%s", m_csRF.GetData());
+		return true;
+	}	
 	CAutoArray<CSimpleStringA> arr = m_rfVendorList.Split('|');
 	//Dbg("%s,%d", m_rfVendorList.GetData(),arr.GetCount());
 	for (int i = 0; i < arr.GetCount(); ++i)
@@ -5365,5 +5376,6 @@ bool CCardIssuerFSM::IfUseRf()
 		if (m_adapterInfo.adapterFilePath.IndexOf(arr[i].GetData()) > 0)
 			return true;
 	}
+
 	return false;
 }

Module/mod_cardissuer/CardIssuerFSM.h

@@ -955,8 +955,8 @@ 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_csDevSN;
+	CSimpleStringA m_currCardNo, m_captureReason, m_csMachineType, m_csSite, m_terminalNo, m_addCardNo, m_addCardSerial
+		, m_csCM, m_rfVendorList, m_csDevSN, m_csRF;
 	char m_AuthCode[2];
 	vector<CMBBin> m_vBin;
 	int SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData);