Просмотр исходного кода

Z991239-5267 #comment 修复卡机实体读卡接口bug

Signed-Off-By: commit-hook
刘文涛80174520 1 год назад
Родитель
Сommit
d0c1b103cd

+ 22 - 20
DevAdapter/self/cardissuer/VirtualDeviceClass.cpp

@@ -77,6 +77,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::GetDevStatus(CardIssuerStatus& devStatus)
 	return result;
 }
 
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::GetDeviceSN(char*& pDevSN)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -109,6 +110,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::MagRead(MagTracks& magTracks)
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	Bridge_MagTracks inner;
+	inner.eRange = magTracks.eRange;
 	result = Bridge_MagRead(&inner);
 	if (result == Error_Succeed) {
 		magTracks.eRange = (TrackRange)inner.eRange;
@@ -271,7 +273,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::ActiveICCardATR(CmdInfo& atrBuf)
 	}
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::Print(BYTE*& data, const int dataSize, const int side)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -287,7 +289,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::Print(BYTE*& data, const int dataSize, con
 
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::QueryPrinterStatus()
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -319,7 +321,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::DeactContactlessICCard()
 	result = Bridge_DeactContactlessICCard();
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -364,7 +366,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::DevOpenEx(DWORD dwPort, DWORD dwBaudRate,
 	}
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::TransferEnInit(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -407,7 +409,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::TransferEnInit(int& iStatus, BYTE*& Cr1, i
 
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SetR2(int& iStatus, BYTE* pCr2, int lenR2)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -418,14 +420,14 @@ ErrorCodeEnum VirtualDeviceClassImpl::SetR2(int& iStatus, BYTE* pCr2, int lenR2)
 	}
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SendWorkingKey(const char* pWorkingKey)
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	result = Bridge_SendWorkingKey(pWorkingKey);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SLLoadKey(const SCIKeyInfo key)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -435,21 +437,21 @@ ErrorCodeEnum VirtualDeviceClassImpl::SLLoadKey(const SCIKeyInfo key)
 	result = Bridge_SLLoadKey(inner);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SLSetParam(SCIParamType eType, int value)
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	result = Bridge_SLSetParam(eType, value);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SLLock()
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	result = Bridge_SLLock();
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SLUnLock(const SCICheckCode checkCode, bool bTemp /*= true*/)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -459,7 +461,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::SLUnLock(const SCICheckCode checkCode, boo
 	result = Bridge_SLUnLock(inner, bTemp ? 1 : 0);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SLGetTempData(SCITempData& ksnData, SCITempData& ramData)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -475,7 +477,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::SLGetTempData(SCITempData& ksnData, SCITem
 	}
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::SLOpenDoor(const SCITempData data)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -485,28 +487,28 @@ ErrorCodeEnum VirtualDeviceClassImpl::SLOpenDoor(const SCITempData data)
 	result = Bridge_SLOpenDoor(inner);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::BluetoothControl(SCIBluetoothCMD eCmd)
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	result = Bridge_BluetoothControl(eCmd);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::BluetoothModifyKey(unsigned char* key)
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	result = Bridge_BluetoothModifyKey(key);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::BluetoothModifyName(unsigned char* name)
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	result = Bridge_BluetoothModifyName(name);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::BluetoothGetVersion(char*& version)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -520,7 +522,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::BluetoothGetVersion(char*& version)
 	delete[] inner;
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::BluetoothGetConnectName(unsigned char*& name)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -534,7 +536,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::BluetoothGetConnectName(unsigned char*& na
 	delete[] inner;
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::BluetoothGetSignalStrength(unsigned char*& signal)
 {
 	ErrorCodeEnum result = Error_Unexpect;
@@ -548,14 +550,14 @@ ErrorCodeEnum VirtualDeviceClassImpl::BluetoothGetSignalStrength(unsigned char*&
 	delete[] inner;
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::LightControl(SCILightType eLight, bool bOnOff)
 {
 	ErrorCodeEnum result = Error_Unexpect;
 	result = Bridge_LightControl(eLight, bOnOff ? 1 : 0);
 	return result;
 }
-
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::QueryBatteryPower(int& bat)
 {
 	ErrorCodeEnum result = Error_Unexpect;

+ 1 - 1
DevAdapter/self/contactlesscard/VirtualDeviceClass.cpp

@@ -100,7 +100,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::WarmReset()
 	ErrorCodeEnum result = Error_Succeed;
 	return (result = Bridge_WarmReset());
 }
-
+//δÕÒµ½ÒýÓÃ
 ErrorCodeEnum VirtualDeviceClassImpl::MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf)
 {
 	ErrorCodeEnum result = Error_Unexpect;