Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AidlLib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
versionCode 20052
versionName '2.0.52'
versionCode 20053
versionName '2.0.53'
}

defaultPublishConfig "release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import android.os.Parcel;
import android.os.Parcelable;

import java.io.Serializable;

/**
* Created by fhuya on 11/6/14.
*/
Expand All @@ -19,6 +17,17 @@ public class CameraDetail implements Parcelable {
private final double sidelap;
private final boolean isInLandscapeOrientation;

public CameraDetail() {
name = "Canon SX260";
sensorWidth = 6.12;
sensorHeight = 4.22;
sensorResolution = 12.1;
focalLength = 5.0;
overlap = 50.0;
sidelap = 60.0;
isInLandscapeOrientation = true;
}

public CameraDetail(String name, double sensorWidth, double sensorHeight, double sensorResolution,
double focalLength, double overlap, double sidelap,
boolean isInLandscapeOrientation) {
Expand All @@ -32,7 +41,7 @@ public CameraDetail(String name, double sensorWidth, double sensorHeight, double
this.isInLandscapeOrientation = isInLandscapeOrientation;
}

public CameraDetail(CameraDetail copy){
public CameraDetail(CameraDetail copy) {
this(copy.name, copy.sensorWidth, copy.sensorHeight, copy.sensorResolution, copy.focalLength, copy.overlap,
copy.sidelap, copy.isInLandscapeOrientation);
}
Expand Down
4 changes: 2 additions & 2 deletions ClientLib/mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'

ext {
PUBLISH_ARTIFACT_ID = '3dr-services-lib'
PUBLISH_VERSION = '2.2.16'
PUBLISH_VERSION = '2.2.17'
PROJECT_DESCRIPTION = "3DR Services Client Library"
PROJECT_LABELS = ['3DR', '3DR Services', 'DroneAPI', 'Android']
PROJECT_LICENSES = ['Apache-2.0']
Expand All @@ -15,7 +15,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
versionCode 20216
versionCode 20217
versionName PUBLISH_VERSION
}

Expand Down
Binary file modified ClientLib/mobile/libs/AidlLib.jar
Binary file not shown.
315 changes: 315 additions & 0 deletions ServiceApp/art/ic_launcher.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading