release 1.3.0

Deng · Deng · commit 78c66f9a183b · 2016-04-11T17:01:39.000+08:00
diff --git a/README.md b/README.md
@@ -17,16 +17,16 @@ Step 2. Add the dependency in the form
 
 ```gradle
 dependencies {
-  compile 'com.github.vilyever:AndroidSocketClient:1.2.5'
+  compile 'com.github.vilyever:AndroidSocketClient:1.3.0'
 }
 ```
 
-## Notice
-&#20351;&#29992;SocketClient&#25509;&#25910;&#28040;&#24687;&#26102;&#65292;&#26159;&#36890;&#36807;readLine&#30340;&#26041;&#24335;&#36827;&#34892;&#65292;&#21363;&#27599;&#19968;&#26465;&#28040;&#24687;&#20026;&#19968;&#34892;&#65292;&#25925;&#36828;&#31243;&#31471;&#21457;&#36865;&#30340;&#28040;&#24687;&#38656;&#22312;&#26411;&#23614;&#21152;&#19978;&#25442;&#34892;&#31526; '\n '&#25110; '\r\n'
+## Updates
+* 1.3.0
+&#20462;&#25913;&#28040;&#24687;&#25910;&#21457;&#26426;&#21046;
 </br>
-&#20351;&#29992;SocketClient&#21644;SocketServer&#21457;&#36865;&#30340;String&#28040;&#24687;&#20250;&#33258;&#21160;&#22312;&#26411;&#23614;&#28155;&#21152; '\r\n' &#25442;&#34892;&#31526;
-</br>
-1.2.5&#29256;&#26412;&#21518;&#21487;&#20197;&#36873;&#25321;&#26159;&#21542;&#20351;&#29992;readLine&#35835;&#21462;&#28040;&#24687;&#65292;SocketClient.setSupportReadLine()&#65292;&#40664;&#35748;&#19981;&#20351;&#29992;;
+&#25509;&#25910;&#28040;&#24687;&#22238;&#35843;&#21442;&#25968;&#30001;String&#25913;&#20026;SocketResponsePacket&#65292;&#25552;&#20379;byte[]&#25968;&#25454;
+&#33719;&#21462;String&#28040;&#24687;&#35843;&#29992;SocketResponsePacket.getMessage()&#23454;&#26102;&#33719;&#21462;
 
 ## Usage
 ```java
@@ -35,7 +35,9 @@ SocketClient socketClient = new SocketClient("192.168.1.1", 80);
 socketClient.registerSocketDelegate(new SocketClient.SocketDelegate() {
     @Override
     public void onConnected(SocketClient client) {
-
+        socketClient.send("message"); // &#21457;&#36865;String&#28040;&#24687;&#65292;&#20351;&#29992;&#40664;&#35748;&#32534;&#30721;
+        socketClient.send("message", "GBK"); // &#21457;&#36865;String&#28040;&#24687;&#65292;&#20351;&#29992;GBK&#32534;&#30721;
+        socketClient.send("message".getBytes()); // &#21457;&#36865;byte[]&#28040;&#24687;
     }
 
     @Override
@@ -44,12 +46,29 @@ socketClient.registerSocketDelegate(new SocketClient.SocketDelegate() {
     }
 
     @Override
-    public void onResponse(SocketClient client, @NonNull String response) {
+    public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {
 
     }
 });
 
-socketClient.connect();
+socketClient.setConnectionTimeout(1000 * 15); // &#35774;&#32622;&#36830;&#25509;&#36229;&#26102;&#26102;&#38271;
+
+socketClient.setHeartBeatInterval(1000 * 30); // &#35774;&#32622;&#24515;&#36339;&#21253;&#21457;&#36865;&#38388;&#38548;
+
+socketClient.setRemoteNoReplyAliveTimeout(1000 * 60); // &#35774;&#32622;&#36828;&#31243;&#31471;&#22312;&#22810;&#38271;&#26102;&#38388;&#27809;&#26377;&#28040;&#24687;&#21457;&#36865;&#21040;&#26412;&#22320;&#26102;&#33258;&#21160;&#26029;&#24320;&#36830;&#25509;
+
+socketClient.registerQueryResponse("query", "response"); // &#35774;&#32622;&#33258;&#21160;&#24212;&#31572;&#38190;&#20540;&#23545;&#65292;&#21363;&#25910;&#21040;"query"&#26102;&#33258;&#21160;&#21457;&#36865;"response"
+
+socketClient.setSupportReadLine(false); // &#35774;&#32622;&#26159;&#21542;&#25903;&#25345;&#23545;&#27599;&#26465;&#28040;&#24687;&#28155;&#21152;&#25442;&#34892;&#31526;&#20998;&#21106;&#65292;&#40664;&#35748;&#20026;true
+
+socketClient.setCharsetName("UTF-8"); // &#35774;&#32622;&#21457;&#36865;String&#28040;&#24687;&#30340;&#40664;&#35748;&#32534;&#30721;
+
+socketClient.connect(); // &#36830;&#25509;&#65292;&#24322;&#27493;&#36827;&#34892;
+
+socketClient.disconnect(); // &#26029;&#24320;&#36830;&#25509;
+
+socketClient.getState(); // &#33719;&#21462;&#24403;&#21069;&#29366;&#24577;&#65292;Connecting, Connected, Disconnected
+
 ```
 
 ## License
