1. 修改设备查询API

GeekBugs · Nov 25, 2019 · f30cedc · f30cedc
1 parent 029fb4b
commit f30cedc
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/serialportlib/src/main/java/com/android/serialport/SerialPortFinder.java b/serialportlib/src/main/java/com/android/serialport/SerialPortFinder.java
@@ -8,7 +8,9 @@
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Vector;
 
 /**
  * @author F1ReKing
@@ -86,20 +88,22 @@ public List<Device> getAllDevices() {
      *
      * @return serialPort path
      */
-    public List<String> getAllDeicesPath() {
-        List<String> paths = new ArrayList<>();
+    public String[] getAllDeicesPath() {
+        Vector<String> paths = new Vector<>();
+        Iterator<Driver> drivers;
         try {
-            List<Driver> drivers = getDrivers();
-            for (Driver driver : drivers) {
-                List<File> driverDevices = driver.getDevices();
-                for (File file : driverDevices) {
-                    String devicesPaths = file.getAbsolutePath();
+            drivers = getDrivers().iterator();
+            while (drivers.hasNext()) {
+                Driver driver = drivers.next();
+                Iterator<File> files = driver.getDevices().iterator();
+                while (files.hasNext()) {
+                    String devicesPaths = files.next().getAbsolutePath();
                     paths.add(devicesPaths);
                 }
             }
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return paths;
+        return paths.toArray(new String[paths.size()]);
     }
 }