Merge pull request #5 from xBambusekD/main

update – jpeg synchronized stream and virtual sticks support

Author: xBambusekD

DjiStreamer/.idea/compiler.xml

@@ -7,7 +7,6 @@ repositories {
 
 android {
     compileSdkVersion 32
-    buildToolsVersion '29.0.3'
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
@@ -62,6 +61,10 @@ android {
         doNotStrip "*/*/libAMapSDK_MAP_v6_9_2.so"
         doNotStrip "*/*/libDJIMOP.so"
         exclude 'META-INF/rxjava.properties'
+        exclude 'META-INF/INDEX.LIST'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/io.netty.versions.properties'
     }
 
     compileOptions {
@@ -74,27 +77,45 @@ android {
 dependencies {
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'com.squareup:otto:1.3.8'
-    implementation('com.dji:dji-sdk:4.16.4', {
+    implementation('com.dji:dji-sdk:4.17', {
         /**
          * 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'
+        exclude module: 'fly-safe-database'
     })
-    compileOnly 'com.dji:dji-sdk-provided:4.16.4'
+    compileOnly 'com.dji:dji-sdk-provided:4.17'
 
     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'
-    implementation 'com.dji:dji-uxsdk:4.15'
+    implementation ('com.dji:dji-uxsdk:4.16.2', {
+        /**
+         * 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'
+
+        /**
+         * 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.16.2')
+    implementation 'io.projectreactor.netty:reactor-netty-core:1.1.21'
+    implementation 'io.projectreactor.netty:reactor-netty-http:1.1.21'
 
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
 
     //implementation 'tech.gusavila92:java-android-websocket-client:1.2.2'

DjiStreamer/.idea/gradle.xml

@@ -35,7 +35,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <!-- DJI SDK -->
         <uses-library android:name="com.android.future.usb.accessory" />