Skip to content

Commit

Permalink
Merge pull request #133 from dji-sdk/sdk_releases/4.15_A
Browse files Browse the repository at this point in the history
update for 4.15
  • Loading branch information
dji-dev authored Sep 8, 2021
2 parents b8d16b5 + d97c05e commit de5a314
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 41 deletions.
38 changes: 38 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.DS_Store
# built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
/bin
/gen
build/
.gradle

# Local configuration file (sdk path, etc)
local.properties

# Eclipse project files
#.classpath

# Proguard folder generated by Eclipse
proguard/

# Intellij project files
*.ipr
*.iws
*.iml
.idea/

#ant relative files
build.xml
#ant.properties

#backup files
*.bak
32 changes: 5 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,57 +13,36 @@ Declare dependency via Maven:
<dependency>
<groupId>com.dji</groupId>
<artifactId>dji-uxsdk</artifactId>
<version>4.14</version>
<version>4.15</version>
</dependency>

<dependency>
<groupId>com.dji</groupId>
<artifactId>dji-sdk-provided</artifactId>
<version>4.14</version>
<version>4.15.1</version>
</dependency>
~~~

or Gradle:

~~~groovy
implementation ('com.dji:dji-uxsdk:4.14', {
implementation ('com.dji:dji-uxsdk:4.15', {
/**
* Comment the "library-anti-distortion" if your app does need Anti Distortion for Mavic 2 Pro and Mavic 2 Zoom.
* Comment the "fly-safe-database" if you do not need database for release, or we will download it when DJISDKManager.getInstance().registerApp
* is called.
* Both will greatly reduce the size of the APK.
*/
exclude module: 'library-anti-distortion'
exclude module: 'fly-safe-database'
// exclude module: 'fly-safe-database'
/**
* Uncomment the following line to exclude amap from the app.
* Note that Google Play Store does not allow APKs that include this library.
*/
// exclude group: 'com.amap.api'
})
/**
* Uncomment the following block if you are using an SDK version does not match the UX SDK
* version above. For example, this could be used if the SDK has a minor release version
* ahead of the UX SDK.
*/
// implementation ('com.dji:dji-sdk:4.14', {
// /**
// * Uncomment the "library-anti-distortion" if your app does not need Anti Distortion for Mavic 2 Pro and Mavic 2 Zoom.
// * Uncomment the "fly-safe-database" if you need database for release, or we will download it when DJISDKManager.getInstance().registerApp
// * is called.
// * Both will greatly reduce the size of the APK.
// */
// exclude module: 'library-anti-distortion'
// exclude module: 'fly-safe-database'
//
// /**
// * Uncomment the following line to exclude amap from the app.
// * Note that Google Play Store does not allow APKs that include this library.
// */
// // exclude group: 'com.amap.api'
// })
compileOnly ('com.dji:dji-sdk-provided:4.14')
compileOnly ('com.dji:dji-sdk-provided:4.15.1')
~~~

For further detail on how to integrate the DJI UX SDK into your Android Studio project, please check the [Getting Started with UX SDK](http://developer.dji.com/mobile-sdk/documentation/android-tutorials/UXSDKDemo.html#import-maven-dependency) tutorial.
Expand Down Expand Up @@ -108,4 +87,3 @@ You can get support from DJI with the following methods:
DJI is looking for all kinds of Software Engineers to continue building the Future of Possible. Available positions in Shenzhen, China and around the world. If you are interested, please send your resume to <software-sz@dji.com>. For more details, and list of all our global offices, please check <https://we.dji.com/jobs_en.html>.

DJI 招软件工程师啦,based在深圳,如果你想和我们一起把DJI产品做得更好,请发送简历到 <software-sz@dji.com>. 详情请浏览 <https://we.dji.com/zh-CN/recruitment>.

Binary file modified docs/Android_UX_SDK_Release_Notes.pdf
Binary file not shown.
16 changes: 2 additions & 14 deletions sample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,14 @@ android {
}

dependencies {
implementation ('com.dji:dji-uxsdk:4.14', {
exclude module: 'dji-sdk'

implementation ('com.dji:dji-uxsdk:4.15', {
/**
* Uncomment the following line to exclude amap from the app.
* Note that Google Play Store does not allow APKs that include this library.
*/
// exclude group: 'com.amap.api'
})
implementation ('com.dji:dji-sdk:4.15', {
/**
* Uncomment the "library-anti-distortion" if your app does not need Anti Distortion for Mavic 2 Pro and Mavic 2 Zoom.
* Uncomment the "fly-safe-database" if you need database for release, or we will download it when DJISDKManager.getInstance().registerApp
* is called.
* Both will greatly reduce the size of the APK.
*/
exclude module: 'library-anti-distortion'
exclude module: 'fly-safe-database'
})
compileOnly ('com.dji:dji-sdk-provided:4.15')
compileOnly ('com.dji:dji-sdk-provided:4.15.1')

// AMAP: Do not include if publishing to Google Play Store
implementation 'com.amap.api:3dmap:7.3.0'
Expand Down

0 comments on commit de5a314

Please sign in to comment.