Skip to content

Commit b94da44

Browse files
Chen-AlexanderChen-Alexander
authored
Merge branch 'master' into dev/cjw
2 parents 280b573 + e22598d commit b94da44

222 files changed

Lines changed: 35066 additions & 3622 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/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
*.so
12
*.iml
23
.gradle
34
/local.properties

‎Android/APIExample/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# API Example iOS
1+
# API Example Android
22

33
*English | [中文](README.zh.md)*
44

‎Android/APIExample/app/src/main/assets/effectA.wav‎

1.89 MB
Binary file not shown.

‎Android/APIExample/app/src/main/assets/music_1.m4a‎

1.85 MB
Binary file not shown.

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,21 @@
1313
import io.agora.api.component.Constant;
1414
import io.agora.api.example.common.model.ExampleBean;
1515
import io.agora.api.example.examples.advanced.CustomRemoteVideoRender;
16+
import io.agora.api.example.examples.advanced.GeoFencing;
17+
import io.agora.api.example.examples.advanced.JoinMultipleChannel;
18+
import io.agora.api.example.examples.advanced.MediaPlayerKit;
19+
import io.agora.api.example.examples.advanced.PlayAudioFiles;
1620
import io.agora.api.example.examples.advanced.ProcessRawData;
1721
import io.agora.api.example.examples.advanced.PushExternalVideo;
1822
import io.agora.api.example.examples.advanced.SwitchExternalVideo;
23+
import io.agora.api.example.examples.advanced.SetAudioProfile;
1924
import io.agora.api.example.examples.advanced.VideoQuickSwitch;
2025
import io.agora.api.example.examples.advanced.RTMPInjection;
2126
import io.agora.api.example.examples.advanced.RTMPStreaming;
2227
import io.agora.api.example.examples.advanced.StreamEncrypt;
2328
import io.agora.api.example.examples.advanced.SwitchCameraScreenShare;
2429
import io.agora.api.example.examples.advanced.VideoMetadata;
30+
import io.agora.api.example.examples.advanced.VoiceEffects;
2531
import io.agora.api.example.examples.advanced.customaudio.CustomAudioRecord;
2632
import io.agora.api.example.examples.basic.JoinChannelAudio;
2733
import io.agora.api.example.examples.basic.JoinChannelVideo;
@@ -76,6 +82,24 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
7682
case R.id.action_mainFragment_to_QuickSwitch:
7783
fragment = new VideoQuickSwitch();
7884
break;
85+
case R.id.action_mainFragment_to_MultiChannel:
86+
fragment = new JoinMultipleChannel();
87+
break;
88+
case R.id.action_mainFragment_to_SetAudioProfile:
89+
fragment = new SetAudioProfile();
90+
break;
91+
case R.id.action_mainFragment_to_PlayAudioFiles:
92+
fragment = new PlayAudioFiles();
93+
break;
94+
case R.id.action_mainFragment_to_VoiceEffects:
95+
fragment = new VoiceEffects();
96+
break;
97+
case R.id.action_mainFragment_to_MediaPlayerKit:
98+
fragment = new MediaPlayerKit();
99+
break;
100+
case R.id.action_mainFragment_to_GeoFencing:
101+
fragment = new GeoFencing();
102+
break;
79103
case R.id.action_mainFragment_to_RTMPInjection:
80104
fragment = new RTMPInjection();
81105
break;

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package io.agora.api.example.examples.advanced;
2+
3+
import io.agora.api.example.R;
4+
import io.agora.api.example.annotation.Example;
5+
import io.agora.api.example.common.BaseFragment;
6+
7+
import static io.agora.api.example.common.model.Examples.ADVANCED;
8+
9+
@Example(
10+
index = 17,
11+
group = ADVANCED,
12+
name = R.string.item_geofencing,
13+
actionId = R.id.action_mainFragment_to_GeoFencing,
14+
tipsId = R.string.geofencing
15+
)
16+
public class GeoFencing extends BaseFragment {
17+
}

0 commit comments

Comments
 (0)