Merge branch 'master' of github.com:cosysoft/device

cosysoft · Apr 11, 2015 · 3f3112d · 3f3112d
2 parents e1c47f0 + e2412df
commit 3f3112d
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 31 deletions.
diff --git a/device-api/src/main/java/org/cosysoft/device/android/impl/AndroidDeviceStore.java b/device-api/src/main/java/org/cosysoft/device/android/impl/AndroidDeviceStore.java
@@ -1,9 +1,9 @@
 package org.cosysoft.device.android.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeSet;
-
+import com.android.ddmlib.AndroidDebugBridge;
+import com.android.ddmlib.DdmPreferences;
+import com.android.ddmlib.IDevice;
+import com.android.ddmlib.Log.LogLevel;
 import org.cosysoft.device.DeviceStore;
 import org.cosysoft.device.android.AndroidDevice;
 import org.cosysoft.device.exception.AndroidDeviceException;
@@ -13,22 +13,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.android.ddmlib.AndroidDebugBridge;
-import com.android.ddmlib.DdmPreferences;
-import com.android.ddmlib.IDevice;
-import com.android.ddmlib.IDevice.DeviceState;
-import com.android.ddmlib.Log.LogLevel;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeSet;
 
 public class AndroidDeviceStore implements DeviceStore {
 
     protected static final Logger logger = LoggerFactory
             .getLogger(AndroidDeviceStore.class);
 
-    protected final TreeSet<AndroidDevice> devices = new TreeSet<>();
-    private Map<IDevice, DefaultHardwareDevice> connectedDevices = new HashMap<>();
+    private Map<IDevice, AndroidDevice> connectedDevices = new HashMap<>();
 
     private AndroidDebugBridge bridge;
-    private boolean shouldKeepAdbAlive;
+    private boolean shouldKeepAdbAlive = false;
 
     static class DeviceStoreHolder {
 
@@ -37,7 +35,7 @@ static class DeviceStoreHolder {
         static AndroidDeviceStore init() {
             AndroidDeviceStore instance;
             instance = new AndroidDeviceStore();
-            instance.initAndroidDevices(true);
+            instance.initAndroidDevices(false);
             return instance;
         }
     }
@@ -54,17 +52,7 @@ public static AndroidDeviceStore getInstance() {
     public void initAndroidDevices(boolean shouldKeepAdbAlive)
             throws AndroidDeviceException {
         DdmPreferences.setLogLevel(LogLevel.VERBOSE.getStringValue());
-
         this.initializeAdbConnection();
-        TreeSet<AndroidDevice> androidDevices = this.getDevices();
-
-        if (androidDevices.isEmpty()) {
-            throw new DeviceNotFoundException(
-                    "No android devices were found. Please start an Android hardware device via USB, "
-                            + "or check other device offline problem such as open USB Debug");
-        }
-        devices.addAll(androidDevices);
-
     }
 
     /**
@@ -112,18 +100,53 @@ protected void initializeAdbConnection() {
         for (int i = 0; i < devices.length; i++) {
             logger.info("devices state: {},{} ", devices[i].getName(),
                     devices[i].getState());
-            if (DeviceState.ONLINE == devices[i].getState()) {
-                connectedDevices.put(devices[i], new DefaultHardwareDevice(
-                        devices[i]));
+            connectedDevices.put(devices[i], new DefaultHardwareDevice(
+                    devices[i]));
+        }
+
+
+        bridge.addDeviceChangeListener(new AndroidDebugBridge.IDeviceChangeListener() {
+            @Override
+            public void deviceConnected(IDevice device) {
+                logger.info("deviceConnected {}", device.getSerialNumber());
+                AndroidDevice ad = new DefaultHardwareDevice(device);
+                Iterator<Map.Entry<IDevice, AndroidDevice>> entryIterator = connectedDevices.entrySet().iterator();
+                boolean contain = false;
+                while (entryIterator.hasNext()) {
+                    Map.Entry entry = entryIterator.next();
+                    if (entry.getValue().equals(ad)) {
+                        contain = true;
+                        break;
+                    }
+                }
+                if (!contain) {
+                    connectedDevices.put(device, ad);
+                }
             }
 
-        }
-        this.devices.addAll(connectedDevices.values());
+            @Override
+            public void deviceDisconnected(IDevice device) {
+                logger.info("deviceDisconnected {}", device.getSerialNumber());
+                AndroidDevice ad = new DefaultHardwareDevice(device);
+                Iterator<Map.Entry<IDevice, AndroidDevice>> entryIterator = connectedDevices.entrySet().iterator();
+                while (entryIterator.hasNext()) {
+                    Map.Entry entry = entryIterator.next();
+                    if (entry.getValue().equals(ad)) {
+                        entryIterator.remove();
+                    }
+                }
+            }
+
+            @Override
+            public void deviceChanged(IDevice device, int changeMask) {
+                logger.info(device.getSerialNumber() + " " + changeMask);
+            }
+        });
     }
 
     @Override
     public TreeSet<AndroidDevice> getDevices() {
-        return new TreeSet<AndroidDevice>(devices);
+        return new TreeSet<AndroidDevice>(connectedDevices.values());
     }
 
     @Override

diff --git a/device-api/src/test/java/org/cosysoft/device/android/test/AndroidDeviceTest.java b/device-api/src/test/java/org/cosysoft/device/android/test/AndroidDeviceTest.java
@@ -40,6 +40,6 @@ protected TreeSet<AndroidDevice> getDevices() {
 
 	@AfterClass
 	public static void tearDown() {
-		deviceStore.shutdown();
+		deviceStore.shutdownForcely();
 	}
 }
diff --git a/device-node/src/main/java/org/cosysoft/device/node/service/DeviceService.java b/device-node/src/main/java/org/cosysoft/device/node/service/DeviceService.java
@@ -34,7 +34,6 @@ public byte[] takeScreenShot(String serialId) {
         return ImageUtils.toByteArray(image);
     }
 
-    @Cacheable(value = "devices")
     public List<DeviceInfo> getDevices() {
         List<DeviceInfo> deviceInfos = new ArrayList<>();
         deviceStore.getDevices().forEach(device -> {

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
+#org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_40
 systemProp.file.encoding=utf-8
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		#org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_40
		systemProp.file.encoding=utf-8