From 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 07 五月 2024 11:04:45 +0800
Subject: [PATCH] 1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀
---
easysocket/src/main/java/com/easysocket/connection/iowork/EasyReader.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/easysocket/src/main/java/com/easysocket/connection/iowork/EasyReader.java b/easysocket/src/main/java/com/easysocket/connection/iowork/EasyReader.java
index 3d23041..8046180 100644
--- a/easysocket/src/main/java/com/easysocket/connection/iowork/EasyReader.java
+++ b/easysocket/src/main/java/com/easysocket/connection/iowork/EasyReader.java
@@ -10,7 +10,9 @@
import com.easysocket.interfaces.conn.IConnectionManager;
import com.easysocket.interfaces.conn.ISocketActionDispatch;
import com.easysocket.interfaces.io.IReader;
+import com.easysocket.utils.HexUtil;
import com.easysocket.utils.LogUtil;
+import com.tencent.bugly.crashreport.CrashReport;
import java.io.IOException;
import java.io.InputStream;
@@ -138,7 +140,7 @@
// 淇濆瓨body
originalData.setBodyData(bodyBuf.array());
- LogUtil.d("Socket鏀跺埌鏁版嵁-->" + originalData.getBodyString());
+ LogUtil.d("Socket鏀跺埌鏁版嵁-->" +HexUtil.bytesToHex(originalData.getBodyBytes()) );
// 鍒嗗彂鏁版嵁
actionDispatch.dispatchAction(IOAction.ACTION_READ_COMPLETE, originalData);
@@ -171,7 +173,7 @@
throw new ReadUnrecoverableException("鏁版嵁body鐨勯暱搴︿笉鑳藉皬浜�0");
}
- LogUtil.d("Socket鏀跺埌鏁版嵁-->" + originalData.getBodyString());
+ LogUtil.d("Socket鏀跺埌鏁版嵁-->" + HexUtil.bytesToHex(originalData.getBodyBytes()));
// 鍒嗗彂
actionDispatch.dispatchAction(IOAction.ACTION_READ_COMPLETE, originalData);
@@ -194,12 +196,13 @@
// 鍋滄绾跨▼
stopThread = true;
release();
+ LogUtil.i("reader鍋滄绾跨▼");
+ CrashReport.postCatchedException(unrecoverableException);
} catch (ReadRecoverableExeption readRecoverableExeption) {
readRecoverableExeption.printStackTrace();
// 閲嶈繛
LogUtil.d("--->閲嶈繛 ReadRecoverableExeption");
connectionManager.disconnect(true);
-
} catch (IOException e) {
e.printStackTrace();
// 閲嶈繛
@@ -236,7 +239,7 @@
byte[] data = new byte[len];
originBuf.get(data, 0, len);
readData.setBodyData(data);
- LogUtil.d("Socket鏀跺埌鏁版嵁-->" + readData.getBodyString());
+ LogUtil.d("Socket鏀跺埌鏁版嵁-->" + HexUtil.bytesToHex(readData.getBodyBytes()));
// 鍒嗗彂鏁版嵁
actionDispatch.dispatchAction(IOAction.ACTION_READ_COMPLETE, readData);
// 鐩稿綋浜庢妸鎸囬拡閲嶆柊鎸囧悜positon=0
@@ -287,6 +290,7 @@
// 閲婃斁璧勬簮
private void release() {
+ LogUtil.i("reader绾跨▼閲婃斁璧勬簮");
if (originBuf != null) {
originBuf = null;
}
--
Gitblit v1.8.0