@@ -30,9 +30,6 @@ public LocalClient(Protocol protocol) {
 
 
     public void executeCommand(ChannelHandlerContext ctx, Command command) {
-        if (command.getSchem() != Command.Schem.WAITTING && command.getSchem() != Command.Schem.TOUCH) {
-            System.out.println(command.getContent());
-        }
         switch (command.getSchem()) {
             case START:
                 startCommand(ctx, command);
 
@@ -62,7 +62,6 @@ public void onConnected(WebSocket websocket, Map<String, List<String>> headers)
 
     @Override
     public void onTextMessage(WebSocket websocket, String text) throws Exception {
-        System.out.println(text);
         Command command = Command.ParseCommand(text);
         if (command != null) {
             switch (command.getSchem()) {
 
@@ -82,7 +82,6 @@ public void onDisconnect(ChannelHandlerContext ctx) {
 
         @Override
         public void onTextMessage(ChannelHandlerContext ctx, String text) {
-            System.out.println(text);
             Command command = Command.ParseCommand(text);
             if (command != null) {
                 switch (command.getSchem()) {
@@ -183,7 +182,6 @@ void forwardCommand(ChannelHandlerContext ctx, Command command) {
             ChannelHandlerContext sendTo = null;
 
             if (ctx == protocol.getBroswerSocket()) {
-                System.out.println("转发:" + command.getCommandString());
                 sendTo = protocol.getClientSocket();
             } else {
                 sendTo = protocol.getBroswerSocket();
 
@@ -162,6 +162,18 @@ public AdbForward createForward() {
         return forward;
     }
 
+    private void removeForward(AdbForward forward) {
+        if (forward == null || !forward.isForward()) {
+            return;
+        }
+        try {
+            device.removeForward(forward.getPort(), forward.getLocalabstract(), IDevice.DeviceUnixSocketNamespace.ABSTRACT);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("remove forward failed");
+        }
+    }
+
     /**
      * 屏幕截图
      *
@@ -400,6 +412,7 @@ private void onStartup(boolean success) {
     private void onClose() {
         for (MinicapListener listener : listenerList) {
             listener.onClose(this);
+            removeForward(forward);
         }
     }
 
@@ -427,6 +440,7 @@ private class DataReader implements Runnable {
                 this.inputStream = minicapSocket.getInputStream();
             } catch (IOException e) {
                 e.printStackTrace();
+                onClose();
             }
         }
 
@@ -435,7 +449,8 @@ public void run() {
             try {
                 readData();
             } catch (IOException e) {
-                e.printStackTrace();
+                System.out.println("lost connection: " + e.getMessage());
+                onClose();
             }
         }
 
@@ -473,7 +488,8 @@ public void run() {
                     banner = new Banner();
                     readData();
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    System.out.println(e.getMessage());
+                    onClose();
                 }
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,18 @@ public AdbForward createForward() {`
`162`	`162`	`return forward;`
`163`	`163`	`}`
`164`	`164`
	`165`	`+ private void removeForward(AdbForward forward) {`
	`166`	`+ if (forward == null \|\| !forward.isForward()) {`
	`167`	`+ return;`
	`168`	`+ }`
	`169`	`+ try {`
	`170`	`+ device.removeForward(forward.getPort(), forward.getLocalabstract(), IDevice.DeviceUnixSocketNamespace.ABSTRACT);`
	`171`	`+ } catch (Exception e) {`
	`172`	`+ e.printStackTrace();`
	`173`	`+ System.out.println("remove forward failed");`
	`174`	`+ }`
	`175`	`+ }`
	`176`	`+`
`165`	`177`	`/**`
`166`	`178`	`* 屏幕截图`
`167`	`179`	`*`
`@@ -400,6 +412,7 @@ private void onStartup(boolean success) {`
`400`	`412`	`private void onClose() {`
`401`	`413`	`for (MinicapListener listener : listenerList) {`
`402`	`414`	`listener.onClose(this);`
	`415`	`+ removeForward(forward);`
`403`	`416`	`}`
`404`	`417`	`}`
`405`	`418`
`@@ -427,6 +440,7 @@ private class DataReader implements Runnable {`
`427`	`440`	`this.inputStream = minicapSocket.getInputStream();`
`428`	`441`	`} catch (IOException e) {`
`429`	`442`	`e.printStackTrace();`
	`443`	`+ onClose();`
`430`	`444`	`}`
`431`	`445`	`}`
`432`	`446`
`@@ -435,7 +449,8 @@ public void run() {`
`435`	`449`	`try {`
`436`	`450`	`readData();`
`437`	`451`	`} catch (IOException e) {`
`438`		`- e.printStackTrace();`
	`452`	`+ System.out.println("lost connection: " + e.getMessage());`
	`453`	`+ onClose();`
`439`	`454`	`}`
`440`	`455`	`}`
`441`	`456`
`@@ -473,7 +488,8 @@ public void run() {`
`473`	`488`	`banner = new Banner();`
`474`	`489`	`readData();`
`475`	`490`	`} catch (InterruptedException e) {`
`476`		`- e.printStackTrace();`
	`491`	`+ System.out.println(e.getMessage());`
	`492`	`+ onClose();`
`477`	`493`	`}`
`478`	`494`	`}`
`479`	`495`	`}`