Skip to content

Commit

Permalink
update sample and documentation to Android SDK 4.9.
Browse files Browse the repository at this point in the history
  • Loading branch information
@oliverou
oliverou committed Jan 28, 2019
1 parent d4b2df9 commit ef10522
Show file tree
Hide file tree
Showing 439 changed files with 210,956 additions and 48,879 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ http://developer.dji.com/policies/eula/
Sample code is offered under MIT License (See below).

The MIT License (MIT)
Copyright (c) 2018 DJI
Copyright (c) 2019 DJI

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
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.8.1</version>
<version>4.9</version>
</dependency>

<dependency>
<groupId>com.dji</groupId>
<artifactId>dji-sdk-provided</artifactId>
<version>4.8.1</version>
<version>4.9</version>
</dependency>
~~~

or Gradle:

~~~groovy
compile 'com.dji:dji-sdk:4.8.1'
provided 'com.dji:dji-sdk-provided:4.8.1'
compile 'com.dji:dji-sdk:4.9'
provided 'com.dji:dji-sdk-provided:4.9'
~~~

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: 6 additions & 6 deletions Sample Code/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ android {
doNotStrip "*/*/libUpgradeVerify.so"
doNotStrip "*/*/libFR.so"
exclude 'META-INF/rxjava.properties'
exclude 'META-INF/rxjava-computation-expressions.properties'
}

}


