@@ -62,3 +62,4 @@ RemoteControl是一个服务器，简单来说，如果你只有这个，而没
 * 服务器支持
 * 流压缩(h264)
 * 目前获取已连接手机全部是通过adb获取，速度较慢。将用usb监听来实时监控手机的连接和信息
+* 内置WEB服务器，提供网页客户端功能
@@ -24,14 +24,9 @@
 
 package com.yeetor;
 
-import com.neovisionaries.ws.client.WebSocketException;
-import com.yeetor.adb.AdbDevice;
 import com.yeetor.adb.AdbServer;
-import com.yeetor.androidcontrol.client.RemoteClient;
-import com.yeetor.androidcontrol.server.LocalServer;
-import com.yeetor.androidcontrol.server.RemoteServer;
 import org.apache.log4j.Logger;
-
+import java.io.IOException;
 import java.security.InvalidParameterException;
 
 
@@ -46,37 +41,44 @@ public class Main {
      * [client ip port serialNumber]
      * [client ip port]
      */
-    public static void main(String[] args) throws InterruptedException {
+    public static void main(String[] args) throws InterruptedException, IOException {
 
         // 监听USB的变化
         AdbServer.server().listenUSB();
 
         // 同步ADB的设备列表
         AdbServer.server().listenADB();
 
-        // parse命令行
-        try {
-            Config config = new Config(args);
-
-            if (config.isClient) {
-                new RemoteClient(config.ip, config.port, config.key, config.serialNumber);
-            } else {
-                if (config.isLocal) {
-                    new LocalServer(config.port).start();
-                } else {                 
-                    new RemoteServer(config.port).start();
-                }
-            }
-        } catch (InvalidParameterException ex) {
-            System.out.println("localserver <port>: 启动本地服务器(p2p)\n remoteserver <port> 启动服务器 \nremoteclient <ip> <port> <key> [serialNumber] 启动客户端");
-            System.exit(0);
-        } catch (WebSocketException|InterruptedException e) {
-            System.out.println("启动服务器失败: " + e.getMessage());
-            System.exit(0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(0);
+        while (true) {
+            System.out.print("> ");
+            System.in.read();
+//            System.console().read
         }
+        
+        
+//        // parse命令行
+//        try {
+//            Config config = new Config(args);
+//
+//            if (config.isClient) {
+//                new RemoteClient(config.ip, config.port, config.key, config.serialNumber);
+//            } else {
+//                if (config.isLocal) {
+//                    new LocalServer(config.port).start();
+//                } else {                 
+//                    new RemoteServer(config.port).start();
+//                }
+//            }
+//        } catch (InvalidParameterException ex) {
+//            System.out.println("localserver <port>: 启动本地服务器(p2p)\n remoteserver <port> 启动服务器 \nremoteclient <ip> <port> <key> [serialNumber] 启动客户端");
+//            System.exit(0);
+//        } catch (WebSocketException|InterruptedException e) {
+//            System.out.println("启动服务器失败: " + e.getMessage());
+//            System.exit(0);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            System.exit(0);
+//        }
     }
 
     static class Config {
 
@@ -232,7 +232,9 @@ private void refreshAdbDeviceList() {
             }
             // 如果在已有列表不存在，添加到已有列表
             if (!exists) {
-                this.adbDeviceList.add(new AdbDevice(iDevice));
+                AdbDevice device = new AdbDevice(iDevice);
+                logger.info("Android设备连接：" + device.getSerialNumber());
+                this.adbDeviceList.add(device);
             }
         }
         // 移除已断开的设备
@@ -246,7 +248,7 @@ private void refreshAdbDeviceList() {
             }
             // 如果在已有列表不存在，添加到已有列表
             if (!exists) {
-                this.adbDeviceList.remove(adbDev);
+                onAdbDeviceDisConnected(adbDev);
             }
         }
     }
 
@@ -187,12 +187,13 @@ public AdbForward createForward() {
         return forward;
     }
 
-    private void removeForward(AdbForward forward) {
+    private void removeForward() {
         if (forward == null || !forward.isForward()) {
             return;
         }
         try {
             device.getIDevice().removeForward(forward.getPort(), forward.getLocalabstract(), IDevice.DeviceUnixSocketNamespace.ABSTRACT);
+            forward = null;
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -440,7 +441,7 @@ private void onClose() {
         for (MinicapListener listener : listenerList) {
             listener.onClose(this);
         }
-        removeForward(forward);
+        removeForward();
     }
 
     private void onBanner(Banner banner) {
@@ -476,7 +477,7 @@ public void run() {
             try {
                 readData();
             } catch (IOException e) {
-                System.out.println("lost connection: " + e.getMessage());
+                logger.warn("minicap lost connection: " + e.getMessage());
                 onClose();
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,9 @@ private void refreshAdbDeviceList() {`
`232`	`232`	`}`
`233`	`233`	`// 如果在已有列表不存在，添加到已有列表`
`234`	`234`	`if (!exists) {`
`235`		`- this.adbDeviceList.add(new AdbDevice(iDevice));`
	`235`	`+ AdbDevice device = new AdbDevice(iDevice);`
	`236`	`+ logger.info("Android设备连接：" + device.getSerialNumber());`
	`237`	`+ this.adbDeviceList.add(device);`
`236`	`238`	`}`
`237`	`239`	`}`
`238`	`240`	`// 移除已断开的设备`
`@@ -246,7 +248,7 @@ private void refreshAdbDeviceList() {`
`246`	`248`	`}`
`247`	`249`	`// 如果在已有列表不存在，添加到已有列表`
`248`	`250`	`if (!exists) {`
`249`		`- this.adbDeviceList.remove(adbDev);`
	`251`	`+ onAdbDeviceDisConnected(adbDev);`
`250`	`252`	`}`
`251`	`253`	`}`
`252`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,12 +187,13 @@ public AdbForward createForward() {`
`187`	`187`	`return forward;`
`188`	`188`	`}`
`189`	`189`
`190`		`- private void removeForward(AdbForward forward) {`
	`190`	`+ private void removeForward() {`
`191`	`191`	`if (forward == null \|\| !forward.isForward()) {`
`192`	`192`	`return;`
`193`	`193`	`}`
`194`	`194`	`try {`
`195`	`195`	`device.getIDevice().removeForward(forward.getPort(), forward.getLocalabstract(), IDevice.DeviceUnixSocketNamespace.ABSTRACT);`
	`196`	`+ forward = null;`
`196`	`197`	`} catch (Exception e) {`
`197`	`198`	`e.printStackTrace();`
`198`	`199`	`}`
`@@ -440,7 +441,7 @@ private void onClose() {`
`440`	`441`	`for (MinicapListener listener : listenerList) {`
`441`	`442`	`listener.onClose(this);`
`442`	`443`	`}`
`443`		`- removeForward(forward);`
	`444`	`+ removeForward();`
`444`	`445`	`}`
`445`	`446`
`446`	`447`	`private void onBanner(Banner banner) {`
`@@ -476,7 +477,7 @@ public void run() {`
`476`	`477`	`try {`
`477`	`478`	`readData();`
`478`	`479`	`} catch (IOException e) {`
`479`		`- System.out.println("lost connection: " + e.getMessage());`
	`480`	`+ logger.warn("minicap lost connection: " + e.getMessage());`
`480`	`481`	`onClose();`
`481`	`482`	`}`
`482`	`483`	`}`