Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {
def androidSupportVersion = rootProject.hasProperty("androidSupportVersion") ? rootProject.androidSupportVersion : DEFAULT_ANDROID_SUPPORT_VERSION
// from internet
implementation "com.android.support:appcompat-v7:$androidSupportVersion"
implementation "io.agora.rtc:full-sdk:3.1.3"
implementation "io.agora.rtc:full-sdk:3.3.0"
// from node_modules
implementation "com.facebook.react:react-native:+"
}
Expand Down
82 changes: 75 additions & 7 deletions android/src/main/java/live/bunch/agora/NullRtcEngineEx.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
import io.agora.rtc.live.LiveTranscoding;
import io.agora.rtc.mediaio.IVideoSink;
import io.agora.rtc.mediaio.IVideoSource;
import io.agora.rtc.models.ChannelMediaOptions;
import io.agora.rtc.models.ClientRoleOptions;
import io.agora.rtc.models.DataStreamConfig;
import io.agora.rtc.models.UserInfo;
import io.agora.rtc.video.AgoraImage;
import io.agora.rtc.video.AgoraVideoFrame;
Expand Down Expand Up @@ -103,6 +106,11 @@ public int setClientRole(final int role) {
return 0;
}

@Override
public int setClientRole(final int role, ClientRoleOptions option) {
return 0;
}

@Override
public int sendCustomReportMessage(String id, String category, String event, String label, int value) { return 0; }

Expand All @@ -111,12 +119,22 @@ public int joinChannel(final String token, final String channelName, final Strin
return 0;
}

@Override
@Override
public int joinChannel(String token, String channelName, String optionalInfo, int optionalUid, ChannelMediaOptions options) {
return 0;
}

@Override
public int switchChannel(final String token, final String channelName) {
return 0;
}

@Override
@Override
public int switchChannel(String token, String channelName, ChannelMediaOptions options) {
return 0;
}

@Override
public int leaveChannel() {
return 0;
}
Expand All @@ -136,7 +154,17 @@ public int joinChannelWithUserAccount(final String token, final String channelNa
return 0;
}

@Override
@Override
public int joinChannelWithUserAccount(String token, String channelName, String userAccount, ChannelMediaOptions options) {
return 0;
}

@Override
public int setCloudProxy(int proxyType) {
return 0;
}

@Override
public int getUserInfoByUserAccount(final String userAccount, final UserInfo userInfo) {
return 0;
}
Expand All @@ -156,7 +184,12 @@ public int getConnectionState() {
return 0;
}

@Override
@Override
public int enableRemoteSuperResolution(int uid, boolean enable) {
return 0;
}

@Override
public int enableAudio() {
return 0;
}
Expand Down Expand Up @@ -391,7 +424,32 @@ public int setLocalVoiceReverbPreset(final int preset) {
return 0;
}

@Override
@Override
public int setAudioEffectPreset(int preset) {
return 0;
}

@Override
public int setVoiceBeautifierPreset(int preset) {
return 0;
}

@Override
public int setAudioEffectParameters(int preset, int param1, int param2) {
return 0;
}

@Override
public int setVoiceBeautifierParameters(int preset, int param1, int param2) {
return 0;
}

@Override
public int enableDeepLearningDenoise(boolean enabled) {
return 0;
}

@Override
public int enableSoundPositionIndication(final boolean enabled) {
return 0;
}
Expand Down Expand Up @@ -679,7 +737,12 @@ public int createDataStream(final boolean reliable, final boolean ordered) {
return 0;
}

@Override
@Override
public int createDataStream(DataStreamConfig config) {
return 0;
}

@Override
public int sendStreamMessage(final int streamId, final byte[] message) {
return 0;
}
Expand Down Expand Up @@ -789,7 +852,12 @@ public int setLogFileSize(final int fileSizeInKBytes) {
return 0;
}

@Override
@Override
public String uploadLogFile() {
return null;
}

@Override
public long getNativeHandle() {
return 0;
}
Expand Down
85 changes: 77 additions & 8 deletions android/src/main/java/live/bunch/agora/RtcEngineWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
import io.agora.rtc.live.LiveTranscoding;
import io.agora.rtc.mediaio.IVideoSink;
import io.agora.rtc.mediaio.IVideoSource;
import io.agora.rtc.models.ChannelMediaOptions;
import io.agora.rtc.models.ClientRoleOptions;
import io.agora.rtc.models.DataStreamConfig;
import io.agora.rtc.models.UserInfo;
import io.agora.rtc.video.AgoraImage;
import io.agora.rtc.video.AgoraVideoFrame;
Expand Down Expand Up @@ -44,6 +47,7 @@ public int setProfile(String profile, boolean merge) {
return -1;
}


