Explorar el Código

#IQRV #comment: 非接字节流数据

陈纪林80310970 hace 7 meses
padre
commit
d8e5a8236d

+ 1 - 1
DevAdapter/simulator/contactlesscard.1.1/contactless_httpans.h

@@ -15,7 +15,7 @@ typedef struct ActiveContactlessICCardAns {
 
 typedef struct CmdInfoAns {
 	int dwSize;
-	std::string data;
+	ByteData data;
 
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(dwSize, data)
 }CmdInfoAns;

+ 2 - 2
DevAdapter/simulator/contactlesscard.1.1/contactless_impl.cpp

@@ -152,7 +152,7 @@ ErrorCodeEnum ContactlessCardImpl::MifareCommand(MifareFuctionEnum eFunType, Cmd
 
     if (err == Error_Succeed) {
         recvBuf.dwSize = ans.dwSize;
-        memcpy(recvBuf.data, ans.data.c_str(), ans.data.length() + 1);
+        memcpy(recvBuf.data, ans.data.bData, sizeof(BYTE) * MAX_IC_BUFFER_SIZE);
     }
 
     return err;
@@ -168,7 +168,7 @@ ErrorCodeEnum ContactlessCardImpl::RFTypeABCommand(CmdInfo sendBuf, CmdInfo& rec
 
     if (err == Error_Succeed) {
         recvBuf.dwSize = ans.dwSize;
-        memcpy(recvBuf.data, ans.data.c_str(), ans.data.length() + 1);
+        memcpy(recvBuf.data, ans.data.bData, sizeof(BYTE) * MAX_IC_BUFFER_SIZE);
     }
 
     return err;