From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮,跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity,优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity,支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作

---
 easysocket/src/main/java/com/easysocket/EasySocket.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/easysocket/src/main/java/com/easysocket/EasySocket.java b/easysocket/src/main/java/com/easysocket/EasySocket.java
index 4aecbd3..eb8eee0 100644
--- a/easysocket/src/main/java/com/easysocket/EasySocket.java
+++ b/easysocket/src/main/java/com/easysocket/EasySocket.java
@@ -12,8 +12,6 @@
 import com.easysocket.interfaces.conn.ISocketActionListener;
 import com.easysocket.utils.LogUtil;
 
-import java.nio.charset.Charset;
-
 /**
  * Author锛欰lex
  * Date锛�2019/6/4
@@ -129,7 +127,9 @@
      */
     public EasySocket disconnect(boolean isNeedReconnect) {
         LogUtil.d("EasySocket--銆媎isconnect");
-        getDefconnection().disconnect(isNeedReconnect);
+        if (defConnection != null) {
+            getDefconnection().disconnect(isNeedReconnect);
+        }
         return this;
     }
 

--
Gitblit v1.8.0