精简日志

app/src/main/java/org/las2mile/okio/OkIoClient.java

@@ -76,7 +76,7 @@ public class OkIoClient extends Thread{
                         if(packet.cmd == BaseMsg.RESP_REQUEST_LOGZIP){
                             LogFileMsgResp logFileMsgResp = new LogFileMsgResp();
                             logFileMsgResp.decodeData(packet.mBaseMsgBuffer, (short) packet.mBaseMsgBuffer.size());
-                            Ln.e("file size:"+logFileMsgResp.fileSize+"  "+logFileMsgResp.pktNo+"/"+logFileMsgResp.pktNums+ " client zipfile "+logFileMsgResp.toString());
+                            //Ln.e("file size:"+logFileMsgResp.fileSize+"  "+logFileMsgResp.pktNo+"/"+logFileMsgResp.pktNums+ " client zipfile "+logFileMsgResp.toString());
                             DownTaskHandler downTaskHandler = peddingDownloadTasks.get(Integer.valueOf(logFileMsgResp.taskId));
                             int writtenPercent = downTaskHandler.store(logFileMsgResp.offset,logFileMsgResp.samples,logFileMsgResp.sampleSize,logFileMsgResp.pktNums,logFileMsgResp.pktNo,logFileMsgResp.fileSize);
                             logFileMsgResp.zipPath = downTaskHandler.mZipPath;//用于显示文件路径
@@ -88,7 +88,7 @@ public class OkIoClient extends Thread{
                         } else if(packet.cmd == BaseMsg.RESP_LOGZIP_END){
                             LogFileEndMsgResp logFileEndMsgResp = new LogFileEndMsgResp();
                             logFileEndMsgResp.decodeData(packet.mBaseMsgBuffer, (short) packet.mBaseMsgBuffer.size());
-                            Ln.e("client zipfile end----------------------------------"+logFileEndMsgResp.toString());
+                            Ln.e("client zipfile end"/*----------------------------------"+logFileEndMsgResp.toString()*/);
                             DownTaskHandler downTaskHandler = peddingDownloadTasks.get(Integer.valueOf(logFileEndMsgResp.taskId));
                             LogFileLostMsg logFileLostMsg = (LogFileLostMsg)downTaskHandler.checkLost(Integer.valueOf(logFileEndMsgResp.taskId));
                             send(logFileLostMsg);
@@ -105,7 +105,7 @@ public class OkIoClient extends Thread{
                         } else if(packet.cmd == BaseMsg.REQ_HARTBEAT){
                             HartBeatMsgResp msgResp = new HartBeatMsgResp();
                             msgResp.decodeData(packet.mBaseMsgBuffer, (short) packet.mBaseMsgBuffer.size());
-                            Ln.e("client heartbeat end----------------------------------"+msgResp.toString());
+                            Ln.e("client hb end"/*----------------------------------"+msgResp.toString()*/);
                             if(mOnOkIoMsgListener != null){
                                 mOnOkIoMsgListener.onOkIoMsg(msgResp);
                             }
@@ -160,7 +160,7 @@ public class OkIoClient extends Thread{
                 try {
                     OkIoPacket packet =  new OkIoPacket();
                     byte[] data = packet.assemblePacket(baseMsg);
-                    Ln.e("client send "+OkIoPacketDecode.toHexString(data));
+                    Ln.e("client send "/*+OkIoPacketDecode.toHexString(data)*/);
                     mBufferedSink.write(data);
                     mBufferedSink.flush();
                 } catch (IOException e) {

app/src/main/java/org/las2mile/okio/client/DownTaskHandler.java

@@ -76,7 +76,7 @@ public class DownTaskHandler {
                 lostPkts.add(Integer.valueOf(i));
             }
         }
-        Ln.i(mSum+" client zipfile recvied "+receivedPkts);
+        Ln.i(mSum+" client zipfile recvied "/*+receivedPkts*/);
         Ln.i("client zipfile lost "+lostPkts);
         LogFileLostMsg logFileLostMsg = new LogFileLostMsg();
         short lostsize  = (short)lostPkts.size();

app/src/main/java/org/las2mile/scrcpy/SendCommands.java

@@ -145,7 +145,7 @@ public class SendCommands {
         if (sock != null && status ==1) {
             try {
                 adb = AdbConnection.create(sock, crypto);
-                Log.e(LOG_TAG, "adbd create ok? "+adb);
+                Log.e(LOG_TAG, "adbd create ok? ");
                 adb.connect();
             } catch (IllegalStateException e) {
                 Log.e(LOG_TAG, "adbd connect error");

server/src/main/java/org/las2mile/okio/OkIOServer.java

@@ -83,7 +83,7 @@ public class OkIOServer extends Thread{
                                 if(packet.cmd == BaseMsg.REQ_REQUEST_LOGFILE){
                                     LogFileMsgReq reqLogFileMsg = new LogFileMsgReq();
                                     reqLogFileMsg.decodeData(packet.mBaseMsgBuffer, (short) packet.mBaseMsgBuffer.size());
-                                    Ln.e("server process cmd "+reqLogFileMsg.toString());
+                                    //Ln.e("server process cmd "+reqLogFileMsg.toString());
                                     LogZipFileProcedure logZipFileProcedure =  new LogZipFileProcedure(sink,reqLogFileMsg.procedureType);
                                     //logZipFileProcedure.taskId = reqLogFileMsg.taskId;
                                     logZipFileProcedure.createTask(reqLogFileMsg.taskId);

server/src/main/java/org/las2mile/okio/server/LogZipFileProcedure.java

@@ -102,7 +102,7 @@ public class LogZipFileProcedure {
             buffer.write(dataResp);
         }
 
-        Ln.i(" zip server send "+OkIoPacketDecode.toHexString(buffer.clone().readByteArray()));
+        //Ln.i(" zip server send "+OkIoPacketDecode.toHexString(buffer.clone().readByteArray()));
         mSink.write(buffer.readByteArray());
         mSink.flush();
     }
@@ -124,7 +124,7 @@ public class LogZipFileProcedure {
     private void send05F0(short packetNo) throws IOException {
         FileInputStream fis = new FileInputStream(zipPath);
         int available = fis.available() - packetNo * packetSize;
-        Ln.i("日志文件 "+zipPath+" 剩余大小 "+ available+"/"+fileSize +" packetNo "+packetNo+"/"+packetSum);
+        //Ln.i("日志文件 "+zipPath+" 剩余大小 "+ available+"/"+fileSize +" packetNo "+packetNo+"/"+packetSum);
         fis.skip((long) packetNo * packetSize);
         int readSize = Math.min(available, packetSize);
         byte[] bytes = new byte[readSize];
@@ -144,11 +144,11 @@ public class LogZipFileProcedure {
         logFileMsgResp.setOffset(packetNo * packetSize);
         logFileMsgResp.setSamples(bytes,read);
         sendMsg(logFileMsgResp);
-        Ln.i("server send "+packetNo+"/"+packetSum+" per size "+packetSize /*+logFileMsgResp.toString()*/);
+        //Ln.i("server send "+packetNo+"/"+packetSum+" per size "+packetSize /*+logFileMsgResp.toString()*/);
     }
 
     private void send05F1() throws IOException {
-        Ln.i("server send05F1 ");
+        Ln.i("server file end ");
         LogFileEndMsgResp logFileEndMsgResp = new LogFileEndMsgResp();
         logFileEndMsgResp.taskId = taskId;
         sendMsg(logFileEndMsgResp);
@@ -157,7 +157,7 @@ public class LogZipFileProcedure {
     private void sendMsg(BaseMsg baseMsg) throws IOException {
         OkIoPacket respPkt = new OkIoPacket();
         byte dataResp[] = respPkt.assemblePacket(baseMsg);
-        Ln.i(dataResp.length+" zip server send "/*+ OkIoPacketDecode.toHexString(dataResp)*/);
+        //Ln.i(dataResp.length+" zip server send "/*+ OkIoPacketDecode.toHexString(dataResp)*/);
         mSink.write(dataResp);
         mSink.flush();
         try {

server/src/main/java/org/las2mile/okio/utils/ZipUtils.java

@@ -35,24 +35,24 @@ public class ZipUtils {
     private static void zip(ZipOutputStream zipOutputStream, String name, File fileSrc) throws IOException {
 
         if (fileSrc.isDirectory()) {
-            Ln.e("需要压缩的地址是目录");
+            //Ln.e("需要压缩的地址是目录");
             File[] files = fileSrc.listFiles();
 
             name = name+"/";
             zipOutputStream.putNextEntry(new ZipEntry(name));  // 建一个文件夹
-            Ln.e("目录名: "+name);
+            //Ln.e("目录名: "+name);
 
             for (File f : files) {
                 zip(zipOutputStream,name+f.getName(),f);
-                Ln.e("目录: "+name+f.getName());
+                //Ln.e("目录: "+name+f.getName());
             }
 
         }else {
-            Ln.e("需要压缩的地址是文件");
+            //Ln.e("需要压缩的地址是文件");
             zipOutputStream.putNextEntry(new ZipEntry(name));
-            Ln.e("文件名: "+name);
+            //Ln.e("文件名: "+name);
             FileInputStream input = new FileInputStream(fileSrc);
-            Ln.e("文件路径: "+fileSrc);
+            //Ln.e("文件路径: "+fileSrc);
             byte[] buf = new byte[1024];
             int len = -1;