public int setAppType(int appType) {
if (mRtcEngine instanceof RtcEngineEx) return ((RtcEngineEx)mRtcEngine).setAppType(appType);
return -1;
Expand Down Expand Up @@ -120,7 +124,12 @@ public int setClientRole(int role) {
return mRtcEngine.setClientRole(role);
}

@Override
@Override
public int setClientRole(int role, ClientRoleOptions options) {
return 0;
}

@Override
public int sendCustomReportMessage(String id, String category, String event, String label, int value) {
return 0;
}
Expand All @@ -129,11 +138,21 @@ public int joinChannel(String token, String channelName, String optionalInfo, in
return mRtcEngine.joinChannel(token, channelName, optionalInfo, optionalUid);
}

public int switchChannel(String token, String channelName) {
@Override
public int joinChannel(String token, String channelName, String optionalInfo, int optionalUid, ChannelMediaOptions options) {
return 0;
}

public int switchChannel(String token, String channelName) {
return mRtcEngine.switchChannel(token, channelName);
}

public int leaveChannel() {
@Override
public int switchChannel(String token, String channelName, ChannelMediaOptions options) {
return 0;
}

public int leaveChannel() {
return mRtcEngine.leaveChannel();
}

Expand All @@ -149,7 +168,17 @@ public int joinChannelWithUserAccount(String token, String channelName, String u
return mRtcEngine.joinChannelWithUserAccount(token, channelName, userAccount);
}

public int getUserInfoByUserAccount(String userAccount, UserInfo userInfo) {
@Override
public int joinChannelWithUserAccount(String token, String channelName, String userAccount, ChannelMediaOptions options) {
return 0;
}

@Override
public int setCloudProxy(int proxyType) {
return 0;
}

public int getUserInfoByUserAccount(String userAccount, UserInfo userInfo) {
return mRtcEngine.getUserInfoByUserAccount(userAccount, userInfo);
}

Expand All @@ -165,7 +194,12 @@ public int getConnectionState() {
return mRtcEngine.getConnectionState();
}

public int enableAudio() {
@Override
public int enableRemoteSuperResolution(int uid, boolean enable) {
return 0;
}

public int enableAudio() {
return mRtcEngine.enableAudio();
}

Expand Down Expand Up @@ -341,7 +375,32 @@ public int setLocalVoiceReverbPreset(int preset) {
return mRtcEngine.setLocalVoiceReverbPreset(preset);
}

public int enableSoundPositionIndication(boolean enabled) {
@Override
public int setAudioEffectPreset(int preset) {
return 0;
}

@Override
public int setVoiceBeautifierPreset(int preset) {
return 0;
}

@Override
public int setAudioEffectParameters(int preset, int param1, int param2) {
return 0;
}

@Override
public int setVoiceBeautifierParameters(int preset, int param1, int param2) {
return 0;
}

@Override
public int enableDeepLearningDenoise(boolean enabled) {
return 0;
}

public int enableSoundPositionIndication(boolean enabled) {
return mRtcEngine.enableSoundPositionIndication(enabled);
}

Expand Down Expand Up @@ -566,7 +625,12 @@ public int createDataStream(boolean reliable, boolean ordered) {
return mRtcEngine.createDataStream(reliable, ordered);
}

public int sendStreamMessage(int streamId, byte[] message) {
@Override
public int createDataStream(DataStreamConfig config) {
return 0;
}

public int sendStreamMessage(int streamId, byte[] message) {
return mRtcEngine.sendStreamMessage(streamId, message);
}

Expand Down Expand Up @@ -654,7 +718,12 @@ public int setLogFileSize(int fileSizeInKBytes) {
return mRtcEngine.setLogFileSize(fileSizeInKBytes);
}

public long getNativeHandle() {
@Override
public String uploadLogFile() {
return null;
}

public long getNativeHandle() {
return mRtcEngine.getNativeHandle();
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-agora",
"version": "3.1.2",
"version": "3.3.0",
"description": "React Native around the Agora RTC SDKs for Android and iOS agora",
"summary": "agora native sdk for react-native",
"main": "lib/index.js",
Expand Down
2 changes: 1 addition & 1 deletion react-native-agora.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ Pod::Spec.new do |s|
s.source_files = 'ios/RCTAgora/*.{h,m}'

s.dependency 'React'
s.dependency "AgoraRtcEngine_iOS", "3.1.2"
s.dependency "AgoraRtcEngine_iOS", "3.3.0"
end