Merge pull request #199 from oOJohn6Oo/fixSwitch

xia ning · web-flow · commit 67c0cfb9fbe5 · 2021-08-23T17:20:00.000+08:00
[BGF] Improve the feature of switch between earpiece and speaker when play audio.
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/AdjustVolume.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/AdjustVolume.java
@@ -69,6 +69,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mute.setOnClickListener(this);
         speaker = view.findViewById(R.id.btn_speaker);
         speaker.setOnClickListener(this);
+        speaker.setActivated(true);
         record = view.findViewById(R.id.recordingVol);
         playout = view.findViewById(R.id.playoutVol);
         inear = view.findViewById(R.id.inEarMonitorVol);
@@ -221,9 +222,9 @@ public void onClick(View v) {
             engine.muteLocalAudioStream(mute.isActivated());
         } else if (v.getId() == R.id.btn_speaker) {
             speaker.setActivated(!speaker.isActivated());
-            speaker.setText(getString(speaker.isActivated() ? R.string.earpiece : R.string.speaker));
+            speaker.setText(getString(speaker.isActivated() ? R.string.speaker : R.string.earpiece));
             /**Turn off / on the speaker and change the audio playback route.*/
-            engine.setEnableSpeakerphone(speaker.isActivated());
+            engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());
         }
     }
 
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/CustomRemoteVideoRender.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/CustomRemoteVideoRender.java
@@ -223,7 +223,6 @@ private void joinChannel(String channelId) {
         engine.setupLocalVideo(new VideoCanvas(surfaceView, RENDER_MODE_HIDDEN, 0));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         engine.registerVideoFrameObserver(videoFrameObserver);
         /**In the demo, the default is to enter as the anchor.*/
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java
@@ -75,6 +75,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mute.setOnClickListener(this);
         speaker = view.findViewById(R.id.btn_speaker);
         speaker.setOnClickListener(this);
+        speaker.setActivated(true);
         bgm = view.findViewById(R.id.btn_bgm);
         bgm.setOnClickListener(this);
         effect = view.findViewById(R.id.btn_effect);
@@ -242,9 +243,9 @@ else if (v.getId() == R.id.microphone)
         else if (v.getId() == R.id.btn_speaker)
         {
             speaker.setActivated(!speaker.isActivated());
-            speaker.setText(getString(speaker.isActivated() ? R.string.earpiece : R.string.speaker));
+            speaker.setText(getString(speaker.isActivated() ? R.string.speaker : R.string.earpiece));
             /**Turn off / on the speaker and change the audio playback route.*/
-            engine.setEnableSpeakerphone(speaker.isActivated());
+            engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());
         }
         else if(v.getId() == R.id.btn_bgm)
         {
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ProcessAudioRawData.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ProcessAudioRawData.java
@@ -142,6 +142,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mute.setOnClickListener(this);
         speaker = view.findViewById(R.id.btn_speaker);
         speaker.setOnClickListener(this);
+        speaker.setActivated(true);
         writeBackAudio = view.findViewById(R.id.writebackAudio);
         writeBackAudio.setOnCheckedChangeListener(this);
         record = view.findViewById(R.id.recordingVol);
@@ -266,9 +267,9 @@ public void onClick(View v) {
             engine.muteLocalAudioStream(mute.isActivated());
         } else if (v.getId() == R.id.btn_speaker) {
             speaker.setActivated(!speaker.isActivated());
-            speaker.setText(getString(speaker.isActivated() ? R.string.earpiece : R.string.speaker));
+            speaker.setText(getString(speaker.isActivated() ? R.string.speaker : R.string.earpiece));
             /**Turn off / on the speaker and change the audio playback route.*/
-            engine.setEnableSpeakerphone(speaker.isActivated());
+            engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());
         }
     }
 
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ProcessRawData.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ProcessRawData.java
@@ -209,7 +209,6 @@ private void joinChannel(String channelId) {
         ));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         int ret = engine.registerVideoFrameObserver(iVideoFrameObserver);
         // Enable video module should be after calling registerVideoFrameObserver
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PushExternalVideo.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PushExternalVideo.java
@@ -223,7 +223,6 @@ private void joinChannel(String channelId) {
                 ViewGroup.LayoutParams.MATCH_PARENT));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         /**In the demo, the default is to enter as the anchor.*/
         engine.setClientRole(IRtcEngineEventHandler.ClientRole.CLIENT_ROLE_BROADCASTER);
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/RTMPStreaming.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/RTMPStreaming.java
@@ -237,7 +237,6 @@ private void joinChannel(String channelId)
         ));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         /**Please configure accessToken in the string_config file.
          * A temporary token generated in Console. A temporary token is valid for 24 hours. For details, see
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SendDataStream.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SendDataStream.java
@@ -230,7 +230,6 @@ private void joinChannel(String channelId)
         ));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         /**Please configure accessToken in the string_config file.
          * A temporary token generated in Console. A temporary token is valid for 24 hours. For details, see
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SetAudioProfile.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SetAudioProfile.java
@@ -74,6 +74,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mute.setOnClickListener(this);
         speaker = view.findViewById(R.id.btn_speaker);
         speaker.setOnClickListener(this);
+        speaker.setActivated(true);
     }
 
     @Override
@@ -199,9 +200,9 @@ else if (v.getId() == R.id.microphone)
         else if (v.getId() == R.id.btn_speaker)
         {
             speaker.setActivated(!speaker.isActivated());
-            speaker.setText(getString(speaker.isActivated() ? R.string.earpiece : R.string.speaker));
+            speaker.setText(getString(speaker.isActivated() ? R.string.speaker : R.string.earpiece));
             /**Turn off / on the speaker and change the audio playback route.*/
