From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑，增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑，提高容错性 - 改进支付方式获取方法，增加错误处理和日志记录 -调整充值接口调用参数，确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型，改为字符串处理
---
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