From ac55b507e9745b60d4c677ee356a470cb68266e4 Mon Sep 17 00:00:00 2001
From: Goblin911 <goblinliu@gmail.com>
Date: Mon, 26 Aug 2013 22:05:40 +0800
Subject: network has fixed and can reach settingsAct

---
 client/Piztor/src/com/macaroon/piztor/SocketClient.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'client/Piztor/src/com/macaroon/piztor/SocketClient.java')

diff --git a/client/Piztor/src/com/macaroon/piztor/SocketClient.java b/client/Piztor/src/com/macaroon/piztor/SocketClient.java
index 703b974..f97e397 100644
--- a/client/Piztor/src/com/macaroon/piztor/SocketClient.java
+++ b/client/Piztor/src/com/macaroon/piztor/SocketClient.java
@@ -4,6 +4,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.util.Locale;
 import java.util.Vector;
@@ -14,21 +15,22 @@ import android.os.Message;
 public class SocketClient {
 	static Socket client;
 
-	public SocketClient(String site, int port) throws UnknownHostException,
+	public SocketClient(String site, int port, int retime) throws UnknownHostException,
 			IOException {
 		try {
 			client = new Socket(site, port);
-			client.setSoTimeout(1000);
+			client.setSoTimeout(retime);
 		} catch (UnknownHostException e) {
+			e.printStackTrace();
 			throw e;
 		} catch (IOException e) {
+			e.printStackTrace();
 			throw e;
 		}
 	}
 
-	public void sendMsg(Req req,Handler recall) throws IOException {
+	public int sendMsg(Req req,Handler recall) throws IOException,SocketTimeoutException {
 		try {
-			
 			DataOutputStream out = new DataOutputStream(
 					client.getOutputStream());
 			int tmp = req.type;
@@ -163,10 +165,14 @@ public class SocketClient {
 				recall.sendMessage(msg);
 				break;
 			}
+			return 0;
 
+		} catch (SocketTimeoutException e){
+			System.out.println("Time out!");
+			return 1;			
 		} catch (IOException e) {
 			throw e;
-		}
+		} 
 	}
 
 	public void closeSocket() throws IOException{
-- 
cgit v1.2.3