resolve CountDownTimer will restart problem

Deng · Deng · commit 46d8a429f2af · 2016-05-19T15:37:24.000+08:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/vilyever/androidsocketclient/MainActivity.java b/app/src/main/java/com/vilyever/androidsocketclient/MainActivity.java
@@ -13,6 +13,7 @@
 import com.vilyever.socketclient.util.IPUtil;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 public class MainActivity extends AppCompatActivity {
     final MainActivity self = this;
@@ -75,6 +76,8 @@ public void onDisconnected(SocketClient client) {
                     @Override
                     public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {
                         Logger.log("size " + responsePacket.getData().length + " ->" + responsePacket.getMessage().replaceAll("\\r", ""));
+                        Logger.log("data " + Arrays.toString(responsePacket.getData()));
+                        Logger.log("crlf " + Arrays.toString("\r\n".getBytes()));
                     }
                 });
             }
diff --git a/socketclient/src/main/java/com/vilyever/socketclient/SocketClient.java b/socketclient/src/main/java/com/vilyever/socketclient/SocketClient.java
@@ -389,7 +389,9 @@ public void onTick(long millisUntilFinished) {
 
                 @Override
                 public void onFinish() {
-                    this.start();
+                    if (self.isConnected()) {
+                        this.start();
+                    }
                 }
             };
 
diff --git a/socketclient/src/main/java/com/vilyever/socketclient/server/SocketServer.java b/socketclient/src/main/java/com/vilyever/socketclient/server/SocketServer.java
@@ -306,10 +306,10 @@ public void handleMessage(Message msg) {
 
             switch (MessageType.typeFromWhat(msg.what)) {
                 case StopListen:
-                    this.referenceSocketServer.get().onSocketServerStopListen();
+                    this.referenceSocketServer.get().internalOnSocketServerStopListen();
                     break;
                 case ClientConnected:
-                    this.referenceSocketServer.get().onSocketServerClientConnected((SocketServerClient) msg.obj);
+                    this.referenceSocketServer.get().internalOnSocketServerClientConnected((SocketServerClient) msg.obj);
                     break;
             }
         }
@@ -339,7 +339,7 @@ public void onConnected(SocketClient client) {
 
     @Override
     public void onDisconnected(SocketClient client) {
-        onSocketServerClientDisconnected((SocketServerClient) client);
+        internalOnSocketServerClientDisconnected((SocketServerClient) client);
     }
 
     @Override
@@ -350,7 +350,7 @@ public void onResponse(SocketClient client, @NonNull SocketResponsePacket respon
 
     /* Protected Methods */
     @WorkerThread
-    protected SocketServerClient getSocketServerClient(Socket socket) {
+    protected SocketServerClient internalGetSocketServerClient(Socket socket) {
         return new SocketServerClient(socket);
     }
 
@@ -367,12 +367,12 @@ protected void onSocketServerBeginListen() {
     }
 
     @CallSuper
-    protected void onSocketServerStopListen() {
+    protected void internalOnSocketServerStopListen() {
         setListening(false);
         this.listenThread = null;
         this.runningServerSocket = null;
 
-        disconnectAllClients();
+        internalDisconnectAllClients();
 
         ArrayList<SocketServerDelegate> copyList =
                 (ArrayList<SocketServerDelegate>) getSocketServerDelegates().clone();
@@ -383,7 +383,7 @@ protected void onSocketServerStopListen() {
     }
 
     @CallSuper
-    protected void onSocketServerClientConnected(SocketServerClient socketServerClient) {
+    protected void internalOnSocketServerClientConnected(SocketServerClient socketServerClient) {
         getRunningSocketServerClients().add(socketServerClient);
 
         socketServerClient.registerSocketDelegate(this);
@@ -402,9 +402,8 @@ protected void onSocketServerClientConnected(SocketServerClient socketServerClie
     }
 
     @CallSuper
-    protected void onSocketServerClientDisconnected(SocketServerClient socketServerClient) {
-
-        self.getRunningSocketServerClients().remove(socketServerClient);
+    protected void internalOnSocketServerClientDisconnected(SocketServerClient socketServerClient) {
+        getRunningSocketServerClients().remove(socketServerClient);
 
         ArrayList<SocketServerDelegate> copyList =
                 (ArrayList<SocketServerDelegate>) getSocketServerDelegates().clone();
@@ -415,11 +414,11 @@ protected void onSocketServerClientDisconnected(SocketServerClient socketServerC
     }
 
     /* Private Methods */
-    private boolean checkServerSocketAvailable() {
+    private boolean internalCheckServerSocketAvailable() {
         return getRunningServerSocket() != null && !getRunningServerSocket().isClosed();
     }
 
-    private void disconnectAllClients() {
+    private void internalDisconnectAllClients() {
         while (getRunningSocketServerClients().size() > 0) {
             SocketServerClient client = getRunningSocketServerClients().get(0);
             getRunningSocketServerClients().remove(client);
@@ -442,12 +441,12 @@ protected boolean isRunning() {
         public void run() {
             super.run();
             setRunning(true);
-            while (!Thread.interrupted() && self.checkServerSocketAvailable()) {
+            while (!Thread.interrupted() && self.internalCheckServerSocketAvailable()) {
                 Socket socket = null;
                 try {
                     socket = self.getRunningServerSocket().accept();
 
-                    SocketServerClient socketServerClient = self.getSocketServerClient(socket);
+                    SocketServerClient socketServerClient = self.internalGetSocketServerClient(socket);
 
                     Message message = Message.obtain();
                     message.what = UIHandler.MessageType.ClientConnected.what();

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import com.vilyever.socketclient.util.IPUtil;`
`14`	`14`
`15`	`15`	`import java.util.ArrayList;`
	`16`	`+import java.util.Arrays;`
`16`	`17`
`17`	`18`	`public class MainActivity extends AppCompatActivity {`
`18`	`19`	`final MainActivity self = this;`
`@@ -75,6 +76,8 @@ public void onDisconnected(SocketClient client) {`
`75`	`76`	`@Override`
`76`	`77`	`public void onResponse(SocketClient client, @NonNull SocketResponsePacket responsePacket) {`
`77`	`78`	`Logger.log("size " + responsePacket.getData().length + " ->" + responsePacket.getMessage().replaceAll("\\r", ""));`
	`79`	`+ Logger.log("data " + Arrays.toString(responsePacket.getData()));`
	`80`	`+ Logger.log("crlf " + Arrays.toString("\r\n".getBytes()));`
`78`	`81`	`}`
`79`	`82`	`});`
`80`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,9 @@ public void onTick(long millisUntilFinished) {`
`389`	`389`
`390`	`390`	`@Override`
`391`	`391`	`public void onFinish() {`
`392`		`- this.start();`
	`392`	`+ if (self.isConnected()) {`
	`393`	`+ this.start();`
	`394`	`+ }`
`393`	`395`	`}`
`394`	`396`	`};`
`395`	`397`