upgrade android media player to 1.2.2

Xia Ning · Xia Ning · commit 1a0877a525ac · 2021-01-28T23:50:09.000+08:00
diff --git a/Android/APIExample/app/libs/RtcChannelPublishHelper.aar b/Android/APIExample/app/libs/RtcChannelPublishHelper.aar
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MediaPlayerKit.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MediaPlayerKit.java
@@ -34,6 +34,7 @@
 import io.agora.mediaplayer.data.VideoFrame;
 import io.agora.rtc.IRtcEngineEventHandler;
 import io.agora.rtc.RtcEngine;
+import io.agora.rtc.mediaio.AgoraDefaultSource;
 import io.agora.rtc.models.ChannelMediaOptions;
 import io.agora.rtc.video.VideoCanvas;
 import io.agora.rtc.video.VideoEncoderConfiguration;
@@ -173,9 +174,6 @@ public void onPlayerStateChanged(Constants.MediaPlayerState state, Constants.Med
                     pause.setEnabled(true);
                     publish.setEnabled(true);
                     unpublish.setEnabled(true);
-                } else if (state.equals(PLAYER_STATE_PLAYING)) {
-                    rtcChannelPublishHelper.publishVideo();
-                    rtcChannelPublishHelper.publishAudio();
                 }
             }
 
@@ -289,15 +287,14 @@ public void onClick(View v) {
             playerDuration = agoraMediaPlayerKit.getDuration();
         } else if (v.getId() == R.id.stop) {
             agoraMediaPlayerKit.stop();
-            rtcChannelPublishHelper.detachPlayerFromRtc();
         } else if (v.getId() == R.id.pause) {
             agoraMediaPlayerKit.pause();
         } else if (v.getId() == R.id.publish) {
-            rtcChannelPublishHelper.attachPlayerToRtc(agoraMediaPlayerKit, engine);
             rtcChannelPublishHelper.publishAudio();
             rtcChannelPublishHelper.publishVideo();
         } else if (v.getId() == R.id.unpublish) {
-            rtcChannelPublishHelper.detachPlayerFromRtc();
+            rtcChannelPublishHelper.unpublishAudio();
+            rtcChannelPublishHelper.unpublishVideo();
         }
     }
 
@@ -335,6 +332,11 @@ private void joinChannel(String channelId) {
             fl_local.removeAllViews();
         }
         fl_local.addView(surfaceView);
+
+        // attach player to agora rtc kit, so that the media stream can be published
+        rtcChannelPublishHelper.attachPlayerToRtc(agoraMediaPlayerKit, engine);
+
+        // set media local play view
         agoraMediaPlayerKit.setView(surfaceView);
         agoraMediaPlayerKit.setRenderMode(PLAYER_RENDER_MODE_FIT);
 
diff --git a/Android/APIExample/app/src/main/res/layout/fragment_media_player_kit.xml b/Android/APIExample/app/src/main/res/layout/fragment_media_player_kit.xml
@@ -35,7 +35,7 @@
             android:visibility="invisible"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="220dp"
+            android:layout_marginTop="180dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp" />
 
@@ -44,8 +44,8 @@
             android:visibility="invisible"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
-            android:layout_marginStart="280dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="240dp"
             android:layout_marginEnd="16dp" />
 
 
diff --git a/iOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift b/iOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift
@@ -188,9 +188,8 @@ class AudioMixingMain: BaseViewController {
     }
     
     @IBAction func onStartAudioMixing(_ sender:UIButton){
-        let url = "http://ok100-book.oss-cn-beijing.aliyuncs.com/m4a/susu.m4a"
         if let filepath = Bundle.main.path(forResource: "audiomixing", ofType: "mp3") {
-            let result = agoraKit.startAudioMixing(url, loopback: false, replace: false, cycle: -1)
+            let result = agoraKit.startAudioMixing(filepath, loopback: false, replace: false, cycle: -1)
             if result != 0 {
                 self.showAlert(title: "Error", message: "startAudioMixing call failed: \(result), please check your params")
             } else {
