Skip to content

R
RxWebSocket
Commit 446366cf authored by 王雷's avatar 王雷
Browse files
Options

新增销毁websocket

parent 71f911a6
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 4 deletions
.idea/.name 0 → 100644
View file @ 446366cf
WebSocket2
\ No newline at end of file
.idea/codeStyles/Project.xml 0 → 100644
View file @ 446366cf
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>
\ No newline at end of file
.idea/codeStyles/codeStyleConfig.xml 0 → 100644
View file @ 446366cf
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>
\ No newline at end of file
.idea/gradle.xml
View file @ 446366cf
......@@ -8,6 +8,7 @@
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$USER_HOME$/gradle/gradle-7.3" />
<option name="gradleJvm" value="Embedded JDK" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
......@@ -15,7 +16,6 @@
<option value="$PROJECT_DIR$/websocket" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
......
.idea/misc.xml
View file @ 446366cf
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
README.md
View file @ 446366cf
......@@ -21,6 +21,7 @@ Gradle:
```
## 说明
v1.0.2 在dispose()中手动close webSocket
v1.0.1 版本移除调试代码
......
websocket/build.gradle
View file @ 446366cf
......@@ -102,7 +102,7 @@ task generateSourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier 'sources'
}
def versionName = '1.0.1'
def versionName = '1.0.2'
def SNAPSHOT_REPOSITORY_URL = "https://hub.zmcms.cn/repository/maven-snapshots/"
def RELEASE_REPOSITORY_URL = "https://hub.zmcms.cn/repository/maven-releases/"
......
websocket/src/main/java/com/dhh/websocket/WebSocketSubscriber.java
View file @ 446366cf
......@@ -19,7 +19,7 @@ import okio.ByteString;
public abstract class WebSocketSubscriber implements Observer<WebSocketInfo> {
private boolean hasOpened;
protected Disposable disposable;
private WebSocket mWebSocket ;
@Override
public final void onNext(@NonNull WebSocketInfo webSocketInfo) {
if (webSocketInfo.isOnOpen()) {
......@@ -40,6 +40,7 @@ public abstract class WebSocketSubscriber implements Observer<WebSocketInfo> {
* @param webSocket
*/
protected void onOpen(@NonNull WebSocket webSocket) {
mWebSocket = webSocket;
}
protected void onMessage(@NonNull String text) {
......@@ -66,6 +67,9 @@ public abstract class WebSocketSubscriber implements Observer<WebSocketInfo> {
if (disposable != null) {
disposable.dispose();
}
if (mWebSocket!=null){
mWebSocket.close(3000, "close WebSocket");
}
}
@Override
......
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