diff --git a/socketclient/build_library_ext.gradle b/socketclient/build_library_ext.gradle
@@ -1,6 +1,6 @@
 ext {
     buildVersionName = {
-        "1.2.5"
+        "1.3.0"
     }
     
     /**
diff --git a/socketclient/src/main/java/com/vilyever/socketclient/SocketClient.java b/socketclient/src/main/java/com/vilyever/socketclient/SocketClient.java
@@ -65,7 +65,8 @@ public void disconnect() {
             return;
         }
 
-        if (!getRunningSocket().isClosed()) {
+        if (!getRunningSocket().isClosed()
+                || isConnecting()) {
             try {
                 getRunningSocket().getOutputStream().close();
                 getRunningSocket().getInputStream().close();

-Original file line number
+Diff line change
 ```gradle
 dependencies {
 -  compile 'com.github.vilyever:AndroidSocketClient:1.2.5'
 +  compile 'com.github.vilyever:AndroidSocketClient:1.3.0'
+}
 ```
 -## Notice
 -使用SocketClient接收消息时，是通过readLine的方式进行，即每一条消息为一行，故远程端发送的消息需在末尾加上换行符 '\n '或 '\r\n'
 +## Updates
 +* 1.3.0
 +修改消息收发机制
 </br>
 -使用SocketClient和SocketServer发送的String消息会自动在末尾添加 '\r\n' 换行符
 -</br>
 -1.2.5版本后可以选择是否使用readLine读取消息，SocketClient.setSupportReadLine()，默认不使用;
 +接收消息回调参数由String改为SocketResponsePacket，提供byte[]数据
 +获取String消息调用SocketResponsePacket.getMessage()实时获取
 ## Usage
 ```java
 socketClient.registerSocketDelegate(new SocketClient.SocketDelegate() {
     @Override
     public void onConnected(SocketClient client) {
+-
 +        socketClient.send("message"); // 发送String消息，使用默认编码
 +        socketClient.send("message", "GBK"); // 发送String消息，使用GBK编码
 +        socketClient.send("message".getBytes()); // 发送byte[]消息
+    }
     @Override
+    }
     @Override
 -    public void onResponse(SocketClient client, @NonNull String response) {
 +    public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {
+    }
 });
 -socketClient.connect();
 +socketClient.setConnectionTimeout(1000 * 15); // 设置连接超时时长
++
 +socketClient.setHeartBeatInterval(1000 * 30); // 设置心跳包发送间隔
++
 +socketClient.setRemoteNoReplyAliveTimeout(1000 * 60); // 设置远程端在多长时间没有消息发送到本地时自动断开连接
++
 +socketClient.registerQueryResponse("query", "response"); // 设置自动应答键值对，即收到"query"时自动发送"response"
++
 +socketClient.setSupportReadLine(false); // 设置是否支持对每条消息添加换行符分割，默认为true
++
 +socketClient.setCharsetName("UTF-8"); // 设置发送String消息的默认编码
++
 +socketClient.connect(); // 连接，异步进行
++
 +socketClient.disconnect(); // 断开连接
++
 +socketClient.getState(); // 获取当前状态，Connecting, Connected, Disconnected
++
 ```
 ## License
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`ext {`
`2`	`2`	`buildVersionName = {`
`3`		`- "1.2.5"`
	`3`	`+ "1.3.0"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ public void disconnect() {`
`65`	`65`	`return;`
`66`	`66`	`}`
`67`	`67`
`68`		`- if (!getRunningSocket().isClosed()) {`
	`68`	`+ if (!getRunningSocket().isClosed()`
	`69`	`+ \|\| isConnecting()) {`
`69`	`70`	`try {`
`70`	`71`	`getRunningSocket().getOutputStream().close();`
`71`	`72`	`getRunningSocket().getInputStream().close();`