whitelist update, sample project compile modify

Author: huangsihua

app/build.gradle

@@ -10,25 +10,24 @@ android {
             storePassword 'android'
         }
     }
-    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 33
+//    buildToolsVersion '28.0.3'
 
     packagingOptions {
 //        pickFirst 'lib/armeabi-v7a/libwhitename.so'
-        pickFirst 'lib/arm64-v8a/libwhitename.so'
+//        pickFirst 'lib/arm64-v8a/libwhitename.so'
 //        pickFirst 'lib/armeabi-v7a/libAutelUtil.so'
-        pickFirst 'lib/arm64-v8a/libAutelUtil.so'
+//        pickFirst 'lib/arm64-v8a/libAutelUtil.so'
     }
     defaultConfig {
-        applicationId "com.autel.maxlink"
-        minSdkVersion 19
-        //noinspection ExpiredTargetSdkVersion
+        applicationId "com.dronesense.pilot"
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "V1.0.1.40"
         multiDexEnabled true
         signingConfig signingConfigs.config
-        ndkVersion '21.4.7075529'
+        ndkVersion '21.4.7075529' // ���� NDK �汾
     }
     buildTypes {
         release {
@@ -48,10 +47,6 @@ android {
     }
     productFlavors {
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 repositories {
@@ -67,12 +62,11 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //    testCompile 'junit:junit:4.12'
     //*
-//    implementation project(':sdk')
+    //implementation project(':sdk')
 
     implementation(name: "autel-sdk-release", ext: "aar")
 
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.7.20"
     //noinspection GradleCompatible
 //    implementation 'com.android.support:appcompat-v7:25.3.1'
     implementation  'com.google.android.gms:play-services-maps:17.0.1'
@@ -86,10 +80,10 @@ dependencies {
 
     implementation('com.squareup.okhttp3:okhttp:4.7.2')
     //    compile autelSdkDependencies.okIO
-    api 'io.reactivex.rxjava2:rxjava:2.1.2'
-    api 'io.reactivex.rxjava2:rxandroid:2.0.1'
+//    api 'io.reactivex.rxjava2:rxjava:2.1.2'
+//    api 'io.reactivex.rxjava2:rxandroid:2.0.1'
 //    api files('libs/commons-codec-1.5.jar')
-    implementation 'org.greenrobot:eventbus:3.0.0'
+//    api 'org.greenrobot:eventbus:3.0.0'
     implementation 'com.google.code.gson:gson:2.8.7'
 //    api "androidx.annotation:annotation:1.0.0"
 }

app/libs/autel-sdk-release.aar

@@ -17,7 +17,6 @@
 import com.autel.common.camera.CameraProduct;
 import com.autel.common.error.AutelError;
 import com.autel.common.video.OnRenderFrameInfoListener;
-import com.autel.internal.video.core.decoder2.VideoCacheManager;
 import com.autel.sdk.camera.AutelBaseCamera;
 import com.autel.sdk.camera.AutelCameraManager;
 import com.autel.sdk.product.BaseProduct;
@@ -137,10 +136,10 @@ public void onRenderFrameTimestamp(long pts) {
                     state = true;
                     AutelCodecView.setOverExposure(false, R.drawable.expo1280);
                 }
-                if(VideoCacheManager.instance().ptsMap.containsKey(pts)){
+/*                if(VideoCacheManager.instance().ptsMap.containsKey(pts)){
                     //AutelLog.tag("DDL").b().d("每一帧cost Time:"+(System.currentTimeMillis() - VideoCacheManager.instance().ptsMap.get(pts))+"ms, pts:"+pts+" current Time:"+System.currentTimeMillis()+" size:"+VideoCacheManager.instance().ptsMap.size());
                     VideoCacheManager.instance().ptsMap.remove(pts);
-                }
+                }*/
             }
 
             @Override

app/src/main/java/com/autel/sdksample/base/camera/CameraActivity.java

@@ -1,30 +1,31 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.4.20'
+    ext.kotlin_version = '1.7.20'
     repositories {
-        google()
         mavenCentral()
-        maven {url 'https://maven.aliyun.com/repository/public/'}
-        maven {url 'https://maven.aliyun.com/repository/central/'}
-        maven {url 'https://maven.aliyun.com/repository/google/'}
-        maven {url 'https://maven.aliyun.com/repository/gradle-plugin/'}
+        maven { url 'https://maven.aliyun.com/repository/public/' }
+        maven { url 'https://maven.aliyun.com/repository/central/' }
+        maven { url 'https://maven.aliyun.com/repository/google/' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
         mavenCentral()
         maven {
-            url 'https://maven.google.com/'
-            name 'Google'
+            url "https://maven.google.com"
         }
+        maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        //*/
+        classpath 'com.android.tools.build:gradle:7.2.2'
         /*/
         classpath 'com.android.tools.build:gradle:3.0.0'
         //*/
 //        classpath 'me.vigi:fat-aar-plugin:0.2.8'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
         classpath 'com.github.kezong:fat-aar:1.3.6'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.4.18'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -33,35 +34,19 @@ buildscript {
 allprojects {
     apply plugin: "com.jfrog.artifactory"
     repositories {
-        maven {url 'https://maven.aliyun.com/repository/public/'}
-        maven {url 'https://maven.aliyun.com/repository/central/'}
-        maven {url 'https://maven.aliyun.com/repository/google/'}
-        maven {url 'https://maven.aliyun.com/repository/gradle-plugin/'}
-        google()
+        maven { url 'https://maven.aliyun.com/repository/public/' }
+        maven { url 'https://maven.aliyun.com/repository/central/' }
+        maven { url 'https://maven.aliyun.com/repository/google/' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
         mavenCentral()
-        maven{
-            url 'https://maven.google.com'
-        }
-        maven() {
-            //*
-            url "http://10.250.64.96:8082/artifactory/gradle-dev"
-//            url "http://10.240.12.2:8081/artifactory/autel-release"
-
-            /*/
-            url "https://fmworld.bintray.com/android"
-            //*/
-        }
-	
-	jcenter()
         maven {
-            url 'https://maven.google.com/'
-            name 'Google'
+            url 'https://maven.google.com'
         }
+        maven { url "https://jitpack.io" }
     }
 }
 
 
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

build.gradle

@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip