Skip to content

Commit 5441d39

Browse files
author
xia ning
authored
Merge pull request #275 from AgoraIO/staging
Staging
2 parents 2db372f + 9af7f51 commit 5441d39

160 files changed

Lines changed: 4390 additions & 19113 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Android/APIExample/README.zh.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ _[English](README.md) | 中文_
3737
| 调整音量 | [AdjustVolume.java](./app/src/main/java/io/agora/api/example/examples/advanced/AdjustVolume.java) |
3838
| 呼叫前测试 | [PreCallTest.java](./app/src/main/java/io/agora/api/example/examples/advanced/PreCallTest.java) |
3939
| 频道媒体流转发 | [HostAcrossChannel.java](./app/src/main/java/io/agora/api/example/examples/advanced/HostAcrossChannel.java) |
40-
| 超级分辨率 | [SuperResolution.java](./app/src/main/java/io/agora/api/example/examples/advanced/SuperResolution.java) |
40+
| 超清分辨率 | [SuperResolution.java](./app/src/main/java/io/agora/api/example/examples/advanced/SuperResolution.java) |
4141
| 使用 SDK 提供的方法加密媒体流 | [ChannelEncryption.java](./app/src/main/java/io/agora/api/example/examples/advanced/ChannelEncryption.java) |
4242
| 使用多进程同时发送摄像头采集的视频和屏幕共享视频 | [MultiProcess.java](./app/src/main/java/io/agora/api/example/examples/advanced/MultiProcess.java) |
4343
| 在直播场景下切换角色 | [LiveStreaming.java](./app/src/main/java/io/agora/api/example/examples/advanced/LiveStreaming.java) |

‎Android/APIExample/app/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,4 @@ dependencies {
6060
implementation project(path: ':lib-raw-data')
6161
implementation project(path: ':lib-switch-external-video')
6262
implementation project(path: ':lib-screensharing')
63-
implementation project(path: ':lib-player-helper')
6463
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
android:label="@string/app_name"
1616
android:roundIcon="@drawable/icon1024"
1717
android:supportsRtl="true"
18+
android:usesCleartextTraffic="true"
19+
android:requestLegacyExternalStorage="true"
1820
android:theme="@style/AppTheme">
1921

2022
<activity

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@
1616
import io.agora.api.example.examples.advanced.AdjustVolume;
1717
import io.agora.api.example.examples.advanced.ChannelEncryption;
1818
import io.agora.api.example.examples.advanced.CustomRemoteVideoRender;
19+
import io.agora.api.example.examples.advanced.FaceBeauty;
1920
import io.agora.api.example.examples.advanced.GeoFencing;
2021
import io.agora.api.example.examples.advanced.HostAcrossChannel;
2122
import io.agora.api.example.examples.advanced.InCallReport;
2223
import io.agora.api.example.examples.advanced.JoinMultipleChannel;
2324
import io.agora.api.example.examples.advanced.LiveStreaming;
24-
import io.agora.api.example.examples.advanced.MediaPlayerKit;
25+
import io.agora.api.example.examples.advanced.MultiProcess;
2526
import io.agora.api.example.examples.advanced.PlayAudioFiles;
2627
import io.agora.api.example.examples.advanced.PreCallTest;
2728
import io.agora.api.example.examples.advanced.ProcessRawData;
2829
import io.agora.api.example.examples.advanced.PushExternalVideo;
30+
import io.agora.api.example.examples.advanced.RTMPStreaming;
2931
import io.agora.api.example.examples.advanced.ScreenShare;
3032
import io.agora.api.example.examples.advanced.SendDataStream;
33+
import io.agora.api.example.examples.advanced.SetAudioProfile;
3134
import io.agora.api.example.examples.advanced.SetVideoProfile;
35+
import io.agora.api.example.examples.advanced.SpatialSound;
36+
import io.agora.api.example.examples.advanced.StreamEncrypt;
3237
import io.agora.api.example.examples.advanced.SuperResolution;
3338
import io.agora.api.example.examples.advanced.SwitchExternalVideo;
34-
import io.agora.api.example.examples.advanced.SetAudioProfile;
35-
import io.agora.api.example.examples.advanced.MultiProcess;
36-
import io.agora.api.example.examples.advanced.FaceBeauty;
37-
import io.agora.api.example.examples.advanced.VideoQuickSwitch;
38-
import io.agora.api.example.examples.advanced.RTMPStreaming;
39-
import io.agora.api.example.examples.advanced.StreamEncrypt;
4039
import io.agora.api.example.examples.advanced.VideoMetadata;
40+
import io.agora.api.example.examples.advanced.VideoQuickSwitch;
4141
import io.agora.api.example.examples.advanced.VoiceEffects;
4242
import io.agora.api.example.examples.advanced.customaudio.CustomAudioSource;
4343
import io.agora.api.example.examples.basic.JoinChannelAudio;
@@ -105,9 +105,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
105105
case R.id.action_mainFragment_to_VoiceEffects:
106106
fragment = new VoiceEffects();
107107
break;
108-
case R.id.action_mainFragment_to_MediaPlayerKit:
109-
fragment = new MediaPlayerKit();
110-
break;
111108
case R.id.action_mainFragment_to_GeoFencing:
112109
fragment = new GeoFencing();
113110
break;
@@ -162,6 +159,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
162159
case R.id.action_mainFragment_to_screen_share:
163160
fragment = new ScreenShare();
164161
break;
162+
case R.id.action_mainFragment_to_spatial_sound:
163+
fragment = new SpatialSound();
164+
break;
165165
default:
166166
fragment = new JoinChannelAudio();
167167
break;

0 commit comments

Comments
 (0)