添加对手表、电视等传输效率低下导致超时的处理方法

harry · harry · commit ace27d0a1901 · 2017-06-17T22:50:52.000+08:00
diff --git a/src/main/java/com/yeetor/adb/AdbServer.java b/src/main/java/com/yeetor/adb/AdbServer.java
@@ -129,11 +129,58 @@ public static String executeShellCommand(IDevice device, String command) {
     /**
      * TODO: 添加自定义adb命令，原因是安卓手表的传输速度太慢，导致adb push超时错误
      * @param device
-     * @param command
      * @return
      */
-    public static String executeCommand(IDevice device, String command) {
-        return "";
+    public String executePushFile(IDevice device, String src, String dst) {
+        final File adbFile = new File(AdbServer.server().adbPath);
+        final SettableFuture future = SettableFuture.create();
+        (new Thread(new Runnable() {
+            public void run() {
+                ProcessBuilder pb = new ProcessBuilder(new String[]{adbFile.getPath(), "push", src, dst});
+                pb.redirectErrorStream(true);
+                Process p = null;
+
+                try {
+                    p = pb.start();
+                } catch (IOException e) {
+                    future.setException(e);
+                    return;
+                }
+
+                StringBuilder sb = new StringBuilder();
+                BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+
+                try {
+                    String line;
+                    try {
+                        while((line = br.readLine()) != null) {
+                            sb.append(line);
+                        }
+                        future.set(sb.toString());
+                        return;
+                    } catch (IOException ex) {
+                        future.setException(ex);
+                        return;
+                    }
+                } finally {
+                    try {
+                        br.close();
+                    } catch (IOException ex) {
+                        future.setException(ex);
+                    }
+
+                }
+            }
+        }, "Obtaining adb version")).start();
+
+        String s = "";
+
+        try {
+            s = (String) future.get(30, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            return null;
+        }
+        return s;
     }
 
     private ListenableFuture<List<AdbForward>> executeGetForwardList() {
diff --git a/src/main/java/com/yeetor/engine/EngineDevice.java b/src/main/java/com/yeetor/engine/EngineDevice.java
@@ -3,7 +3,6 @@
 import com.android.ddmlib.IDevice;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.yeetor.adb.AdbServer;
 import com.yeetor.minitouch.Minitouch;
 import com.yeetor.minitouch.MinitouchListener;
diff --git a/src/main/java/com/yeetor/minicap/Minicap.java b/src/main/java/com/yeetor/minicap/Minicap.java
@@ -67,7 +67,7 @@ public static void installMinicap(IDevice device) throws MinicapInstallException
             throw new MinicapInstallException("File: " + minicap_bin.getAbsolutePath() + " not exists!");
         }
         try {
-            device.pushFile(minicap_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_BIN);
+            AdbServer.server().executePushFile(device, minicap_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_BIN);
         } catch (Exception e) {
             throw new MinicapInstallException(e.getMessage());
         }
@@ -81,7 +81,7 @@ public static void installMinicap(IDevice device) throws MinicapInstallException
         }
 
         try {
-            device.pushFile(minicap_so.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_SO);
+            AdbServer.server().executePushFile(device, minicap_so.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_SO);
         } catch (Exception e) {
             throw new MinicapInstallException(e.getMessage());
         }
diff --git a/src/main/java/com/yeetor/minitouch/Minitouch.java b/src/main/java/com/yeetor/minitouch/Minitouch.java
@@ -54,7 +54,7 @@ public static void installMinitouch(IDevice device) throws MinitouchInstallExcep
             throw new MinitouchInstallException("File: " + minitouch_bin.getAbsolutePath() + " not exists!");
         }
         try {
-            device.pushFile(minitouch_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINITOUCH_BIN);
+            AdbServer.server().executePushFile(device, minitouch_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINITOUCH_BIN);
         } catch (Exception e) {
             throw new MinitouchInstallException(e.getMessage());
         }
@@ -112,6 +112,7 @@ public void start() {
         String command = "/data/local/tmp/minitouch" + " -n " + forward.getLocalabstract();
         minitouchThread = startMinitouchThread(command);
         minitouchInitialThread = startInitialThread("127.0.0.1", forward.getPort());
+        System.out.println(command);
     }
 
     public void kill() {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public static void installMinicap(IDevice device) throws MinicapInstallException`
`67`	`67`	`throw new MinicapInstallException("File: " + minicap_bin.getAbsolutePath() + " not exists!");`
`68`	`68`	`}`
`69`	`69`	`try {`
`70`		`- device.pushFile(minicap_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_BIN);`
	`70`	`+ AdbServer.server().executePushFile(device, minicap_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_BIN);`
`71`	`71`	`} catch (Exception e) {`
`72`	`72`	`throw new MinicapInstallException(e.getMessage());`
`73`	`73`	`}`
`@@ -81,7 +81,7 @@ public static void installMinicap(IDevice device) throws MinicapInstallException`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`try {`
`84`		`- device.pushFile(minicap_so.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_SO);`
	`84`	`+ AdbServer.server().executePushFile(device, minicap_so.getAbsolutePath(), REMOTE_PATH + "/" + MINICAP_SO);`
`85`	`85`	`} catch (Exception e) {`
`86`	`86`	`throw new MinicapInstallException(e.getMessage());`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static void installMinitouch(IDevice device) throws MinitouchInstallExcep`
`54`	`54`	`throw new MinitouchInstallException("File: " + minitouch_bin.getAbsolutePath() + " not exists!");`
`55`	`55`	`}`
`56`	`56`	`try {`
`57`		`- device.pushFile(minitouch_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINITOUCH_BIN);`
	`57`	`+ AdbServer.server().executePushFile(device, minitouch_bin.getAbsolutePath(), REMOTE_PATH + "/" + MINITOUCH_BIN);`
`58`	`58`	`} catch (Exception e) {`
`59`	`59`	`throw new MinitouchInstallException(e.getMessage());`
`60`	`60`	`}`
`@@ -112,6 +112,7 @@ public void start() {`
`112`	`112`	`String command = "/data/local/tmp/minitouch" + " -n " + forward.getLocalabstract();`
`113`	`113`	`minitouchThread = startMinitouchThread(command);`
`114`	`114`	`minitouchInitialThread = startInitialThread("127.0.0.1", forward.getPort());`
	`115`	`+ System.out.println(command);`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`public void kill() {`