Merge remote-tracking branch 'origin/master' into dev/settings

Author: plutoless

Android/APIExample/app/build.gradle

@@ -57,4 +57,5 @@ dependencies {
     implementation project(path: ':lib-push-externalvideo')
     implementation project(path: ':lib-raw-data')
     implementation project(path: ':lib-switch-external-video')
+    implementation project(path: ':lib-screensharing')
 }

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

@@ -15,23 +15,28 @@
 import io.agora.api.example.examples.advanced.AdjustVolume;
 import io.agora.api.example.examples.advanced.ChannelEncryption;
 import io.agora.api.example.examples.advanced.CustomRemoteVideoRender;
+import io.agora.api.example.examples.advanced.GeoFencing;
 import io.agora.api.example.examples.advanced.HostAcrossChannel;
 import io.agora.api.example.examples.advanced.InCallReport;
 import io.agora.api.example.examples.advanced.JoinMultipleChannel;
+import io.agora.api.example.examples.advanced.LiveStreaming;
 import io.agora.api.example.examples.advanced.MediaPlayerKit;
 import io.agora.api.example.examples.advanced.PlayAudioFiles;
 import io.agora.api.example.examples.advanced.PreCallTest;
 import io.agora.api.example.examples.advanced.ProcessRawData;
 import io.agora.api.example.examples.advanced.PushExternalVideo;
 import io.agora.api.example.examples.advanced.SetVideoProfile;
+import io.agora.api.example.examples.advanced.SuperResolution;
 import io.agora.api.example.examples.advanced.SwitchExternalVideo;
 import io.agora.api.example.examples.advanced.SetAudioProfile;
+import io.agora.api.example.examples.advanced.MultiProcess;
 import io.agora.api.example.examples.advanced.VideoQuickSwitch;
 import io.agora.api.example.examples.advanced.RTMPInjection;
 import io.agora.api.example.examples.advanced.RTMPStreaming;
 import io.agora.api.example.examples.advanced.StreamEncrypt;
 import io.agora.api.example.examples.advanced.SwitchCameraScreenShare;
 import io.agora.api.example.examples.advanced.VideoMetadata;
+import io.agora.api.example.examples.advanced.VoiceEffects;
 import io.agora.api.example.examples.advanced.customaudio.CustomAudioSource;
 import io.agora.api.example.examples.basic.JoinChannelAudio;
 import io.agora.api.example.examples.basic.JoinChannelVideo;
@@ -95,9 +100,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             case R.id.action_mainFragment_to_PlayAudioFiles:
                 fragment = new PlayAudioFiles();
                 break;
+            case R.id.action_mainFragment_to_VoiceEffects:
+                fragment = new VoiceEffects();
+                break;
             case R.id.action_mainFragment_to_MediaPlayerKit:
                 fragment = new MediaPlayerKit();
                 break;
+            case R.id.action_mainFragment_to_GeoFencing:
+                fragment = new GeoFencing();
+                break;
             case R.id.action_mainFragment_to_RTMPInjection:
                 fragment = new RTMPInjection();
                 break;
@@ -128,12 +139,21 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             case R.id.action_mainFragment_to_hostacrosschannel:
                 fragment = new HostAcrossChannel();
                 break;
+            case R.id.action_mainFragment_to_superResolution:
+                fragment = new SuperResolution();
+                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;
+            case R.id.action_mainFragment_to_two_process_screen_share:
+                fragment = new MultiProcess();
+                break;
+            case R.id.action_mainFragment_to_live_streaming:
+                fragment = new LiveStreaming();
+                break;
             default:
                 fragment = new JoinChannelAudio();
                 break;

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

@@ -192,8 +192,6 @@ private void joinChannel(String channelId)
 
         // Create render view by RtcEngine
         SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
-        // Local video is on the top
-        surfaceView.setZOrderMediaOverlay(true);
         if(fl_local.getChildCount() > 0)
         {
             fl_local.removeAllViews();

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

@@ -164,8 +164,6 @@ private void joinChannel(String channelId) {
 
         // Create render view by RtcEngine
         SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
-        // Local video is on the top
-        surfaceView.setZOrderMediaOverlay(true);
         // Add to the local container
         if (fl_local.getChildCount() > 0) {
             fl_local.removeAllViews();