From ed300a779a6622f6be0f0272a207808b5cb5b876 Mon Sep 17 00:00:00 2001 From: wangchenqing Date: Wed, 19 Mar 2025 14:58:52 +0800 Subject: [PATCH] verify 1v1 video call --- .../app/build.gradle | 10 ++++++---- .../app/src/main/AndroidManifest.xml | 1 + .../VideoChatViewActivity.java | 17 +++++++++++------ .../Agora-Android-Tutorial-1to1/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../logger/build.gradle | 8 ++++---- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/build.gradle b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/build.gradle index 9752c08e..e509b549 100644 --- a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/build.gradle +++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/build.gradle @@ -1,14 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - + compileSdk 35 + namespace "io.agora.tutorials1v1vcall" defaultConfig { applicationId "io.agora.tutorials1v1vcall" - minSdkVersion 16 - targetSdkVersion 28 + minSdkVersion 35 + targetSdkVersion 35 versionCode 2 versionName "1.1" + ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86' } buildTypes { @@ -28,6 +29,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // DO NOT CHANGE, CI may needs it when packaging + implementation fileTree(dir: 'libs', include: ['*.aar']) implementation 'com.android.support:appcompat-v7:28.0.0' implementation project(path: ':logger') } diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/AndroidManifest.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/AndroidManifest.xml index 2331897c..e55b8929 100644 --- a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/AndroidManifest.xml +++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/AndroidManifest.xml @@ -18,6 +18,7 @@ diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/java/io/agora/tutorials1v1vcall/VideoChatViewActivity.java b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/java/io/agora/tutorials1v1vcall/VideoChatViewActivity.java index fcf05d8c..dea80dda 100644 --- a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/java/io/agora/tutorials1v1vcall/VideoChatViewActivity.java +++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/java/io/agora/tutorials1v1vcall/VideoChatViewActivity.java @@ -18,10 +18,10 @@ import android.widget.RelativeLayout; import android.widget.Toast; -import io.agora.rtc.IRtcEngineEventHandler; -import io.agora.rtc.RtcEngine; -import io.agora.rtc.video.VideoCanvas; -import io.agora.rtc.video.VideoEncoderConfiguration; +import io.agora.rtc2.IRtcEngineEventHandler; +import io.agora.rtc2.RtcEngine; +import io.agora.rtc2.video.VideoCanvas; +import io.agora.rtc2.video.VideoEncoderConfiguration; import io.agora.uikit.logger.LoggerRecyclerView; public class VideoChatViewActivity extends AppCompatActivity { @@ -143,7 +143,8 @@ private void setupRemoteVideo(int uid) { The video display view must be created using this method instead of directly calling SurfaceView. */ - SurfaceView view = RtcEngine.CreateRendererView(getBaseContext()); + // SurfaceView view = RtcEngine.CreateRendererView(getBaseContext()); + SurfaceView view = new SurfaceView(getBaseContext()); view.setZOrderMediaOverlay(parent == mLocalContainer); parent.addView(view); mRemoteVideo = new VideoCanvas(view, VideoCanvas.RENDER_MODE_HIDDEN, uid); @@ -272,13 +273,17 @@ private void setupLocalVideo() { // Our server will assign one and return the uid via the event // handler callback function (onJoinChannelSuccess) after // joining the channel successfully. - SurfaceView view = RtcEngine.CreateRendererView(getBaseContext()); + // SurfaceView view = RtcEngine.CreateRendererView(getBaseContext()); + SurfaceView view = new SurfaceView(getBaseContext()); view.setZOrderMediaOverlay(true); mLocalContainer.addView(view); // Initializes the local video view. // RENDER_MODE_HIDDEN: Uniformly scale the video until it fills the visible boundaries. One dimension of the video may have clipped contents. mLocalVideo = new VideoCanvas(view, VideoCanvas.RENDER_MODE_HIDDEN, 0); mRtcEngine.setupLocalVideo(mLocalVideo); + + // Start local preview. + mRtcEngine.startPreview(); } private void joinChannel() { diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/build.gradle b/One-to-One-Video/Agora-Android-Tutorial-1to1/build.gradle index 6d62c9db..8258d029 100644 --- a/One-to-One-Video/Agora-Android-Tutorial-1to1/build.gradle +++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:8.8.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/gradle/wrapper/gradle-wrapper.properties b/One-to-One-Video/Agora-Android-Tutorial-1to1/gradle/wrapper/gradle-wrapper.properties index 1bf6e4c4..989f63b6 100644 --- a/One-to-One-Video/Agora-Android-Tutorial-1to1/gradle/wrapper/gradle-wrapper.properties +++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jul 14 14:32:48 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/build.gradle b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/build.gradle index c2d35f83..6cb9ab79 100644 --- a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/build.gradle +++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 - + compileSdk 35 + namespace "io.agora.uikit.logger" defaultConfig { - minSdkVersion 16 - targetSdkVersion 28 + minSdkVersion 35 + targetSdkVersion 35 versionCode 1 versionName "1.0"