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

Author: sbd021

Android/APIExample/.gitignore

@@ -20,3 +20,4 @@ Test/
 # sdk files
 *.so
 agora-rtc-sdk.jar
+/release

Android/APIExample/agora-simple-filter/src/main/cpp/CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.4.1)
 project(agora-simple-filter)
 
 #link agora so
-set(agora-lib-so ${PROJECT_SOURCE_DIR}/../agoraLibs/${CMAKE_ANDROID_ARCH_ABI}/libagora-rtc-sdk-jni.so)
+set(agora-lib-so ${PROJECT_SOURCE_DIR}/../jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libagora-rtc-sdk-jni.so)
 link_libraries(${agora-lib-so})
 
 #link opencv so

Android/APIExample/agora-simple-filter/src/main/jniLibs/arm64-v8a/libopencv_java4.so

@@ -27,7 +27,6 @@
 import io.agora.api.example.examples.advanced.ProcessRawData;
 import io.agora.api.example.examples.advanced.PushExternalVideo;
 import io.agora.api.example.examples.advanced.SendDataStream;
-import io.agora.api.example.examples.advanced.SetVideoProfile;
 import io.agora.api.example.examples.advanced.SetAudioProfile;
 import io.agora.api.example.examples.advanced.SimpleAudioExtension;
 import io.agora.api.example.examples.advanced.VideoQuickSwitch;
@@ -129,9 +128,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             case R.id.action_mainFragment_to_hostacrosschannel:
                 fragment = new HostAcrossChannel();
                 break;
-            case R.id.action_mainFragment_to_set_video_profile:
-                fragment = new SetVideoProfile();
-                break;
             case R.id.action_mainFragment_to_channel_encryption:
                 fragment = new ChannelEncryption();
                 break;

Android/APIExample/agora-simple-filter/src/main/jniLibs/armeabi-v7a/libopencv_java4.so

@@ -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());
         }
     }
 

Android/APIExample/app/src/main/java/io/agora/api/example/ExampleActivity.java

@@ -216,7 +216,7 @@ private void joinChannel(String channelId)
         }
 
         // Create render view by RtcEngine
-        SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
+        SurfaceView surfaceView = new SurfaceView(context);
         // Local video is on the top
         surfaceView.setZOrderMediaOverlay(true);
         if(fl_local.getChildCount() > 0)
@@ -435,7 +435,7 @@ public void onUserJoined(int uid, int elapsed)
                     fl_remote.removeAllViews();
                 }
                 // Create render view by RtcEngine
-                surfaceView = RtcEngine.CreateRendererView(context);
+                surfaceView = new SurfaceView(context);
                 surfaceView.setZOrderMediaOverlay(true);
                 surfaceView.setZOrderOnTop(true);
                 // Add to the remote container

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

@@ -211,7 +211,7 @@ private void joinChannel(String channelId) {
         }
 
         // Create render view by RtcEngine
-        SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
+        SurfaceView surfaceView = new SurfaceView(context);
         // Local video is on the top
         surfaceView.setZOrderMediaOverlay(true);
         // Add to the local container
@@ -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.*/

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

@@ -228,7 +228,7 @@ private void joinChannel(String channelId)
         }
 
         // Create render view by RtcEngine
-        SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
+        SurfaceView surfaceView = new SurfaceView(context);
         if(fl_local.getChildCount() > 0)
         {
             fl_local.removeAllViews();
@@ -437,7 +437,7 @@ public void onUserJoined(int uid, int elapsed)
                     fl_remote.removeAllViews();
                 }
                 // Create render view by RtcEngine
-                surfaceView = RtcEngine.CreateRendererView(context);
+                surfaceView = new SurfaceView(context);
                 surfaceView.setZOrderMediaOverlay(true);
                 // Add to the remote container
                 fl_remote.addView(surfaceView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));

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

@@ -217,7 +217,7 @@ private void joinChannel(String channelId)
         }
 
         // Create render view by RtcEngine
-        SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
+        SurfaceView surfaceView = new SurfaceView(context);
         if(fl_local.getChildCount() > 0)
         {
             fl_local.removeAllViews();
@@ -426,7 +426,7 @@ public void onUserJoined(int uid, int elapsed)
                     fl_remote.removeAllViews();
                 }
                 // Create render view by RtcEngine
-                surfaceView = RtcEngine.CreateRendererView(context);
+                surfaceView = new SurfaceView(context);
                 surfaceView.setZOrderMediaOverlay(true);
                 // Add to the remote container
                 fl_remote.addView(surfaceView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));