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/EasySocket.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/easysocket/src/main/java/com/easysocket/EasySocket.java b/easysocket/src/main/java/com/easysocket/EasySocket.java
index e0c158f..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;
}
@@ -268,8 +268,8 @@
*/
public IConnectionManager getDefconnection() {
if (defConnection == null) {
- throw new NotNullException("浣犺繕娌℃湁鍒涘缓锛�" + defOptions.getSocketAddress().getIp() + ":" + defOptions.getSocketAddress().getPort()
- + "鐨凷ocket鐨勮繛鎺ワ紝璇蜂娇鐢╟om.easysocket.EasySocket.connect()鏂规硶鍒涘缓涓�涓粯璁ょ殑杩炴帴");
+// throw new NotNullException("浣犺繕娌℃湁鍒涘缓锛�" + defOptions.getSocketAddress().getIp() + ":" + defOptions.getSocketAddress().getPort()
+// + "鐨凷ocket鐨勮繛鎺ワ紝璇蜂娇鐢╟om.easysocket.EasySocket.connect()鏂规硶鍒涘缓涓�涓粯璁ょ殑杩炴帴");
}
return defConnection;
}
--
Gitblit v1.8.0