dependencies {
implementation 'com.android.support:multidex:1.0.2'
implementation 'com.squareup:otto:1.3.8'
implementation ('com.dji:dji-sdk:4.8.1', {
// Uncomment the following line if your app does not need Anti Distortion for
// Mavic 2 Pro and Mavic 2 Zoom. It will greatly reducing the size of the APK:
// exclude module: 'library-anti-distortion'
implementation ('com.dji:dji-sdk:4.9', {
// Uncomment the following line if your app does not need Anti Distortion for
// Mavic 2 Pro and Mavic 2 Zoom. It will greatly reducing the size of the APK:
exclude module: 'library-anti-distortion'
})
compileOnly 'com.dji:dji-sdk-provided:4.8.1'
compileOnly 'com.dji:dji-sdk-provided:4.9'

}
19 changes: 9 additions & 10 deletions Sample Code/app/src/main/res/layout/media_playback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,18 @@
android:layout_width="80dp"/>

<TextView
android:text="Playback Status"
android:id="@+id/tv_mediaPushInfo"
android:layout_marginLeft="50dp"
android:layout_marginRight="20dp"
android:visibility="invisible"
tools:ignore="NotSibling"
android:textColor="@color/white"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_weight="1"
android:layout_alignParentBottom="true"
android:layout_height="240dp"
android:layout_alignEnd="@+id/btnStatus"
android:layout_marginStart="50dp"/>
android:layout_alignRight="@+id/btnStatus"
android:layout_below="@+id/btnStatus"
android:layout_marginTop="18dp"
android:layout_weight="1"
android:text="Playback Status"
android:textColor="@color/white"
android:visibility="invisible"
tools:ignore="NotSibling" />

</RelativeLayout>

Expand Down
54 changes: 39 additions & 15 deletions docs/API Reference/BaseClasses/DJIBaseProduct.html
View file

Large diffs are not rendered by default.

810 changes: 810 additions & 0 deletions docs/API Reference/BaseClasses/DJIBaseProduct_baseProductListener.html
View file

Large diffs are not rendered by default.

95 changes: 64 additions & 31 deletions docs/API Reference/BaseClasses/DJIVideoFeeder.html
View file

Large diffs are not rendered by default.

833 changes: 833 additions & 0 deletions docs/API Reference/BaseClasses/DJIVideoFeeder_DJIVideoFeed.html
View file

Large diffs are not rendered by default.

802 changes: 802 additions & 0 deletions docs/API Reference/BaseClasses/DJIVideoFeeder_PhysicalSourceListener.html
View file

Large diffs are not rendered by default.

802 changes: 802 additions & 0 deletions docs/API Reference/BaseClasses/DJIVideoFeeder_VideoDataCallback.html
View file

Large diffs are not rendered by default.

52 changes: 38 additions & 14 deletions docs/API Reference/Components/AccessoryAggregation/DJIAccessoryAggregation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@
</dd>
</ul>
</dd>
<dd><a href="../LiveStreamManager/DJILiveStreamManager.html">LiveStreamManager</a>
</dd>
</dl>
<dl>
<dt>Base Classes
Expand Down Expand Up @@ -164,27 +166,37 @@
</dd>
<dd><a data-href="../RTK/DJIRTK.html" class="sub-toggle">RTK<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a data-href="../RTK/DJIRTK_DJIRTKState.html" class="sub-toggle">RTKState<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<dd><a href="../RTK/DJIRTK_DJIRTKState.html">RTKState</a>
</dd>
<dd><a data-href="../RTK/DJIRTKNetworkServiceProvider.html" class="sub-toggle">RTKNetworkServiceProvider<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../RTK/DJIRTK_DJIRTKReceiverInfo.html">ReceiverInfo</a>
<dd><a href="../RTK/DJIRTKNetworkServiceProvider_DJIRTKNetworkServiceState.html">NetworkServiceState</a>
</dd>
<dd><a href="../RTK/DJIRTKNetworkServiceProvider_DJIRTKNetworkServiceSettings.html">NetworkServiceSettings</a>
</dd>
</ul>
</dd>
<dd><a href="../RTK/DJIRTK_DJIRTKGroundSystemBatteryState.html">BaseStationBatteryState</a>
</dd>
<dd><a href="../RTK/DJIRTK_DJIRTKReceiverInfo.html">ReceiverInfo</a>
</dd>
<dd><a href="../RTK/DJIRTK_DJILocationStandardDeviation.html">LocationStandardDeviation</a>
</dd>
</ul>
</dd>
<dd><a href="../LandingGear/DJILandingGear.html">LandingGear</a>
</dd>
<dd><a data-href="../IntelligentFlightAssistant/DJIIntelligentFlightAssistant.html" class="sub-toggle">Intelligent Flight Assistant<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<dd><a data-href="../IntelligentFlightAssistant/DJIIntelligentFlightAssistant.html" class="sub-toggle">FlightAssistant<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a data-href="../VisionDetectionState/DJIVisionDetectionState.html" class="sub-toggle">VisionDetectionState<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../VisionDetectionState/DJIVisionDetectionState_DJIVisionDetectionSector.html">Detection Sector</a>
<dd><a href="../VisionDetectionState/DJIVisionDetectionState_DJIVisionDetectionSector.html">ObstacleDetectionSector</a>
</dd>
</ul>
</dd>
<dd><a href="../IntelligentFlightAssistant/DJIVisionDetectionState_DJIVisionControlState.html">Detection State</a>
<dd><a href="../IntelligentFlightAssistant/DJIVisionDetectionState_DJIVisionControlState.html">VisionControlState</a>
</dd>
<dd><a href="../IntelligentFlightAssistant/DJISmartCaptureState.html">Smart Capture State</a>
<dd><a href="../IntelligentFlightAssistant/DJISmartCaptureState.html">SmartCaptureState</a>
</dd>
</ul>
</dd>
Expand Down Expand Up @@ -312,8 +324,6 @@
</dd>
<dd><a href="../Camera/DJICamera_DJICameraPictureStylePreset.html">PictureStylePreset</a>
</dd>
<dd><a href="../Camera/DJICamera_CameraLiveView.html">CameraLiveView</a>
</dd>
<dd><a href="../Camera/DJICamera_ColorWaveformSettings.html">ColorWaveformSettings</a>
</dd>
<dd><a href="../Camera/DJICamera_StabilizationState.html">StabilizationState</a>
Expand All @@ -338,7 +348,7 @@
</dd>
<dd><a data-href="../AirLink/DJIAirLink.html" class="sub-toggle">AirLink<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a data-href="../LBAirLink/DJILBAirLink.html" class="sub-toggle">Lightbridge<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<dd><a data-href="../LBAirLink/DJILBAirLink.html" class="sub-toggle">LightbridgeLink<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../LBAirLink/DJILBAirLink_DJILBAirLinkChannelInterference.html">ChannelInterference</a>
</dd>
Expand All @@ -352,7 +362,7 @@
</dd>
</ul>
</dd>
<dd><a data-href="../WiFiLink/DJIWiFiLink.html" class="sub-toggle">WiFi<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<dd><a data-href="../WiFiLink/DJIWiFiLink.html" class="sub-toggle">WiFiLink<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../WiFiLink/DJIWiFiLink_DJIWiFiChannelInterference.html">WifiChannelInterference</a>
</dd>
Expand All @@ -362,10 +372,6 @@
</dd>
<dd><a data-href="../RemoteController/DJIRemoteController.html" class="sub-toggle">RemoteController<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../RemoteController/DJIRemoteController_DJIRCGimbalMapping.html">GimbalMapping</a>
</dd>
<dd><a href="../RemoteController/DJIRemoteController_DJIRCGimbalStickMapping.html">GimbalStickMapping</a>
</dd>
<dd><a data-href="../RemoteController/DJIRemoteController_DJIRCHardwareState.html" class="sub-toggle">HardwareState<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../RemoteController/DJIRemoteController_DJIRCHardwareRightWheel.html">RightWheel</a>
Expand Down Expand Up @@ -424,6 +430,12 @@
</dd>
</ul>
</dd>
<dd><a href="../RemoteController/DJIRemoteController_DJIRCMultiDeviceAggregationState.html">MultiDeviceAggregationState</a>
</dd>
<dd><a href="../RemoteController/DJIRemoteController_DJIRCGimbalMapping.html">GimbalMapping</a>
</dd>
<dd><a href="../RemoteController/DJIRemoteController_DJIRCGimbalStickMapping.html">GimbalStickMapping</a>
</dd>
</ul>
</dd>
<dd><a data-href="../HandheldController/DJIHandheldController.html" class="sub-toggle">HandheldController<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down Expand Up @@ -606,6 +618,16 @@
</dd>
</ul>
</dd>
<dd><a data-href="../Missions/DJIIntelligentHotpointMissionOperator.html" class="sub-toggle">IntelligentHotpointMissionOperator<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a href="../Missions/DJIIntelligentHotpointMission.html">IntelligentHotpointMission</a>
</dd>
<dd><a href="../Missions/DJIIntelligentHotpointMissionOperator_DJIIntelligentHotpointMissionState.html">IntelligentHotpointMissionState</a>
</dd>
<dd><a href="../Missions/DJIIntelligentHotpointMissionOperator_DJIIntelligentHotpointMissionEvent.html">IntelligentHotpointMissionEvent</a>
</dd>
</ul>
</dd>
<dd><a data-href="../Missions/DJITapFlyMissionOperator.html" class="sub-toggle">TapFlyMissionOperator<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
<ul class="sub-menu">
<dd><a data-href="../Missions/DJITapFlyMission.html" class="sub-toggle">TapFlyMission<i class="fa fa-angle-down"></i><i class="fa fa-angle-up"></i></a>
Expand Down Expand Up @@ -662,6 +684,8 @@
</dd>
<dd><a href="../SDKError/DJIError_DJISDKFlightHubError.html">DJIFlightHubError</a>
</dd>
<dd><a href="../SDKError/DJIError_DJIRTKNetworkServiceError.html">DJIRTKNetworkServiceError</a>
</dd>
<dd><a href="../SDKError/DJIError_DJIAccessoryAggregationError.html">DJIAccessoryAggregationError</a>
</dd>
<dd><a href="../SDKError/DJIError_DJIAccessLockerError.html">DJIAccessLockerError</a>
Expand Down
Loading

0 comments on commit ef10522

Please sign in to comment.