Skip to content

Commit

Permalink
Update sample and docs to Android SDK 4.5.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverou committed May 2, 2018
1 parent f478d4a commit 69a2aa9
Show file tree
Hide file tree
Showing 401 changed files with 4,001 additions and 153 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ Declare dependency via Maven:
<dependency>
<groupId>com.dji</groupId>
<artifactId>dji-sdk</artifactId>
<version>4.5</version>
<version>4.5.1</version>
</dependency>

<dependency>
<groupId>com.dji</groupId>
<artifactId>dji-sdk-provided</artifactId>
<version>4.5</version>
<version>4.5.1</version>
</dependency>
~~~

or Gradle:

~~~groovy
compile 'com.dji:dji-sdk:4.5'
provided 'com.dji:dji-sdk-provided:4.5'
compile 'com.dji:dji-sdk:4.5.1'
provided 'com.dji:dji-sdk-provided:4.5.1'
~~~

For further detail on how to integrate the DJI Android SDK into your Android Studio project, please check the [Integrate SDK into Application](http://developer.dji.com/mobile-sdk/documentation/application-development-workflow/workflow-integrate.html#import-maven-dependency) tutorial.
Expand Down
12 changes: 3 additions & 9 deletions Sample Code/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:multidex:1.0.1'
compile 'com.squareup:otto:1.3.8'
compile 'com.dji:dji-sdk:4.5'
provided 'com.dji:dji-sdk-provided:4.5'
//uncomment below lines when you directly use AAR file dependency
/*compile 'com.google.code.gson:gson:2.8.2'
compile 'com.squareup.okio:okio:1.11.0'
compile 'com.squareup.wire:wire-runtime:2.2.0'
compile 'org.bouncycastle:bcprov-jdk15on:1.57'
compile 'org.bouncycastle:bcpkix-jdk15on:1.57'
compile 'org.reactivestreams:reactive-streams:1.0.0'*/
compile 'com.dji:dji-sdk:4.5.1'
provided 'com.dji:dji-sdk-provided:4.5.1'

}
4 changes: 4 additions & 0 deletions docs/API Reference/BaseClasses/DJIBaseProduct.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Components/Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Components/Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Components/Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Components/Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Components/Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Components/Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
4 changes: 4 additions & 0 deletions docs/API Reference/BaseClasses/DJIVideoFeeder.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Components/Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Components/Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Components/Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Components/Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Components/Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Components/Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Components/Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Components/Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Components/Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../Components/FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Components/FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Components/Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Components/Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Components/Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
4 changes: 4 additions & 0 deletions docs/API Reference/Components/AirLink/DJIAirLink.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager.html" class="sub-toggle">FlyZoneManager<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJIUnlockedZoneGroup.html">UnlockedZoneGroup</a>
</dd>
<dd><a data-href="../FlyZoneManager/DJIFlyZoneManager_DJIFlyZoneInformation.html" class="sub-toggle">FlyZoneInformation<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../FlyZoneManager/DJIFlyZoneManager_DJISubFlyZoneInformation.html">SubFlyZoneInformation</a>
Expand Down Expand Up @@ -288,6 +290,8 @@
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Gimbal/DJIGimbal.html" class="sub-toggle">Gimbal<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down
Loading

0 comments on commit 69a2aa9

Please sign in to comment.