去掉androidx相关依赖

Change-Id: I543b72b928b30740432eb41e620b750aaad281d9
tencentyun · Nov 3, 2022 · 6756ae0 · 6756ae0
1 parent 50f3cc0
commit 6756ae0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/sdk/video-link-android/build.gradle b/sdk/video-link-android/build.gradle
@@ -37,8 +37,6 @@ android {
 
 dependencies {
     api fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -51,7 +49,7 @@ dependencies {
 //    }
 //    api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.23'
     api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.32'
-    api 'com.tencent.iot.thirdparty.android:media-server:1.0.2'
+    api 'com.tencent.iot.thirdparty.android:media-server:1.0.3'
     api 'io.github.sundoggynew:iot-soundtouch:1.0.0'
 }
 

diff --git a/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/AudioEncoder.java b/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/AudioEncoder.java
@@ -9,9 +9,6 @@
 import android.os.Build;
 import android.util.Log;
 
-import androidx.annotation.RequiresApi;
-
-
 import com.tencent.iot.video.link.listener.OnEncodeListener;
 import com.tencent.iot.video.link.param.AudioEncodeParam;
 import com.tencent.iot.video.link.param.MicParam;

diff --git a/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/VideoEncoder.java b/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/VideoEncoder.java
@@ -1,14 +1,13 @@
 package com.tencent.iot.video.link.encoder;
 
+import android.annotation.TargetApi;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 
-import androidx.annotation.RequiresApi;
-
 import com.tencent.iot.video.link.listener.OnEncodeListener;
 import com.tencent.iot.video.link.param.VideoEncodeParam;
 
@@ -66,7 +65,7 @@ private void initMediaCodec() {
     }
 
     //描述平均位速率（以位/秒为单位）的键。 关联的值是一个整数
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+    @TargetApi(Build.VERSION_CODES.KITKAT)
     public void setVideoBitRate(int bitRate) {
         int nowBitrate = videoEncodeParam.getBitRate();
         int nowWidth   = videoEncodeParam.getWidth();