rfidrig/RFIDtools
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/RFIDtools.git synced 2026-05-12 11:19:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Chameleon communication bug fixed.

Browse Source
This commit is contained in:
dxl
2020-07-01 10:30:03 +08:00
parent 5c4a1d22c5
commit 9b3a2a484b
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chameleon/build.gradle
+1
View File
@@ -23,6 +23,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.github.xianglin1998:mfkey:1.1'
implementation 'com.github.xianglin1998:nfctag:1.0'
implementation 'com.github.felHR85:UsbSerial:6.1.0'
implementation 'com.github.xianglin1998:ComBridge:1.0.7'
// implementation project(path: ':iobridges')
chameleon/src/main/java/cn/rrg/chameleon/executor/ChameleonExecutor.java
+21 -24
View File
@@ -2,12 +2,16 @@ package cn.rrg.chameleon.executor;
import android.util.Log;
import com.felhr.usbserial.SerialInputStream;
import com.iobridges.bulkio.BulkInputStream;
import com.iobridges.com.Communication;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import cn.dxl.common.util.HexUtil;
import cn.dxl.common.util.LogUtils;
import cn.rrg.chameleon.utils.ChameleonResult;
import cn.rrg.chameleon.defined.IChameleonExecutor;
@@ -55,36 +59,22 @@ public class ChameleonExecutor implements IChameleonExecutor {
public byte[] requestChameleon(String at, int timeout, boolean xmodemMode) {
try {
synchronized (lock) {
//请求并且判断结果!
requestChameleon(at);
//初始化必须的变量
ByteArrayOutputStream bos = new ByteArrayOutputStream(512);
long currentTime = System.currentTimeMillis();
//Log.d(LOG_TAG, "得到锁成功，当前线程ID: " + Thread.currentThread().getId());
do {
//开始接收，每次接收一个字节!
byte tmpByte = read();
byte tmpByte = read(1);
if (tmpByte != -1) {
//接收完毕,有有效的字节!!!
bos.write(tmpByte);
//Log.d(LOG_TAG, "打印接收到的字节: " + HexUtil.toHexString(tmpByte));
//有有效数据，进行超时拖延!
Log.d(LOG_TAG, "打印接收到的字节: " + HexUtil.toHexString(tmpByte));
currentTime = System.currentTimeMillis();
//判断到换行，则可能是一帧的结束!
// FIXME: 2019/4/21 谨记，上传或下载将会打开xmodem通道，此时应当进行判断，断定下一步的操作!
if (tmpByte == 0x0A) {
//Log.d(LOG_TAG, "有换行，下一步判断是否需要继续接收!");
if (!xmodemMode) {
//延迟判断新行，200ms延迟最大限度提升成功率!!!
tmpByte = read();
tmpByte = read(100);
if (tmpByte != -1) {
//Log.d(LOG_TAG, "需要");
bos.write(tmpByte);
currentTime = System.currentTimeMillis();
} else {
//Log.d(LOG_TAG, "不需要");
//接收完毕，直接返回!
//Log.d(LOG_TAG, "锁释放完成: " + Thread.currentThread().getId());
return bos.toByteArray();
}
} else {
@@ -92,14 +82,12 @@ public class ChameleonExecutor implements IChameleonExecutor {
}
}
}
} while (System.currentTimeMillis() - currentTime < timeout); //超时中处理!
} while (System.currentTimeMillis() - currentTime < timeout);
}
} catch (IOException e) {
e.printStackTrace();
Log.d(LOG_TAG, "104锁释放完成: " + Thread.currentThread().getId());
return null;
}
Log.d(LOG_TAG, "107锁释放完成: " + Thread.currentThread().getId());
return null;
}
@@ -118,7 +106,7 @@ public class ChameleonExecutor implements IChameleonExecutor {
//Log.d(LOG_TAG, "得到锁成功，当前线程ID: " + Thread.currentThread().getId());
do {
//开始接收，每次接收一个字节!
byte tmpByte = read();
byte tmpByte = read(timeout);
if (tmpByte != -1) {
ret[pos] = tmpByte;
if (++pos == length) break;
@@ -153,9 +141,18 @@ public class ChameleonExecutor implements IChameleonExecutor {
*
* @return 读取结果，-1为失败!
*/
private byte read() {
private byte read(int timeout) {
try {
return (byte) mCom.getInput().read();
InputStream bis = mCom.getInput();
if (bis instanceof BulkInputStream) {
((BulkInputStream) bis).setTimeout(timeout);
LogUtils.d("The BulkInputStream timeout set successfully");
}
if (bis instanceof SerialInputStream) {
((SerialInputStream) bis).setTimeout(timeout);
LogUtils.d("The SerialInputStream timeout set successfully");
}
return (byte) bis.read();
} catch (IOException e) {
e.printStackTrace();
}
@@ -186,7 +183,7 @@ public class ChameleonExecutor implements IChameleonExecutor {
//Log.d(LOG_TAG, "得到锁成功，当前线程ID: " + Thread.currentThread().getId());
do {
//开始接收，每次接收一个字节!
byte tmpByte = read();
byte tmpByte = read(timeout);
if (tmpByte != -1) {
++count;
}