Merge pull request #216 from AgoraIO/dev/3.5.0.4

Dev/3.5.0.4

Author: xia ning

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SwitchExternalVideo.java

@@ -69,7 +69,6 @@
 public class SwitchExternalVideo extends BaseFragment implements View.OnClickListener {
     private static final String TAG = SwitchExternalVideo.class.getSimpleName();
 
-    private FrameLayout fl_remote;
     private RelativeLayout fl_local;
     private Button join, localVideo;
     private EditText et_channel;
@@ -102,7 +101,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         join = view.findViewById(R.id.btn_join);
         localVideo = view.findViewById(R.id.localVideo);
         et_channel = view.findViewById(R.id.et_channel);
-        fl_remote = view.findViewById(R.id.fl_remote);
         fl_local = view.findViewById(R.id.fl_local);
         join.setOnClickListener(this);
         localVideo.setOnClickListener(this);
@@ -194,7 +192,6 @@ public void onClick(View v) {
                 joined = false;
                 join.setText(getString(R.string.join));
                 localVideo.setEnabled(false);
-                fl_remote.removeAllViews();
                 fl_local.removeAllViews();
                 /**After joining a channel, the user must call the leaveChannel method to end the
                  * call before joining another channel. This method returns 0 if the user leaves the

Android/APIExample/app/src/main/res/layout/fragment_switch_external_video.xml

@@ -12,12 +12,6 @@
         android:layout_height="match_parent"
         android:layout_above="@+id/ll_join" />
 
-    <FrameLayout
-        android:id="@+id/fl_remote"
-        android:layout_alignParentEnd="true"
-        android:layout_width="180dp"
-        android:layout_height="240dp"/>
-
     <LinearLayout
         android:id="@+id/ll_join"
         android:layout_width="match_parent"

iOS/APIExample/Examples/Advanced/CustomAudioSource/CustomAudioSource.swift

@@ -98,6 +98,7 @@ class CustomAudioSourceMain: BaseViewController {
             // leave channel when exiting the view
             if isJoined {
                 exAudio.stopWork()
+                agoraKit.disableExternalAudioSource()
                 agoraKit.leaveChannel { (stats) -> Void in
                     LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
                 }

iOS/APIExample/Examples/Advanced/CustomPcmAudioSource/CustomPcmAudioSource.swift

@@ -110,6 +110,7 @@ class CustomPcmAudioSourceMain: BaseViewController {
             // leave channel when exiting the view
             pcmSourcePush?.stop()
             if isJoined {
+                agoraKit.disableExternalAudioSource()
                 agoraKit.leaveChannel { (stats) -> Void in
                     LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
                 }