@@ -126,6 +126,16 @@ public static String executeShellCommand(IDevice device, String command) {
         return output.getOutput();
     }
 
+    /**
+     * TODO: 添加自定义adb命令，原因是安卓手表的传输速度太慢，导致adb push超时错误
+     * @param device
+     * @param command
+     * @return
+     */
+    public static String executeCommand(IDevice device, String command) {
+        return "";
+    }
+
     private ListenableFuture<List<AdbForward>> executeGetForwardList() {
         final File adbFile = new File(AdbServer.server().adbPath);
         final SettableFuture future = SettableFuture.create();
 
@@ -217,12 +217,11 @@ void sendShot(ChannelHandlerContext ctx, Command command) {
         DefaultFullHttpResponse onHttp(FullHttpRequest req) {
             String uri = req.uri();
             String uriPath = uri.substring(uri.indexOf("/") + 1);
-            System.out.println("http://" + uriPath);
             if (uriPath.startsWith("shot")) {
                 // 获取serialNumber
-                String[] s = uri.split("/");
+                String[] s = uriPath.split("/");
                 if (s.length == 2) {
-                    return new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, Unpooled.copiedBuffer(new Minicap(s[2]).takeScreenShot()));
+                    return new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, Unpooled.copiedBuffer(new Minicap(s[1]).takeScreenShot()));
                 } else {
                     return new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_FOUND);
                 }
 
@@ -180,7 +180,8 @@ private void removeForward(AdbForward forward) {
      * @return
      */
     public byte[] takeScreenShot() {
-        String command = getMinicapCommand(deviceSize.w, deviceSize.h, 1080, 1920, 0, false, "minicap", new String[] {"-s -b"});
+        String command = getMinicapCommand(deviceSize.w, deviceSize.h, deviceSize.w, deviceSize.h, 0, false, "minicap", new String[] {"-s -b"});
+        System.out.println("takeScreenShot:" + command);
         BinaryOutputReceiver receiver = new BinaryOutputReceiver();
         try {
             device.executeShellCommand(command, receiver, 0);