-            engine.setEnableSpeakerphone(speaker.isActivated());
+            engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());
         }
     }
 
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SwitchCameraScreenShare.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SwitchCameraScreenShare.java
@@ -359,7 +359,6 @@ private void joinChannel(String channelId) {
         ));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         /**Please configure accessToken in the string_config file.
          * A temporary token generated in Console. A temporary token is valid for 24 hours. For details, see
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/VideoMetadata.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/VideoMetadata.java
@@ -235,7 +235,6 @@ private void joinChannel(String channelId)
         ));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         /**register metadata observer
          * @return 0：Success
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/VideoQuickSwitch.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/VideoQuickSwitch.java
@@ -292,7 +292,6 @@ private final void joinChannel(String channelId)
         ));
         /**Set up to play remote sound with receiver*/
         engine.setDefaultAudioRoutetoSpeakerphone(true);
-        engine.setEnableSpeakerphone(true);
 
         /**Please configure accessToken in the string_config file.
          * A temporary token generated in Console. A temporary token is valid for 24 hours. For details, see
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/basic/JoinChannelAudio.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/basic/JoinChannelAudio.java
@@ -72,6 +72,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mute = view.findViewById(R.id.microphone);
         mute.setOnClickListener(this);
         speaker = view.findViewById(R.id.btn_speaker);
+        speaker.setActivated(true);
         speaker.setOnClickListener(this);
     }
 
@@ -195,9 +196,9 @@ else if (v.getId() == R.id.microphone)
         else if (v.getId() == R.id.btn_speaker)
         {
             speaker.setActivated(!speaker.isActivated());
-            speaker.setText(getString(speaker.isActivated() ? R.string.earpiece : R.string.speaker));
+            speaker.setText(getString(!speaker.isActivated() ? R.string.speaker : R.string.earpiece));
             /**Turn off / on the speaker and change the audio playback route.*/
-            engine.setEnableSpeakerphone(speaker.isActivated());
+            engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat`
`75`	`75`	`mute.setOnClickListener(this);`
`76`	`76`	`speaker = view.findViewById(R.id.btn_speaker);`
`77`	`77`	`speaker.setOnClickListener(this);`
	`78`	`+ speaker.setActivated(true);`
`78`	`79`	`bgm = view.findViewById(R.id.btn_bgm);`
`79`	`80`	`bgm.setOnClickListener(this);`
`80`	`81`	`effect = view.findViewById(R.id.btn_effect);`
`@@ -242,9 +243,9 @@ else if (v.getId() == R.id.microphone)`
`242`	`243`	`else if (v.getId() == R.id.btn_speaker)`
`243`	`244`	`{`
`244`	`245`	`speaker.setActivated(!speaker.isActivated());`
`245`		`- speaker.setText(getString(speaker.isActivated() ? R.string.earpiece : R.string.speaker));`
	`246`	`+ speaker.setText(getString(speaker.isActivated() ? R.string.speaker : R.string.earpiece));`
`246`	`247`	`/*Turn off / on the speaker and change the audio playback route./`
`247`		`- engine.setEnableSpeakerphone(speaker.isActivated());`
	`248`	`+ engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());`
`248`	`249`	`}`
`249`	`250`	`else if(v.getId() == R.id.btn_bgm)`
`250`	`251`	`{`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat`
`74`	`74`	`mute.setOnClickListener(this);`
`75`	`75`	`speaker = view.findViewById(R.id.btn_speaker);`
`76`	`76`	`speaker.setOnClickListener(this);`
	`77`	`+ speaker.setActivated(true);`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`@Override`
`@@ -199,9 +200,9 @@ else if (v.getId() == R.id.microphone)`
`199`	`200`	`else if (v.getId() == R.id.btn_speaker)`
`200`	`201`	`{`
`201`	`202`	`speaker.setActivated(!speaker.isActivated());`
`202`		`- speaker.setText(getString(speaker.isActivated() ? R.string.earpiece : R.string.speaker));`
	`203`	`+ speaker.setText(getString(speaker.isActivated() ? R.string.speaker : R.string.earpiece));`
`203`	`204`	`/*Turn off / on the speaker and change the audio playback route./`
`204`		`- engine.setEnableSpeakerphone(speaker.isActivated());`
	`205`	`+ engine.setDefaultAudioRoutetoSpeakerphone(speaker.isActivated());`
`205`	`206`	`}`
`206`	`207`	`}`
`207`	`208`