code back

李攀
1 parent 7d114578
Showing 2 changed files with 30 additions and 13 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @5128ec2
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @5128ec2
@@ -30,7 +30,6 @@ import org.greenrobot.eventbus.EventBus;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.ref.WeakReference;
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -38,7 +37,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import static com.qnbar.smc.service.SocketService.JUST_OPEN_DOOR;
 import static com.qnbar.smc.service.SocketService.USER_OPEN_DOOR;
 import static com.qnbar.smc.service.SocketService.USER_OPEN_DOOR_AND_GET_MOVIE;
-import java.util.concurrent.atomic.AtomicBoolean;
 public class SocketService1 extends BaseService {
     private static final String TAG = "BackService1";
@@ -98,10 +96,10 @@ public class SocketService1 extends BaseService {
     //    public String testRoomSn = "R170413034374";
     public String testRoomSn = "c";
-//    private ReadThread mReadThread;
+    //    private ReadThread mReadThread;
     private Gson gson = new Gson();
-//    private WeakReference<Socket> mSocket;
+    //    private WeakReference<Socket> mSocket;
     private Socket socket = null;
     StringBuilder readingMsg = new StringBuilder();
@@ -115,11 +113,13 @@ public class SocketService1 extends BaseService {
         @Override
         public void run() {
-            Log.d(TAG, "heart beat");
             mHandler.postDelayed(this, HEART_BEAT_RATE);
+            LogUtils.d(TAG, "heart beat");
             //就发送一个HEART_BEAT_STRING过去 如果发送失败，就重新初始化一个socket
-            boolean isSuccess = sendMsg(new Gson().toJson(
-                    new SocketSendMsg().contractHeartBeatMsg(testRoomSn)) + END_SYMBOL);
+            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();
@@ -208,6 +208,7 @@ public class SocketService1 extends BaseService {
     ///begin socket operation
     private synchronized void initSocket() throws IOException {//初始化Socket
+        LogUtils.d(TAG, "initSocket!!" + i);
         if (socket != null && socket.isConnected()) {
             return;
         }
@@ -220,15 +221,21 @@ public class SocketService1 extends BaseService {
         });
         socket = new Socket(serverHost, serverPort);
         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);
+//        }
         Socket soc = socket;
         try {
             if (!soc.isClosed() && !soc.isOutputShutdown()) {
@@ -244,10 +251,12 @@ public class SocketService1 extends BaseService {
             releaseLastSocket();
             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();
@@ -256,12 +265,14 @@ 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;
         }
@@ -280,22 +291,28 @@ 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 (IOException e) {
             e.printStackTrace();
             releaseLastSocket();
+            LogUtils.d(TAG, "recvMsg false##" + i++);
             return false;
         }
-
+        LogUtils.d(TAG, "recvMsg##" + i++);
         return false;
     }
     private synchronized void clearConnect() {
+        LogUtils.d(TAG, "clearConnect$$" + i);
+
         mHandler.removeCallbacks(heartBeatRunnable);
         sendRegister.set(false);
         releaseLastSocket();
+        LogUtils.d(TAG, "recvMsg$$" + i++);
+
     }
     ///end socket operation
@@ -354,7 +371,7 @@ public class SocketService1 extends BaseService {
                 LogUtils.d(TAG, "begin to recv msg");
                 sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
-recvMsgTag:
+                recvMsgTag:
                 while (recvMsg(message)) {
                     sleepTime = sleepTime;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @5128ec2
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @5128ec2
@@ -86,7 +86,7 @@ public class FangTangApplication extends TelinkApplication {
                 .setLogHeadSwitch(true)// 设置log头信息开关，默认为开
                 .setLog2FileSwitch(true)// 打印log时是否存到文件的开关，默认关
                 .setDir("/sdcard/ft_log/")// 当自定义路径为空时，写入应用的/cache/log/目录中
-                .setBorderSwitch(true)// 输出日志是否带边框开关，默认开
+                .setBorderSwitch(false)// 输出日志是否带边框开关，默认开
                 .setConsoleFilter(LogUtils.V)// log的控制台过滤器，和logcat过滤器同理，默认Verbose
                 .setFileFilter(LogUtils.V);// log文件过滤器，和logcat过滤器同理，默认Verbose
         LogUtils.d(builder.toString());