Skip to content

Commit eb231aa

Browse files
xgfd3xgfd3
authored
Merge branch 'dev/4.3.0' into feat/code_style_android
2 parents 698255f + 53dd609 commit eb231aa

97 files changed

Lines changed: 24521 additions & 92 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.

‎.github/workflows/gitee-sync.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: gitee-sync
2+
on:
3+
pull_request:
4+
workflow_dispatch:
5+
6+
jobs:
7+
build:
8+
name: gitee-sync
9+
runs-on: ubuntu-latest
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
if: github.actor != 'dependabot[bot]'
15+
steps:
16+
- name: Gitee sync repo
17+
uses: Yikun/hub-mirror-action@v1.3
18+
with:
19+
src: github/AgoraIO
20+
dst: gitee/agoraio-community
21+
white_list: "API-Examples"
22+
static_list: "API-Examples"
23+
cache_path: "./cache"
24+
dst_key: ${{ secrets.GITEE_PI_SSH }}
25+
dst_token: ${{ secrets.GITEE_PRIVATE_TOKEN }}
26+
force_update: true
27+
account_type: org

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/common/model/GlobalSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class GlobalSettings {
2828
public LocalAccessPointConfiguration getPrivateCloudConfig() {
2929
LocalAccessPointConfiguration config = new LocalAccessPointConfiguration();
3030
if(TextUtils.isEmpty(privateCloudIp)){
31-
return config;
31+
return null;
3232
}
3333
config.ipList = new ArrayList<>();
3434
config.ipList.add(privateCloudIp);

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import io.agora.rtc2.IRtcEngineEventHandler;
4040
import io.agora.rtc2.RtcEngine;
4141
import io.agora.rtc2.RtcEngineConfig;
42+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
4243

4344
@Example(
4445
index = 15,
@@ -196,7 +197,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
196197
+ "}"
197198
+ "}");
198199
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
199-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
200+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
201+
if (localAccessPointConfiguration != null) {
202+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
203+
engine.setLocalAccessPoint(localAccessPointConfiguration);
204+
}
200205
preloadAudioEffect();
201206
}
202207
catch (Exception e)

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/PreCallTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import io.agora.rtc2.RtcEngine;
2929
import io.agora.rtc2.RtcEngineConfig;
3030
import io.agora.rtc2.internal.LastmileProbeConfig;
31+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
3132

3233
@Example(
3334
index = 16,
@@ -107,7 +108,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
107108
+ "}"
108109
+ "}");
109110
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
110-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
111+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
112+
if (localAccessPointConfiguration != null) {
113+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
114+
engine.setLocalAccessPoint(localAccessPointConfiguration);
115+
}
111116
}
112117
catch (Exception e) {
113118
e.printStackTrace();

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/ProcessAudioRawData.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import io.agora.rtc2.RtcEngine;
3939
import io.agora.rtc2.RtcEngineConfig;
4040
import io.agora.rtc2.audio.AudioParams;
41+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
4142

4243
/**
4344
* This demo demonstrates how to make a one-to-one voice call
@@ -178,7 +179,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
178179
+ "}"
179180
+ "}");
180181
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
181-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
182+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
183+
if (localAccessPointConfiguration != null) {
184+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
185+
engine.setLocalAccessPoint(localAccessPointConfiguration);
186+
}
182187
engine.registerAudioFrameObserver(iAudioFrameObserver);
183188
engine.setRecordingAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, SAMPLES);
184189
engine.setPlaybackAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, SAMPLES);

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/RhythmPlayer.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import io.agora.rtc2.RtcEngine;
3434
import io.agora.rtc2.RtcEngineConfig;
3535
import io.agora.rtc2.audio.AgoraRhythmPlayerConfig;
36+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
3637

3738
/**
3839
* This demo demonstrates how to make a VideoProcessExtension
@@ -138,7 +139,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
138139
+ "}"
139140
+ "}");
140141
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
141-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
142+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
143+
if (localAccessPointConfiguration != null) {
144+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
145+
engine.setLocalAccessPoint(localAccessPointConfiguration);
146+
}
142147
}
143148
catch (Exception e)
144149
{

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/SpatialSound.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import io.agora.rtc2.RtcEngineConfig;
4545
import io.agora.rtc2.RtcEngineEx;
4646
import io.agora.rtc2.SpatialAudioParams;
47+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
4748
import io.agora.spatialaudio.ILocalSpatialAudioEngine;
4849
import io.agora.spatialaudio.LocalSpatialAudioConfig;
4950
import io.agora.spatialaudio.RemoteVoicePositionInfo;
@@ -117,7 +118,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
117118
+ "}"
118119
+ "}");
119120
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
120-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
121+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
122+
if (localAccessPointConfiguration != null) {
123+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
124+
engine.setLocalAccessPoint(localAccessPointConfiguration);
125+
}
121126
engine.enableAudio();
122127

123128
localSpatial = ILocalSpatialAudioEngine.create();

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/VoiceEffects.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
import io.agora.rtc2.IRtcEngineEventHandler;
8888
import io.agora.rtc2.RtcEngine;
8989
import io.agora.rtc2.RtcEngineConfig;
90+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
9091

9192
@Example(
9293
index = 4,
@@ -273,7 +274,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
273274
+ "}"
274275
+ "}");
275276
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
276-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
277+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
278+
if (localAccessPointConfiguration != null) {
279+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
280+
engine.setLocalAccessPoint(localAccessPointConfiguration);
281+
}
277282
} catch (Exception e) {
278283
e.printStackTrace();
279284
getActivity().onBackPressed();

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/customaudio/CustomAudioRender.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import io.agora.rtc2.RtcEngine;
3737
import io.agora.rtc2.RtcEngineConfig;
3838
import io.agora.rtc2.RtcEngineEx;
39+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
3940

4041
/**
4142
* This demo demonstrates how to make a one-to-one voice call
@@ -158,7 +159,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
158159
+ "}"
159160
+ "}");
160161
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
161-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
162+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
163+
if (localAccessPointConfiguration != null) {
164+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
165+
engine.setLocalAccessPoint(localAccessPointConfiguration);
166+
}
162167

163168
engine.setExternalAudioSource(true, SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL);
164169

‎Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/customaudio/CustomAudioSource.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import io.agora.rtc2.RtcEngineConfig;
3636
import io.agora.rtc2.RtcEngineEx;
3737
import io.agora.rtc2.audio.AudioTrackConfig;
38+
import io.agora.rtc2.proxy.LocalAccessPointConfiguration;
3839

3940
/**
4041
* This demo demonstrates how to make a one-to-one voice call
@@ -154,7 +155,11 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
154155
+ "}"
155156
+ "}");
156157
/* setting the local access point if the private cloud ip was set, otherwise the config will be invalid.*/
157-
engine.setLocalAccessPoint(((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig());
158+
LocalAccessPointConfiguration localAccessPointConfiguration = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getPrivateCloudConfig();
159+
if (localAccessPointConfiguration != null) {
160+
// This api can only be used in the private media server scenario, otherwise some problems may occur.
161+
engine.setLocalAccessPoint(localAccessPointConfiguration);
162+
}
158163

159164
audioPushingHelper = new AudioFileReader(requireContext(), (buffer, timestamp) -> {
160165
if(joined && engine != null && customAudioTrack != -1){

0 commit comments

Comments
 (0)