From 9cffe03d76840520bfbfeaf85933fcb2ed8385b8 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 05 三月 2025 10:19:46 +0800
Subject: [PATCH] feat(generallibrary): 新增主界面和相关功能模块 - 新增 MainActivity 作为主界面,包含三个底部导航栏选项卡- 新增 BSCardFragment、RechargeFragment 和 MyFragment 作为三个选项卡对应的页面 - 新增 NewCardActivity 用于新建卡片 - 新增 AreaCard 类用于处理区域表号卡数据 - 新增 BaseCard 类作为卡片数据的基础类 - 新增 TabAdapter 用于管理选项卡页面 - 更新 AndroidManifest.xml 设置主活动为 MainActivity - 更新 build.gradle 添加 generallibrary 依赖

---
 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