update videoDecoding sample to Android SDK 4.11.

Author: oliverou

LICENSE

@@ -1,6 +1,6 @@
 
 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:
 

README.md

@@ -8,7 +8,7 @@ This sample code demonstrates how to use [FFmpeg](https://ffmpeg.org) for video
 
  - Android Studio 2.0+
  - Android System 4.2+
- - DJI Android SDK 4.10
+ - DJI Android SDK 4.11
 
 ## IMPORTANT: Install `git lfs`
 

android-videostreamdecodingsample/README.md

@@ -1,41 +1,50 @@
 apply plugin: 'com.android.application'
 
+repositories {
+    mavenLocal()
+}
+
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+    useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "com.dji.videostreamdecodingsample"
-        minSdkVersion 19
-        targetSdkVersion 27
+        minSdkVersion 16
+        targetSdkVersion 28
         multiDexEnabled true
         ndk {
             // On x86 devices that run Android API 23 or above, if the application is targeted with API 23 or
             // above, FFmpeg lib might lead to runtime crashes or warnings.
             abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a'
         }
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
-            shrinkResources false
-            minifyEnabled false
+            shrinkResources true
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     sourceSets {
         main {
             jni.srcDirs=[]
             jniLibs.srcDirs=['../libs']
         }
     }
+
     dexOptions {
         javaMaxHeapSize "4g"
     }
-    packagingOptions{
+
+    packagingOptions {
         doNotStrip "*/*/libdjivideo.so"
         doNotStrip "*/*/libSDKRelativeJNI.so"
         doNotStrip "*/*/libFlyForbid.so"
@@ -48,22 +57,39 @@ android {
         doNotStrip "*/*/libDJIFlySafeCore.so"
         doNotStrip "*/*/libdjifs_jni.so"
         doNotStrip "*/*/libsfjni.so"
+        doNotStrip "*/*/libDJICommonJNI.so"
+        doNotStrip "*/*/libDJICSDKCommon.so"
+        doNotStrip "*/*/libDJIUpgradeCore.so"
+        doNotStrip "*/*/libDJIUpgradeJNI.so"
         exclude 'META-INF/rxjava.properties'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
-dependencies {
-    implementation 'com.android.support:multidex:1.0.2'
-    implementation('com.dji:dji-sdk:4.10', {
-        //if your app needn't support Mavic 2 Pro and Mavic 2 Zoom, pls exclude the library-anti-distortion module
-        //like following
-        //exclude module: 'library-anti-distortion'
 
-        //Uncomment the following line if your APP does not need network RTK.
-        //For Phantom 4 RTK and Matrice 210 RTK V2. Network RTK can be used as a virtual reference station to provide
-        //cm level accurate position.
-        //exclude module: 'library-networkrtk-helper'
-    })
-    compileOnly 'com.dji:dji-sdk-provided:4.10'
 
-}
+dependencies {
+    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'com.squareup:otto:1.3.8'
+    implementation('com.dji:dji-sdk:4.11', {
+        /**
+         * 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 reducing the size of the APK.
+         */
+        exclude module: 'library-anti-distortion'
+        //exclude module: 'fly-safe-database'
+    })
+    compileOnly 'com.dji:dji-sdk-provided:4.11'
 
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.core:core:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01'
+    implementation 'androidx.annotation:annotation:1.0.0'
+}

android-videostreamdecodingsample/app/build.gradle

@@ -0,0 +1,114 @@
+-keepattributes Exceptions,InnerClasses,*Annotation*,Signature,EnclosingMethod
+
+-dontoptimize
+-dontpreverify
+-dontwarn okio.**
+-dontwarn org.bouncycastle.**
+-dontwarn dji.**
+-dontwarn com.dji.**
+-dontwarn sun.**
+-dontwarn java.**
+-dontwarn com.amap.api.**
+-dontwarn com.here.**
+-dontwarn com.mapbox.**
+-dontwarn okhttp3.**
+-dontwarn retrofit2.**
+
+-keepclassmembers enum * {
+    public static <methods>;
+}
+
+-keepnames class * implements java.io.Serializable
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+-keep class * extends android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+
+-keep,allowshrinking class * extends dji.publics.DJIUI.** {
+    public <methods>;
+}
+
+-keep class net.sqlcipher.** { *; }
+
+-keep class net.sqlcipher.database.* { *; }
+
+-keep class dji.** { *; }
+
+-keep class com.dji.** { *; }
+
+-keep class com.google.** { *; }
+
+-keep class org.bouncycastle.** { *; }
+
+-keep,allowshrinking class org.** { *; }
+
+-keep class com.squareup.wire.** { *; }
+
+-keep class sun.misc.Unsafe { *; }
+
+-keep class com.secneo.** { *; }
+
+-keep class org.greenrobot.eventbus.**{*;}
+
+-keepclasseswithmembers,allowshrinking class * {
+    native <methods>;
+}
+
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+-keep class androidx.appcompat.widget.SearchView { *; }
+
+-keepclassmembers class * extends android.app.Service
+-keepclassmembers public class * extends android.view.View {
+    void set*(***);
+    *** get*();
+}
+-keepclassmembers class * extends android.app.Activity {
+    public void *(android.view.View);
+}
+-keep class androidx.** { *; }
+-keep class android.** {*;}
+-keep class android.media.** { *; }
+-keep class okio.** { *; }
+-keep class com.lmax.disruptor.** {
+    *;
+}
+
+-dontwarn com.mapbox.services.android.location.LostLocationEngine
+-dontwarn com.mapbox.services.android.location.MockLocationEngine
+-keepclassmembers class * implements android.arch.lifecycle.LifecycleObserver {
+    <init>(...);
+}
+# ViewModel's empty constructor is considered to be unused by proguard
+-keepclassmembers class * extends android.arch.lifecycle.ViewModel {
+    <init>(...);
+}
+# keep Lifecycle State and Event enums values
+-keepclassmembers class android.arch.lifecycle.Lifecycle$State { *; }
+-keepclassmembers class android.arch.lifecycle.Lifecycle$Event { *; }
+# keep methods annotated with @OnLifecycleEvent even if they seem to be unused
+# (Mostly for LiveData.LifecycleBoundObserver.onStateChange(), but who knows)
+-keepclassmembers class * {
+    @android.arch.lifecycle.OnLifecycleEvent *;
+}
+
+-keepclassmembers class * implements android.arch.lifecycle.LifecycleObserver {
+    <init>(...);
+}
+
+-keep class * implements android.arch.lifecycle.LifecycleObserver {
+    <init>(...);
+}
+-keepclassmembers class android.arch.** { *; }
+-keep class android.arch.** { *; }
+-dontwarn android.arch.**

android-videostreamdecodingsample/app/proguard-rules.pro

@@ -34,6 +34,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+
         <meta-data
             android:name="com.dji.sdk.API_KEY"
             android:value="Please enter your App Key here."/>
@@ -57,4 +59,4 @@
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
     </application>
 
-</manifest>
+</manifest>

android-videostreamdecodingsample/app/src/main/AndroidManifest.xml

@@ -8,17 +8,18 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import dji.sdk.sdkmanager.DJISDKInitEvent;
 import java.util.ArrayList;
 import java.util.List;
@@ -159,6 +160,11 @@ public void onConnectivityChange(boolean b) {
                         public void onInitProcess(DJISDKInitEvent djisdkInitEvent, int i) {
                             //notify the init progress
                         }
+
+                        @Override
+                        public void onDatabaseDownloadProgress(long l, long l1) {
+
+                        }
                     });
                 }
             });