From f5180b600511d1871635bd364beb5bdd15f6ae88 Mon Sep 17 00:00:00 2001 From: zuojincheng <lf_zuo@163.com> Date: 星期三, 26 三月 2025 18:05:07 +0800 Subject: [PATCH] feat(nfc): 优化 NFC写卡功能并添加新方法- 在 BaseNfcWriteHelper 中添加了新的 writeData 方法,增加了 isConnect 参数 - 优化了 NativeNfcWriteHelper 中的 writeData 实现,支持选择性连接 NFC - 更新了 NfcWriteAdapter,支持新的 writeData 方法- 修改了 NfcWreatHelper 中的 writeData 方法,使用新的接口 - 优化了 NfcWreatActivity 中的写卡逻辑 --- easysocket/src/main/java/com/easysocket/connection/dispatcher/CallbackResponseDispatcher.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/easysocket/src/main/java/com/easysocket/connection/dispatcher/CallbackResponseDispatcher.java b/easysocket/src/main/java/com/easysocket/connection/dispatcher/CallbackResponseDispatcher.java index 5ce8190..f4290bb 100644 --- a/easysocket/src/main/java/com/easysocket/connection/dispatcher/CallbackResponseDispatcher.java +++ b/easysocket/src/main/java/com/easysocket/connection/dispatcher/CallbackResponseDispatcher.java @@ -29,7 +29,7 @@ * 淇濆瓨鍙戦�佺殑姣忎釜鍥炶皟娑堟伅鐨勭洃鍚疄渚嬶紝key涓哄洖璋冩爣璇哻allbackId锛岃繖鏍峰洖璋冩秷鎭湁鍙嶉鐨勬椂鍊欙紝灏卞彲浠ユ壘鍒板苟璋冪敤 * 瀵瑰簲鐨勭洃鍚璞� */ - private Map<String, SuperCallBack> callbacks = new HashMap<>(); + private volatile Map<String, SuperCallBack> callbacks = new HashMap<>(); /** * 淇濆瓨闇�瑕佽繘琛岃秴鏃舵娴嬬殑璇锋眰锛岃繖鏄竴涓欢鏃堕槦鍒楋紝鍏冪礌瓒呮椂鐨勬椂鍊欎細琚彇鍑烘潵 */ @@ -76,13 +76,19 @@ timeoutExecutor.execute(new Runnable() { @Override public void run() { + LogUtil.d("浠诲姟瓒呮椂杞"); try { // 鍙湁瓒呮椂鐨勫厓绱犳墠浼氳鍙栧嚭锛屾病鏈夌殑璇濅細琚瓑寰� timeoutItem item = timeoutQueue.take(); if (item != null) { + LogUtil.d("瓒呮椂浠诲姟ID锛�" + item.callbackId); SuperCallBack callBack = callbacks.remove(item.callbackId); - if (callBack != null) + if (callBack != null) { + LogUtil.d("瓒呮椂浠诲姟ID锛�" + item.callbackId + "callBack != null"); callBack.onError(new RequestTimeOutException("request timeout")); + }else { + LogUtil.d("瓒呮椂浠诲姟ID锛�" + item.callbackId + " callBack == null"); + } } } catch (InterruptedException e) { e.printStackTrace(); -- Gitblit v1.8.0