Update sample to sdk version 2.2.0

aromajoin · Sep 9, 2019 · 2c09e46 · 2c09e46
1 parent 7737b12
commit 2c09e46
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 14 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/controller-sdk-java.iml b/.idea/controller-sdk-java.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Sample/build.gradle b/Sample/build.gradle
@@ -11,5 +11,5 @@ repositories {
 }
 
 dependencies {
-  compile 'com.aromajoin.sdk:jvm:2.0.10'
+  compile 'com.aromajoin.sdk:jvm:2.2.0'
 }
diff --git a/Sample/src/main/java/AromaShooterUSBSample.java b/Sample/src/main/java/AromaShooterUSBSample.java
@@ -5,19 +5,10 @@
 
 public class AromaShooterUSBSample {
   public static void main(String args[]) {
-    System.out.println("======= A sample of Controller SDK for Aroma Shooter USB=========");
-    //testWithSpecificPort();
-    testWithAutomaticScan();
-    System.out.println("======= DONE =========");
-  }
-
-  /**
-   * You can define AromaShooter USB connected port.
-   */
-  private static void testWithSpecificPort() {
-    USBASController usbController = new USBASController("/dev/tty.usbserial-AH03I8XI");
-    usbController.diffuseAll(3000, true, 2, 3);
-    usbController.disconnectAll();
+    System.out.println("Aroma Shooter's SDK sample!");
+    //testWithAutomaticScan();
+    testWithAutomaticScanSync();
+    System.out.println("Completed.");
   }
 
   /**
@@ -31,11 +22,40 @@ private static void testWithAutomaticScan() {
           System.out.println("AromaShooter: " + aromaShooter.getSerial());
         }
         usbController.diffuseAll(3000, true, 2, 3);
+        usbController.disconnectAll();
       }
 
       @Override public void onFailed(String msg) {
 
       }
     });
   }
+
+  /**
+   * Scans and diffuses scents synchronously
+   */
+  private static void testWithAutomaticScanSync() {
+    USBASController usbController = new USBASController();
+    usbController.scanAndConnect();
+    if (!usbController.getConnectedDevices().isEmpty()) {
+      for (AromaShooter aromaShooter : usbController.getConnectedDevices()) {
+        System.out.println("AromaShooter: " + aromaShooter.getSerial());
+      }
+      usbController.diffuseAll(3000, true, 2, 3, 5);
+      try {
+        Thread.sleep(500);
+        usbController.stopAllPorts();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+    }
+    //try {
+    //  Thread.sleep(10000);
+    //} catch (InterruptedException e) {
+    //  e.printStackTrace();
+    //}
+    //usbController.diffuse(usbController.getConnectedDevices().get(0), 3000, true, 2, 3);
+    //usbController.diffuse("ASN1UA0150", 3000, true, 4, 6);
+    usbController.disconnectAll();
+  }
 }