Skip to content

Commit

Permalink
Merge pull request #114 from dji-sdk/sdk_releases/4.14
Browse files Browse the repository at this point in the history
Update to MSDK 4.14
  • Loading branch information
snmillar authored Feb 24, 2021
2 parents ab7e363 + 15429c0 commit d905a04
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ Declare dependency via Maven:
<dependency>
<groupId>com.dji</groupId>
<artifactId>dji-uxsdk</artifactId>
<version>4.14-trial1</version>
<version>4.14</version>
</dependency>

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

or Gradle:

~~~groovy
implementation ('com.dji:dji-uxsdk:4.14-trial1', {
implementation ('com.dji:dji-uxsdk:4.14', {
/**
* 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
Expand All @@ -47,7 +47,7 @@ implementation ('com.dji:dji-uxsdk:4.14-trial1', {
* 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-trial1', {
// 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
Expand All @@ -63,7 +63,7 @@ implementation ('com.dji:dji-uxsdk:4.14-trial1', {
// */
// // exclude group: 'com.amap.api'
// })
compileOnly ('com.dji:dji-sdk-provided:4.14-trial1')
compileOnly ('com.dji:dji-sdk-provided:4.14')
~~~

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
Binary file modified docs/Android_UX_SDK_Release_Notes.pdf
Binary file not shown.
7 changes: 3 additions & 4 deletions sample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ android {
}

dependencies {
implementation ('com.dji:dji-uxsdk:4.14-trial1', {
implementation ('com.dji:dji-uxsdk: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
Expand All @@ -97,7 +97,7 @@ dependencies {
* 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-trial1', {
// 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
Expand All @@ -113,7 +113,7 @@ dependencies {
// */
// // exclude group: 'com.amap.api'
// })
compileOnly ('com.dji:dji-sdk-provided:4.14-trial1')
compileOnly ('com.dji:dji-sdk-provided:4.14')

// AMAP: Do not include if publishing to Google Play Store
implementation 'com.amap.api:3dmap:6.9.2'
Expand All @@ -127,7 +127,6 @@ dependencies {
implementation 'androidx.annotation:annotation:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01'
implementation 'androidx.core:core:1.0.0'
implementation 'androidx.annotation:annotation:1.0.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

//HERE maps
Expand Down
1 change: 0 additions & 1 deletion sample/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<application
android:name=".MApplication"
android:allowBackup="true"
Expand Down
4 changes: 2 additions & 2 deletions sample/app/src/main/java/com/dji/ux/sample/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ public void onRegister(DJIError error) {
} else {

Toast.makeText(getApplicationContext(),
"SDK registration failed, check network and retry!",
Toast.LENGTH_LONG).show();
"Registration failed: " + error.getDescription(),
Toast.LENGTH_LONG).show();
}
}
@Override
Expand Down

0 comments on commit d905a04

Please sign in to comment.