Merge branch 'dev/4.3.0' of github.com:AgoraIO/API-Examples into dev/…

…4.3.0
AgoraIO · Nov 30, 2023 · e57b819 · e57b819
2 parents a9181f2 + 69a8fda
commit e57b819
Show file tree

Hide file tree

Showing 61 changed files with 4,067 additions and 1,784 deletions.
diff --git a/.../APIExample-Audio/app/src/main/java/io/agora/api/example/common/model/StatisticsInfo.java b/.../APIExample-Audio/app/src/main/java/io/agora/api/example/common/model/StatisticsInfo.java
@@ -1,24 +1,24 @@
 package io.agora.api.example.common.model;
 
+import io.agora.rtc2.IRtcEngineEventHandler;
 import io.agora.rtc2.IRtcEngineEventHandler.LocalVideoStats;
 import io.agora.rtc2.IRtcEngineEventHandler.RemoteAudioStats;
 import io.agora.rtc2.IRtcEngineEventHandler.RemoteVideoStats;
-import io.agora.rtc2.IRtcEngineEventHandlerBase;
 
 public class StatisticsInfo {
-    private LocalVideoStats localVideoStats = new LocalVideoStats(new IRtcEngineEventHandlerBase.LocalVideoStatsBase());
-    private IRtcEngineEventHandlerBase.LocalAudioStats localAudioStats = new IRtcEngineEventHandlerBase.LocalAudioStats();
-    private RemoteVideoStats remoteVideoStats = new RemoteVideoStats(new IRtcEngineEventHandlerBase.RemoteVideoStatsBase());
-    private RemoteAudioStats remoteAudioStats = new RemoteAudioStats(new IRtcEngineEventHandlerBase.RemoteAudioStatsBase());
-    private IRtcEngineEventHandlerBase.RtcStats rtcStats = new IRtcEngineEventHandlerBase.RtcStats();
+    private LocalVideoStats localVideoStats = new LocalVideoStats();
+    private IRtcEngineEventHandler.LocalAudioStats localAudioStats = new IRtcEngineEventHandler.LocalAudioStats();
+    private RemoteVideoStats remoteVideoStats = new RemoteVideoStats();
+    private RemoteAudioStats remoteAudioStats = new RemoteAudioStats();
+    private IRtcEngineEventHandler.RtcStats rtcStats = new IRtcEngineEventHandler.RtcStats();
     private int quality;
-    private IRtcEngineEventHandlerBase.LastmileProbeResult lastMileProbeResult;
+    private IRtcEngineEventHandler.LastmileProbeResult lastMileProbeResult;
 
     public void setLocalVideoStats(LocalVideoStats localVideoStats) {
         this.localVideoStats = localVideoStats;
     }
 
-    public void setLocalAudioStats(IRtcEngineEventHandlerBase.LocalAudioStats localAudioStats) {
+    public void setLocalAudioStats(IRtcEngineEventHandler.LocalAudioStats localAudioStats) {
         this.localAudioStats = localAudioStats;
     }
 
@@ -30,7 +30,7 @@ public void setRemoteAudioStats(RemoteAudioStats remoteAudioStats) {
         this.remoteAudioStats = remoteAudioStats;
     }
 
-    public void setRtcStats(IRtcEngineEventHandlerBase.RtcStats rtcStats) {
+    public void setRtcStats(IRtcEngineEventHandler.RtcStats rtcStats) {
         this.rtcStats = rtcStats;
     }
 
@@ -160,7 +160,7 @@ public String getLastMileResult() {
         return stringBuilder.toString();
     }
 
-    public void setLastMileProbeResult(IRtcEngineEventHandlerBase.LastmileProbeResult lastmileProbeResult) {
+    public void setLastMileProbeResult(IRtcEngineEventHandler.LastmileProbeResult lastmileProbeResult) {
         this.lastMileProbeResult = lastmileProbeResult;
     }
 

diff --git a/...IExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/SpatialSound.java b/...IExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/SpatialSound.java
@@ -399,8 +399,9 @@ private void unInitMediaPlayers() {
     private IMediaPlayer createLoopMediaPlayer() {
         IMediaPlayer mediaPlayer = engine.createMediaPlayer();
         mediaPlayer.registerPlayerObserver(new IMediaPlayerObserver() {
+
             @Override
-            public void onPlayerStateChanged(Constants.MediaPlayerState state, Constants.MediaPlayerError error) {
+            public void onPlayerStateChanged(Constants.MediaPlayerState state, Constants.MediaPlayerReason reason) {
                 if (state.equals(PLAYER_STATE_OPEN_COMPLETED)) {
                     mediaPlayer.setLoopCount(-1);
                     mediaPlayer.play();