From 55b196ea2e28a8d859c85326f2147a4f7b7196de Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期四, 10 四月 2025 10:58:32 +0800
Subject: [PATCH] feat(general): 新增开卡信息保存功能并优化界面布局- 新增 CardRegistrationBean 数据模型用于保存开卡信息 - 在数据库中添加 card_registration 表用于存储开卡记录 - 优化 NewCard2Activity 界面布局，调整样式和间距 - 添加协程支持，实现异步保存开卡信息到数据库 - 更新颜色配置，统一使用新加的 base_blue_bg 和 base_green_bg颜色
---
easysocket/src/main/java/com/easysocket/connection/dispatcher/CallbackResponseDispatcher.java | 11 +++++++++--
1 files changed, 9 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 dc0d4e6..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<>();
/**
* 淇濆瓨闇�瑕佽繘琛岃秴鏃舵娴嬬殑璇锋眰锛岃繖鏄竴涓欢鏃堕槦鍒楋紝鍏冪礌瓒呮椂鐨勬椂鍊欎細琚彇鍑烘潵
*/
@@ -71,17 +71,24 @@
public void engineThread() {
try {
if (timeoutExecutor == null || timeoutExecutor.isShutdown()) {
+ //鍒涘缓涓�涓彧鏈変竴涓嚎绋嬬殑绾跨▼姹犮�傝繖涓嚎绋嬫睜浼氶『搴忔墽琛屾彁浜ょ殑浠诲姟锛屽苟淇濊瘉浠诲姟涔嬮棿鐨勯『搴忔�с��
timeoutExecutor = Executors.newSingleThreadExecutor();
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