code colear

@@ -12,6 +12,7 @@ import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.utils.ActivityCollector;
 import com.gimi.common.cinema.utils.CToast;
 import com.gimi.common.cinema.utils.LogUtils;
+import com.gimi.common.cinema.utils.NetStatusUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
@@ -29,6 +30,7 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.util.Arrays;
@@ -109,21 +111,15 @@ public class SocketService1 extends BaseService {
     AtomicBoolean sendRegister = new AtomicBoolean(false);
 
     private Runnable heartBeatRunnable = new Runnable() {
-        private static final String TAG = "HeartBeatThread";
-
         @Override
         public void run() {
             mHandler.postDelayed(this, HEART_BEAT_RATE);
-            LogUtils.d(TAG, "heart beat");
             //就发送一个HEART_BEAT_STRING过去 如果发送失败，就重新初始化一个socket
             final String s = new Gson().toJson(
                     new SocketSendMsg().contractHeartBeatMsg(testRoomSn));
-            LogUtils.d(TAG, "heart beat get s");
             boolean isSuccess = sendMsg(s + END_SYMBOL);
             if (!isSuccess) {
-                LogUtils.d(TAG, "heart beat error restart");
-//                clearConnect();
-//                new InitSocketThread().start();
+                LogUtils.d(TAG, "send heart beat error restart");
             }
         }
     };
@@ -153,8 +149,6 @@ public class SocketService1 extends BaseService {
     @Override
     public void onCreate() {
         super.onCreate();
-//        gson = new Gson();
-//        context = this;
         LogUtils.d(TAG, "onCreate");
     }
 
@@ -197,22 +191,22 @@ public class SocketService1 extends BaseService {
             e.printStackTrace();
             return super.onStartCommand(intent, flags, startId);
         }
-
-//        LogUtils.d(TAG, "socket service onCreate");
         new InitSocketThread().start();
         new ReadThread().start();
-        mHandler.post(heartBeatRunnable);
-
         return START_STICKY;
     }
 
     ///begin socket operation
     private synchronized void initSocket() throws IOException {//初始化Socket
-        LogUtils.d(TAG, "initSocket!!" + i);
         if (socket != null && socket.isConnected()) {
             return;
         }
-        LogUtils.d(TAG, "serverHost:serverPort:" + serverHost + ":" + serverPort);
+        boolean networkConnected = NetStatusUtils.isNetworkConnected(context);
+        boolean availableByPing = NetStatusUtils.isAvailableByPing("www.baidu.com");
+        boolean availableByPing1 = NetStatusUtils.isAvailableByPing(serverHost);
+        boolean availableByPing2 = NetStatusUtils.isAvailableByPing("192.168.200.241");
+        LogUtils.d(TAG, "initsocket serverHost:serverPort:" + serverHost + ":" + serverPort);
+        LogUtils.d(TAG, "networkConnected:" + networkConnected + ":baidu:" + availableByPing + ",serverHost:" + availableByPing1 + ",serverIp:" + availableByPing2);
         mHandler.post(new Runnable() {
             @Override
             public void run() {
@@ -220,22 +214,20 @@ public class SocketService1 extends BaseService {
             }
         });
         socket = new Socket(serverHost, serverPort);
+        socket.setSoTimeout(100);
         readingMsg.setLength(0);
-        LogUtils.d(TAG, "initSocket!!" + i++);
     }
 
 
-    int i = 0;
-
     private synchronized boolean sendMsg(String msg) {
-        LogUtils.d(TAG, "send msg start**:" + i);
         if (socket == null || !socket.isConnected()) {
-            LogUtils.d(TAG, "send msg end**" + i++);
             return false;
         }
-//        if (!msg.contains("20025")) {
-        LogUtils.d(TAG, "send msg:" + msg);
-//        }
+        if (!msg.contains("20025")) {
+            LogUtils.d(TAG, "send msg:" + msg);
+        } else {
+            LogUtils.d(TAG, "send heart beat msg:" + msg);
+        }
         Socket soc = socket;
         try {
             if (!soc.isClosed() && !soc.isOutputShutdown()) {
@@ -248,15 +240,13 @@ public class SocketService1 extends BaseService {
         } catch (IOException e) {
             LogUtils.d(TAG, "error" + e.getMessage());
             e.printStackTrace();
-            releaseLastSocket();
+            clearConnect();
             return false;
         }
-        LogUtils.d(TAG, "send msg end**" + i++);
         return true;
     }
 
     private synchronized void releaseLastSocket() {
-        LogUtils.d(TAG, "releaseLastSocket@@" + i);
         try {
             if (null != socket) {
                 socket.close();
@@ -265,14 +255,12 @@ public class SocketService1 extends BaseService {
             LogUtils.d(TAG, "error" + e.getMessage());
             e.printStackTrace();
         } finally {
-            LogUtils.d(TAG, "releaseLastSocket@@" + i);
             socket = null;
             readingMsg.setLength(0);
         }
     }
 
     private synchronized boolean recvMsg(StringBuilder msg) {
-        LogUtils.d(TAG, "recvMsg##" + i);
         if (null == socket || !socket.isConnected()) {
             return false;
         }
@@ -291,89 +279,78 @@ public class SocketService1 extends BaseService {
                     msg.setLength(0);
                     msg.append(readingMsg.substring(0, pos));
                     readingMsg.delete(0, pos + END_SYMBOL.length());
-                    LogUtils.d(TAG, "recvMsg##" + i++);
                     return true;
                 }
             }
+        } catch (InterruptedIOException e) {
+            return false;
         } catch (IOException e) {
             e.printStackTrace();
-            releaseLastSocket();
-            LogUtils.d(TAG, "recvMsg false##" + i++);
+            LogUtils.d(TAG, e.getMessage());
+            clearConnect();
             return false;
         }
-        LogUtils.d(TAG, "recvMsg##" + i++);
         return false;
     }
 
     private synchronized void clearConnect() {
-        LogUtils.d(TAG, "clearConnect$$" + i);
-
+        LogUtils.d(TAG, "clearConnect");
         mHandler.removeCallbacks(heartBeatRunnable);
         sendRegister.set(false);
         releaseLastSocket();
-        LogUtils.d(TAG, "recvMsg$$" + i++);
-
     }
     ///end socket operation
 
     class InitSocketThread extends Thread {
-        private static final String TAG = "HeartBeatThread";
-
         @Override
         public void run() {
-            super.run();
-            try {
-                initSocket();
-            } catch (IOException e) {
-                e.printStackTrace();
-                LogUtils.d(TAG, "init socket thread error,restart again after " + HEART_BEAT_RATE / 1000 + " seconds");
+            while (!isInterrupted()) {
+                try {
+                    initSocket();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    LogUtils.d(TAG, "init socket thread error,restart again after " + HEART_BEAT_RATE / 1000 + " seconds");
+                }
+
                 try {
-                    Thread.sleep(HEART_BEAT_RATE);
+                    Thread.sleep(1000);
                 } catch (InterruptedException e1) {
                     LogUtils.d(TAG, "error" + e1.getMessage());
                     e1.printStackTrace();
                 }
-                this.run();
             }
         }
     }
 
     // Thread to read content from Socket
     class ReadThread extends Thread {
-        private final String TAG = "ReadThread";
         private long sleepTime = 0;
 
         @Override
         public void run() {
             StringBuilder message = new StringBuilder();
-
-            LogUtils.d(TAG, "begin");
-
             while (!isInterrupted()) {
-                try {
-                    if (!sendRegister.get()) {
-                        LogUtils.d(TAG, "send register mes");
-                        SocketSendMsg ssm = new SocketSendMsg().contractRegisterMsg(testRoomSn);
-                        String msg = gson.toJson(ssm) + END_SYMBOL;
-                        if (!sendMsg(msg)) {
+                if (!sendRegister.get()) {
+                    LogUtils.d(TAG, "send register mes");
+                    SocketSendMsg ssm = new SocketSendMsg().contractRegisterMsg(testRoomSn);
+                    String msg = gson.toJson(ssm) + END_SYMBOL;
+                    if (!sendMsg(msg)) {
+                        try {
                             Thread.sleep(READ_THREAD_DEFAULT_SLEEP_MTIME);
-                            continue;
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
                         }
-                        LogUtils.d(TAG, "" + msg);
-                        sendRegister.set(true);
-                    } else {
-                        LogUtils.d(TAG, "already register");
+                        continue;
                     }
-                } catch (InterruptedException e) {
-                    continue;
+                    LogUtils.d(TAG, "" + msg);
+                    sendRegister.set(true);
                 }
 
                 LogUtils.d(TAG, "begin to recv msg");
 
                 sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
-                recvMsgTag:
                 while (recvMsg(message)) {
-                    sleepTime = sleepTime;
+                    sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
 
                     LogUtils.d(TAG, "recv msg:" + message);
                     SocketResponse socketResponse;
@@ -384,20 +361,18 @@ public class SocketService1 extends BaseService {
                         LogUtils.e(TAG, "invalid msg:", message + e.getMessage());
                         e.printStackTrace();
                         clearConnect();
-                        break recvMsgTag;
+                        break;
                     }
 
                     switch (socketResponse.getCode()) {
                         case SUCCESS_MESSAGE:
                             Log.d(TAG, "SUCCESS_MESSAGE");
                             break;
-
                         case VERIFY_SUCCESS:
                             LogUtils.d(TAG, "VERIFY_SUCCESS");
                             mHandler.post(heartBeatRunnable);
                             LogUtils.d(TAG, "verify success start heart beat");
                             break;
-
                         case HEART_BEAT_SUCCESS:
                             //每成功5次心跳判定是否启动main activity
                             if (++mainChargeCount == 5) {
@@ -415,18 +390,8 @@ public class SocketService1 extends BaseService {
                         case ROOM_SN_CONNECTED:
                             String msg1 = socketResponse.getCode() == HEART_BEAT_ERROR_SYMBOL ? "HEART_BEAT_ERROR_SYMBOL" : "ROOM_SN_CONNECTED";
                             LogUtils.d(TAG, msg1);
-//                            clearConnect();
-                            LogUtils.d(TAG, msg1 + " before:" + +System.currentTimeMillis());
-//                                try {
-//                                    Thread.sleep(10 * 1000);
-//                                } catch (InterruptedException e) {
-//                                    e.printStackTrace();
-//                                }
-                            sleepTime = 10 * 1000;
-                            LogUtils.d(TAG, msg1 + "  after:" + System.currentTimeMillis());
-//                            new InitSocketThread().start();
+                            clearConnect();
                             break;
-
                         case RETURN_VERIFY_CODE:
                             LogUtils.d(TAG, "RETURN_VERIFY_CODE");
                             if (!TextUtils.isEmpty(socketResponse.getData().getVerify())) {
@@ -436,7 +401,6 @@ public class SocketService1 extends BaseService {
                                 sendMsg(msg);
                             }
                             break;
-
                         case CONTAIN_MESSAGE:
                             LogUtils.d(TAG, "CONTAIN_MESSAGE");
                             if (socketResponse.getData() != null) {
@@ -494,21 +458,18 @@ public class SocketService1 extends BaseService {
                                 }
                             }
                             break;
-
                         default:
-                            LogUtils.d(TAG, "default msg:" + socketResponse.toString());
+                            clearConnect();
+                            LogUtils.d(TAG, "default msg clearConnect:" + socketResponse.toString());
                     }
                     LogUtils.d(TAG, "recv msg:" + message);
                 }
-
                 try {
                     Thread.sleep(sleepTime);
                 } catch (InterruptedException e) {
                     continue;
                 }
             }
-
-            LogUtils.d(TAG, "end");
         }
     }
 
@@ -521,8 +482,6 @@ public class SocketService1 extends BaseService {
 
     @Override
     public void onDestroy() {
-//        LogUtils.d("BaseService1", this.getClass().toString() + "");
-//        ServiceCommandCollector.removeService(this);
         LogUtils.d(TAG, "socket service destroy");
         super.onDestroy();
     }

@@ -226,6 +226,7 @@
                 android:layout_height="wrap_content"
                 android:paddingBottom="@dimen/copyright_padding"
                 android:gravity="center|bottom"
+                android:visibility="gone"
                 android:textColor="@color/white"
                 android:text="@string/copyright"/>