投影控制socket993超时问题修复

@@ -146,8 +146,6 @@ public class SocketService1 extends BaseService {
 
         public void onServiceDisconnected(ComponentName className) {
         }
-
-        ;
     };
 
     public Runnable heartBeatRunnable = new Runnable() {
@@ -328,21 +326,41 @@ public class SocketService1 extends BaseService {
             return false;
         }
         try {
+            if (readingMsg.length() > 0) {
+                int pos = readingMsg.indexOf(END_SYMBOL);
+                if (pos != -1) {
+                    msg.setLength(0);
+                    msg.append(readingMsg.substring(0, pos));
+                    readingMsg.delete(0, pos + END_SYMBOL.length());
+//                    if (msg.length() > 55) {
+                        LogUtils.d("recvMsg","from last:"+msg.length()+":"+msg);
+//                    }
+                    return true;
+                }
+            }
             InputStream is = socket.getInputStream();
             byte[] buffer = new byte[1024];
             int length = 0;
+            int msgId = 0;
             while (!socket.isClosed()
                     && !socket.isInputShutdown()
                     && ((length = is.read(buffer)) > 0)) {
                 String tmp = new String(Arrays.copyOf(buffer, length));
+//                if (length > 55) {
+                    LogUtils.d("recvMsg", msgId + ":" + length + ":" + tmp);
+//                }
                 readingMsg.append(tmp);
                 int pos = readingMsg.indexOf(END_SYMBOL);
                 if (pos != -1) {
                     msg.setLength(0);
                     msg.append(readingMsg.substring(0, pos));
                     readingMsg.delete(0, pos + END_SYMBOL.length());
+//                    if (length > 55) {
+                        LogUtils.d("recvMsg", msgId + ":" + length + ":" + msg);
+//                    }
                     return true;
                 }
+                msgId ++;
             }
         } catch (InterruptedIOException e) {
             return false;
@@ -412,7 +430,9 @@ public class SocketService1 extends BaseService {
                 sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
                 while (recvMsg(message)) {
                     sleepTime = READ_THREAD_DEFAULT_SLEEP_MTIME;
-
+//                    if (message.length() > 55) {
+                        LogUtils.d("recvMsg",  "logic:" + message);
+//                    }
                     LogUtils.d(TAG, "recv msg:" + message);
                     MainResponse socketResponse;
                     try {
@@ -472,6 +492,7 @@ public class SocketService1 extends BaseService {
                         case CONTAIN_MESSAGE:
                             heartBeatErrorCount.set(0);
                             LogUtils.i(TAG, "CONTAIN_MESSAGE");
+//                            Log.d("getctrl","收到有命令的返回");
                             serverCommandDeal(socketResponse);
                             break;
                         default:
@@ -513,6 +534,7 @@ public class SocketService1 extends BaseService {
                     OpenDoor openDoorResponse = gson.fromJson(socketResponse.getData(), OpenDoor.class);
                     openDoor(openDoorResponse);
                 }
+//                Log.d("getctrl","开门");
                 break;
             case CLEAN_OVER://清洁完成处理
                 LogUtils.i("LightOperationUtils", "admin clean over close light");
@@ -537,7 +559,7 @@ public class SocketService1 extends BaseService {
                 break;
 
             case REPORT_EQU_STATUS://获取声音,灯光,播放暂停状态
-                Log.d("ReportInfo", "收到上报命令");
+//                Log.d("ReportInfo", "收到上报命令");
                 //获取serverId
                 ReportEquStatus rps = gson.fromJson(socketResponse.getData(), ReportEquStatus.class);
 //                String serverId = rps.getServerId();
@@ -545,6 +567,7 @@ public class SocketService1 extends BaseService {
                 break;
 
             case SET_EQU_STATUS://设置声音,灯光,播放暂停
+//                Log.d("getctrl","收到控制命令");
                 Log.d("ReportInfo", "收到控制命令:" + socketResponse.getData());
                 EquipmentControl equc = gson.fromJson(socketResponse.getData(), EquipmentControl.class);
                 setEquipmentStatus(equc);
@@ -680,13 +703,13 @@ public class SocketService1 extends BaseService {
 
         setAudioVolume(equc.getAudioCtl());
 
-        if (equc.getLightCtl() != 0) {
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
+//        if (equc.getLightCtl() != 0) {
+//            try {
+//                Thread.sleep(500);
+//            } catch (InterruptedException e) {
+//                e.printStackTrace();
+//            }
+//        }
         reportEquStatus(equc.getServerId(), equc.getLightCtl());
     }