Update Sample project to SDK 4.0.1.

ShinsukeKARASAWA · Apr 19, 2017 · 403c5ad · 403c5ad
1 parent 5f137c7
commit 403c5ad
Show file tree

Hide file tree

Showing 221 changed files with 2,804 additions and 2,796 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,10 @@ Several Android tutorials are provided as examples on how to use different featu
 
 Please visit [DJI Mobile SDK Documentation](https://developer.dji.com/mobile-sdk/documentation/introduction/index.html) for more details.
 
+## DJI Mobile UI Library
+
+DJI Mobile UILibrary is a suite of product agnostic UI objects that fast tracks the development of iOS applications using the DJI Mobile SDK. For more details, please check [here](https://github.com/dji-sdk/Mobile-UILibrary-Android).
+
 ## SDK Keys
 
 SDK Keys can be used as an alternative interface to access the product.

diff --git a/Sample Code/app/src/main/AndroidManifest.xml b/Sample Code/app/src/main/AndroidManifest.xml
@@ -48,7 +48,7 @@
         -->
         <meta-data
             android:name="com.dji.sdk.API_KEY"
-            android:value="Please enter your App Key here." />
+            android:value="insert_your_app_key_here" />
 
         <service android:name="dji.sdk.sdkmanager.DJIGlobalService" />
 

diff --git a/Sample Code/dJISDKLIB/libs/dji-sdk.jar b/Sample Code/dJISDKLIB/libs/dji-sdk.jar
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libFREncrypt.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libFREncrypt.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libFlyForbid.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libFlyForbid.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libGroudStation.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libGroudStation.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libSDKRelativeJNI.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libSDKRelativeJNI.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libUpgradeVerify.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libUpgradeVerify.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libdjivideo.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libdjivideo.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libudt.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libudt.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libudtjni.so b/Sample Code/dJISDKLIB/src/main/jniLibs/arm64-v8a/libudtjni.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libFREncrypt.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libFREncrypt.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libFlyForbid.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libFlyForbid.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libGroudStation.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libGroudStation.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libSDKRelativeJNI.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libSDKRelativeJNI.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libUpgradeVerify.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libUpgradeVerify.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libdjivideo.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libdjivideo.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libudt.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libudt.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libudtjni.so b/Sample Code/dJISDKLIB/src/main/jniLibs/armeabi-v7a/libudtjni.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libFREncrypt.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libFREncrypt.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libFlyForbid.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libFlyForbid.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libGroudStation.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libGroudStation.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libSDKRelativeJNI.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libSDKRelativeJNI.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libUpgradeVerify.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libUpgradeVerify.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libdjivideo.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libdjivideo.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libudt.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libudt.so
diff --git a/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libudtjni.so b/Sample Code/dJISDKLIB/src/main/jniLibs/x86/libudtjni.so
diff --git a/Sample Code/dJISDKLIB/src/main/res/values/strings.xml b/Sample Code/dJISDKLIB/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
 
     <string name="app_name">DJI-SDK-LIB</string>
-    <string name="version_name">4.0</string>
+    <string name="version_name">4.0.1</string>
 </resources>
diff --git a/docs/4.0_4.0.1_android_diff.html b/docs/4.0_4.0.1_android_diff.html
@@ -0,0 +1,15 @@
+<br>
+
+<h1>DJI Mobile SDK 4.0 to 4.0.1 Differences</h1>
+
+<br>
+
+<h2>API changes</h2>
+
+<html><table class="table-inline-parameters"><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#000">4.0 Parent and Name</font></td><td width=15%><font color="#CCCCCC"><font color="#000">4.0 Code</font></td><td width=15%><font color="#CCCCCC"><font color="#000">4.0.1 Parent and Name</font></td><td width=15%><font color="#CCCCCC"><font color="#000">4.0.1 Code</font></td><td width=3%><font color="#CCCCCC"><font color="#000">Parent</font></td><td width=3%><font color="#CCCCCC"><font color="#000">Name</font></td><td width=3%><font color="#CCCCCC"><font color="#000">Type</font></td><td width=3%><font color="#CCCCCC"><font color="#000">Param</font></td><td width=3%><font color="#CCCCCC"><font color="#000">Return</font></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.camera.Camera.getVideoResolutionAndFrameRate</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void getVideoResolutionAndFrameRate(
+        @NonNull final CompletionCallbackWithTwoParam&lt;VideoResolution, VideoFrameRate&gt; callback) </font></td><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.camera.Camera.getVideoResolutionAndFrameRate</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void getVideoResolutionAndFrameRate(
+        @NonNull final CompletionCallbackWith&lt;ResolutionAndFrameRate&gt; callback) </font></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC">X</td><td width=3%><font color="#CCCCCC"></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.airlink.LightbridgeLink.setChannelNumber</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void setChannelNumber(int channelNumber, final CompletionCallback callback) </font></td><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.airlink.LightbridgeLink.setChannelNumber</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void setChannelNumber(int channelNumber, @Nullable final CompletionCallback callback) </font></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC">X</td><td width=3%><font color="#CCCCCC"></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.flightcontroller.FlyZoneManager.getFirmwareState</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void getFirmwareState(@NonNull final CompletionCallbackWith&lt;FlyZoneDatabaseState&gt; callback) </font></td><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.flightcontroller.FlyZoneManager.getDatabaseState</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void getDatabaseState(@NonNull final CompletionCallbackWith&lt;FlyZoneDatabaseState&gt; callback) </font></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC">X</td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.keysdk.AirLinkKey.createWIFILinkKey</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">static AirLinkKey createWIFILinkKey(@WIFILinkParamKey @NonNull String paramKey) </font></td><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.keysdk.AirLinkKey.createWiFiLinkKey</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">static AirLinkKey createWiFiLinkKey(@WIFILinkParamKey @NonNull String paramKey) </font></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC">X</td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.airlink.LightbridgeLink.setChannelSelectionMode</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void setChannelSelectionMode(ChannelSelectionMode mode, final CompletionCallback callback) </font></td><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.airlink.LightbridgeLink.setChannelSelectionMode</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void setChannelSelectionMode(ChannelSelectionMode mode, @Nullable final CompletionCallback callback) </font></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC">X</td><td width=3%><font color="#CCCCCC"></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.mission.panorama.onReceive</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">    void onReceive(@NonNull PanoramaMissionEvent event)</font></td><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.mission.panorama.onExecutionUpdate</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">    void onExecutionUpdate(@NonNull PanoramaMissionEvent event)</font></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC">X</td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.keysdk.AirLinkKey.createLBLinkKey</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">static AirLinkKey createLBLinkKey(@LightbridgeLinkParamKey @NonNull String paramKey) </font></td><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.keysdk.AirLinkKey.createLightbridgeLinkKey</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">static AirLinkKey createLightbridgeLinkKey(@LightbridgeLinkParamKey @NonNull String paramKey) </font></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC">X</td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td><td width=3%><font color="#CCCCCC"></td></tr></table></html><br>
+
+<h2>APIs removed from 4.0</h2>
+
+<html><table class="table-inline-parameters"><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#000">Parent and Name</font></td><td width=15%><font color="#CCCCCC"><font color="#000">Code</font></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.base.BaseProduct.getMissionManager</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">MissionManager getMissionManager() </font></td></tr><tr valign="top"><td width=15%><font color="#CCCCCC"><font color="#888"><i>dji.sdk.sdkmanager.DJISDKManager.addSubscription</i></font></td><td width=15%><font color="#CCCCCC"><font color="#000">void addSubscription(Subscription subscription) </font></td></tr></table></html>