Coder698
diff --git a/‎src/com/yeetor/minicap/Minicap.java‎
Lines changed: 38 additions & 4 deletions b/‎src/com/yeetor/minicap/Minicap.java‎
Lines changed: 38 additions & 4 deletions
diff --git a/‎src/com/yeetor/minitouch/Minitouch.java‎
Lines changed: 14 additions & 0 deletions b/‎src/com/yeetor/minitouch/Minitouch.java‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/com/yeetor/p2p/Protocol.java‎
Lines changed: 14 additions & 0 deletions b/‎src/com/yeetor/p2p/Protocol.java‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/com/yeetor/p2p/WSServer.java‎
Lines changed: 2 additions & 0 deletions b/‎src/com/yeetor/p2p/WSServer.java‎
Lines changed: 2 additions & 0 deletions
@@ -54,6 +54,8 @@ public class Minicap {
 
     private Banner banner;
 
+    private Socket minicapSocket;
+
 
     public static void installMinicap(IDevice device) throws MinicapInstallException {
         if (device == null) {
@@ -245,6 +247,38 @@ public void reStart(final float scale, final int rotate) {
         start(scale, rotate);
     }
 
+    public void kill() {
+        running = false;
+        if (minicapThread != null) {
+            minicapThread.stop();
+        }
+
+        // 关闭socket
+        if (minicapSocket != null && minicapSocket.isConnected()) {
+            try {
+                minicapSocket.close();
+            } catch (IOException e) {
+            }
+            minicapSocket = null;
+        }
+
+        if (dataReaderThread != null) {
+            try {
+                dataReaderThread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (imageParserThread != null) {
+            try {
+                imageParserThread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     /**
      * 启动线程开启 minicap
      * @param shellCommand
@@ -286,22 +320,22 @@ public void run() {
                     int tryTime = 20;
                     while (true) {
                         // 连接minicap启动的服务
-                        Socket socket = new Socket(host, port);
-                        InputStream inputStream = socket.getInputStream();
+                        minicapSocket = new Socket(host, port);
+                        InputStream inputStream = minicapSocket.getInputStream();
                         bytes = new byte[4096];
                         int n = inputStream.read(bytes);
 
                         if (n == -1) {
                             Thread.sleep(10);
-                            socket.close();
+                            minicapSocket.close();
                         } else {
                             // bytes内包含有信息，需要给Dataparser处理
                             dataQueue.add(Arrays.copyOfRange(bytes, 0, n));
                             running = true;
                             onStartup(true);
 
                             // 启动 DataReader  ImageParser
-                            dataReaderThread = startDataReaderThread(socket);
+                            dataReaderThread = startDataReaderThread(minicapSocket);
                             imageParserThread = startImageParserThread();
                             break;
                         }
 
@@ -98,6 +98,20 @@ public void start() {
         minitouchInitialThread = startInitialThread("127.0.0.1", forward.getPort());
     }
 
+    public void kill() {
+        if (minitouchThread != null) {
+            minitouchThread.stop();
+        }
+        // 关闭socket
+        if (minitouchSocket != null && minitouchSocket.isConnected()) {
+            try {
+                minitouchSocket.close();
+            } catch (IOException e) {
+            }
+            minitouchSocket = null;
+        }
+    }
+
     public void sendEvent(String str) {
         if (minitouchOutputStream == null) {
             return;
 
@@ -75,4 +75,18 @@ public Minitouch getMinitouch() {
     public LocalClient getLocalClient() {
         return localClient;
     }
+
+    public void close() {
+
+        if (minicap != null) {
+            minicap.kill();
+            minicap = null;
+        }
+
+        if (minitouch != null) {
+            minitouch.kill();
+            minitouch = null;
+        }
+
+    }
 }
@@ -67,12 +67,14 @@ public void onDisconnect(ChannelHandlerContext ctx) {
             for (Protocol protocol : protocolList) {
                 if (protocol.getBroswerSocket() != null && protocol.getBroswerSocket() == ctx) {
                     protocol.broswerDisconnect();
+                    protocol.close();
                     protocolList.remove(protocol);
                     break;
                 }
 
                 if (protocol.getClientSocket() != null && protocol.getClientSocket() == ctx) {
                     protocol.clientDisconnect();
+                    protocol.close();
                     protocolList.remove(protocol);
                     break;
                 }
Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,14 @@ public void onDisconnect(ChannelHandlerContext ctx) {`
`67`	`67`	`for (Protocol protocol : protocolList) {`
`68`	`68`	`if (protocol.getBroswerSocket() != null && protocol.getBroswerSocket() == ctx) {`
`69`	`69`	`protocol.broswerDisconnect();`
	`70`	`+ protocol.close();`
`70`	`71`	`protocolList.remove(protocol);`
`71`	`72`	`break;`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`if (protocol.getClientSocket() != null && protocol.getClientSocket() == ctx) {`
`75`	`76`	`protocol.clientDisconnect();`
	`77`	`+ protocol.close();`
`76`	`78`	`protocolList.remove(protocol);`
`77`	`79`	`break;`
`78`	`80`	`}`