Skip to content

Commit b7f4e56

Browse files
author
xianing
committed
Merge branch 'dev/3.6.200' of https://github.com/AgoraIO/API-Examples into dev/3.6.200
2 parents 8393594 + 82e4f64 commit b7f4e56

31 files changed

Lines changed: 192 additions & 97 deletions

‎Android/APIExample/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ Test/
2020
# sdk files
2121
*.so
2222
agora-rtc-sdk.jar
23+
/release

‎Android/APIExample/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
android:allowBackup="true"
1616
android:icon="@mipmap/ic_launcher"
1717
android:label="@string/app_name"
18+
android:requestLegacyExternalStorage="true"
1819
android:roundIcon="@mipmap/ic_launcher_round"
1920
android:supportsRtl="true"
2021
android:theme="@style/AppTheme">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ private void joinChannel(String channelId)
216216
}
217217

218218
// Create render view by RtcEngine
219-
SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
219+
SurfaceView surfaceView = new SurfaceView(context);
220220
// Local video is on the top
221221
surfaceView.setZOrderMediaOverlay(true);
222222
if(fl_local.getChildCount() > 0)
@@ -435,7 +435,7 @@ public void onUserJoined(int uid, int elapsed)
435435
fl_remote.removeAllViews();
436436
}
437437
// Create render view by RtcEngine
438-
surfaceView = RtcEngine.CreateRendererView(context);
438+
surfaceView = new SurfaceView(context);
439439
surfaceView.setZOrderMediaOverlay(true);
440440
surfaceView.setZOrderOnTop(true);
441441
// Add to the remote container

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ private void joinChannel(String channelId) {
211211
}
212212

213213
// Create render view by RtcEngine
214-
SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
214+
SurfaceView surfaceView = new SurfaceView(context);
215215
// Local video is on the top
216216
surfaceView.setZOrderMediaOverlay(true);
217217
// Add to the local container

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private void joinChannel(String channelId)
228228
}
229229

230230
// Create render view by RtcEngine
231-
SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
231+
SurfaceView surfaceView = new SurfaceView(context);
232232
if(fl_local.getChildCount() > 0)
233233
{
234234
fl_local.removeAllViews();
@@ -437,7 +437,7 @@ public void onUserJoined(int uid, int elapsed)
437437
fl_remote.removeAllViews();
438438
}
439439
// Create render view by RtcEngine
440-
surfaceView = RtcEngine.CreateRendererView(context);
440+
surfaceView = new SurfaceView(context);
441441
surfaceView.setZOrderMediaOverlay(true);
442442
// Add to the remote container
443443
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/InCallReport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private void joinChannel(String channelId)
217217
}
218218

219219
// Create render view by RtcEngine
220-
SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
220+
SurfaceView surfaceView = new SurfaceView(context);
221221
if(fl_local.getChildCount() > 0)
222222
{
223223
fl_local.removeAllViews();
@@ -426,7 +426,7 @@ public void onUserJoined(int uid, int elapsed)
426426
fl_remote.removeAllViews();
427427
}
428428
// Create render view by RtcEngine
429-
surfaceView = RtcEngine.CreateRendererView(context);
429+
surfaceView = new SurfaceView(context);
430430
surfaceView.setZOrderMediaOverlay(true);
431431
// Add to the remote container
432432
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/JoinMultipleChannel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private void joinChannel(String channelId)
200200
}
201201

202202
// Create render view by RtcEngine
203-
SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
203+
SurfaceView surfaceView = new SurfaceView(context);
204204
if(fl_local.getChildCount() > 0)
205205
{
206206
fl_local.removeAllViews();
@@ -313,7 +313,7 @@ public void onUserJoined(int uid, int elapsed) {
313313
fl_remote2.removeAllViews();
314314
}
315315
// Create render view by RtcEngine
316-
surfaceView = RtcEngine.CreateRendererView(context);
316+
surfaceView = new SurfaceView(context);
317317
surfaceView.setZOrderMediaOverlay(true);
318318
// Add to the remote container
319319
fl_remote2.addView(surfaceView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
@@ -489,7 +489,7 @@ public void onUserJoined(int uid, int elapsed) {
489489
fl_remote.removeAllViews();
490490
}
491491
// Create render view by RtcEngine
492-
surfaceView = RtcEngine.CreateRendererView(context);
492+
surfaceView = new SurfaceView(context);
493493
surfaceView.setZOrderMediaOverlay(true);
494494
// Add to the remote container
495495
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/LiveStreaming.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ public void onClick(View v) {
197197
backGroundVideo.removeAllViews();
198198
}
199199
// Create render view by RtcEngine
200-
SurfaceView localView = RtcEngine.CreateRendererView(getContext());
201-
SurfaceView remoteView = RtcEngine.CreateRendererView(getContext());
200+
SurfaceView localView = new SurfaceView(getContext());
201+
SurfaceView remoteView = new SurfaceView(getContext());
202202
if (isLocalVideoForeground){
203203
// Add to the local container
204204
foreGroundVideo.addView(localView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
@@ -237,7 +237,7 @@ private void joinChannel(String channelId) {
237237
}
238238

239239
// Create render view by RtcEngine
240-
SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
240+
SurfaceView surfaceView = new SurfaceView(context);
241241
if (foreGroundVideo.getChildCount() > 0) {
242242
foreGroundVideo.removeAllViews();
243243
}
@@ -406,7 +406,7 @@ public void onUserJoined(int uid, int elapsed) {
406406
backGroundVideo.removeAllViews();
407407
}
408408
// Create render view by RtcEngine
409-
surfaceView = RtcEngine.CreateRendererView(context);
409+
surfaceView = new SurfaceView(context);
410410
surfaceView.setZOrderMediaOverlay(true);
411411
// Add to the remote container
412412
backGroundVideo.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/MediaPlayer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public void onUserJoined(int uid, int elapsed) {
456456
fl_remote.removeAllViews();
457457
}
458458
// Create render view by RtcEngine
459-
surfaceView = RtcEngine.CreateRendererView(context);
459+
surfaceView = new SurfaceView(context);
460460
surfaceView.setZOrderMediaOverlay(true);
461461
// Add to the remote container
462462
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/ProcessAudioRawData.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ public boolean onMixedAudioFrame(int i, int i1, int i2, int i3, int i4, ByteBuff
337337
public boolean onPlaybackAudioFrameBeforeMixing(String s, int i, int i1, int i2, int i3, int i4, ByteBuffer byteBuffer, long l, int i5) {
338338
return false;
339339
}
340-
341340
};
342341

343342
/**

0 commit comments

Comments
 (0)