Commit 494de908 authored by 王雷's avatar 王雷

在dispose()中执行前先判断是否已经 被isDispose()

parent 446366cf
...@@ -21,6 +21,7 @@ Gradle: ...@@ -21,6 +21,7 @@ Gradle:
``` ```
## 说明 ## 说明
v1.0.3 在dispose()中执行前先判断是否已经 被isDispose() 见WebSocketSubscriber.kt -> void dispose() // 2022 05 13
v1.0.2 在dispose()中手动close webSocket v1.0.2 在dispose()中手动close webSocket
v1.0.1 版本移除调试代码 v1.0.1 版本移除调试代码
......
...@@ -102,7 +102,7 @@ task generateSourcesJar(type: Jar) { ...@@ -102,7 +102,7 @@ task generateSourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs from android.sourceSets.main.java.srcDirs
classifier 'sources' classifier 'sources'
} }
def versionName = '1.0.2' def versionName = '1.0.3'
def SNAPSHOT_REPOSITORY_URL = "https://hub.zmcms.cn/repository/maven-snapshots/" def SNAPSHOT_REPOSITORY_URL = "https://hub.zmcms.cn/repository/maven-snapshots/"
def RELEASE_REPOSITORY_URL = "https://hub.zmcms.cn/repository/maven-releases/" def RELEASE_REPOSITORY_URL = "https://hub.zmcms.cn/repository/maven-releases/"
......
...@@ -7,7 +7,6 @@ import okhttp3.WebSocket; ...@@ -7,7 +7,6 @@ import okhttp3.WebSocket;
import okio.ByteString; import okio.ByteString;
/** /**
*
* @author dhh * @author dhh
* @date 2017/10/24 * @date 2017/10/24
* <p> * <p>
...@@ -19,7 +18,8 @@ import okio.ByteString; ...@@ -19,7 +18,8 @@ import okio.ByteString;
public abstract class WebSocketSubscriber implements Observer<WebSocketInfo> { public abstract class WebSocketSubscriber implements Observer<WebSocketInfo> {
private boolean hasOpened; private boolean hasOpened;
protected Disposable disposable; protected Disposable disposable;
private WebSocket mWebSocket ; private WebSocket mWebSocket;
@Override @Override
public final void onNext(@NonNull WebSocketInfo webSocketInfo) { public final void onNext(@NonNull WebSocketInfo webSocketInfo) {
if (webSocketInfo.isOnOpen()) { if (webSocketInfo.isOnOpen()) {
...@@ -64,10 +64,10 @@ public abstract class WebSocketSubscriber implements Observer<WebSocketInfo> { ...@@ -64,10 +64,10 @@ public abstract class WebSocketSubscriber implements Observer<WebSocketInfo> {
} }
public final void dispose() { public final void dispose() {
if (disposable != null) { if (disposable != null && !disposable.isDisposed()) {
disposable.dispose(); disposable.dispose();
} }
if (mWebSocket!=null){ if (mWebSocket != null) {
mWebSocket.close(3000, "close WebSocket"); mWebSocket.close(3000, "close WebSocket");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment