updated common library version.

updated method to retrieve the valid follow types. update client library version.
laimingj · Jan 7, 2015 · cbf02b3 · cbf02b3
1 parent d6c42b6
commit cbf02b3
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/AidlLib/build.gradle b/AidlLib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 20024
-        versionName '2.0.24'
+        versionCode 20025
+        versionName '2.0.25'
     }
 
     defaultPublishConfig "release"

diff --git a/AidlLib/src/com/o3dr/services/android/lib/gcs/follow/FollowType.java b/AidlLib/src/com/o3dr/services/android/lib/gcs/follow/FollowType.java
@@ -3,6 +3,9 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by fhuya on 11/5/14.
  */
@@ -27,6 +30,11 @@ public String getTypeLabel() {
         return typeLabel;
     }
 
+    @Override
+    public String toString(){
+        return getTypeLabel();
+    }
+
     @Override
     public int describeContents() {
         return 0;
@@ -37,6 +45,23 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(name());
     }
 
+    public static List<FollowType> getFollowTypes(boolean includeAdvanced){
+        List<FollowType> followTypes = new ArrayList<>();
+        followTypes.add(LEASH);
+        followTypes.add(LEAD);
+        followTypes.add(RIGHT);
+        followTypes.add(LEFT);
+        followTypes.add(CIRCLE);
+        followTypes.add(ABOVE);
+
+        if(includeAdvanced){
+            followTypes.add(SPLINE_LEASH);
+            followTypes.add(SPLINE_ABOVE);
+        }
+
+        return followTypes;
+    }
+
     public static final Parcelable.Creator<FollowType> CREATOR = new Parcelable.Creator<FollowType>() {
         public FollowType createFromParcel(Parcel source) {
             return FollowType.valueOf(source.readString());

diff --git a/ClientLib/mobile/build.gradle b/ClientLib/mobile/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 ext {
     PUBLISH_ARTIFACT_ID = '3dr-services-lib'
-    PUBLISH_VERSION = '2.1.34'
+    PUBLISH_VERSION = '2.1.35'
     PROJECT_DESCRIPTION = "3DR Services Client Library"
     PROJECT_LABELS = ['3DR', '3DR Services', 'DroneAPI', 'Android']
     PROJECT_LICENSES = ['Apache-2.0']
@@ -15,7 +15,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 20134
+        versionCode 20135
         versionName PUBLISH_VERSION
     }
 

diff --git a/dependencyLibs/Core/src/org/droidplanner/core/gcs/follow/FollowAlgorithm.java b/dependencyLibs/Core/src/org/droidplanner/core/gcs/follow/FollowAlgorithm.java
@@ -23,8 +23,14 @@ public void changeRadius(Double radius) {
 	}
 
 	public enum FollowModes {
-		LEASH("Leash"), LEAD("Lead"), RIGHT("Right"), LEFT("Left"), CIRCLE("Orbit"), ABOVE("Above"),
-        SPLINE_LEASH("Spline Leash"), SPLINE_ABOVE("Spline Above");
+        LEASH("Leash"),
+        LEAD("Lead"),
+        RIGHT("Right"),
+        LEFT("Left"),
+        CIRCLE("Orbit"),
+        ABOVE("Above"),
+        SPLINE_LEASH("Spline Leash"),
+        SPLINE_ABOVE("Spline Above");
 
 		private String name;