diff --git a/android/build.gradle b/android/build.gradle index 171a47336..e04146994 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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:+" } diff --git a/android/src/main/java/live/bunch/agora/NullRtcEngineEx.java b/android/src/main/java/live/bunch/agora/NullRtcEngineEx.java index 1e6545ed0..77de2d57d 100644 --- a/android/src/main/java/live/bunch/agora/NullRtcEngineEx.java +++ b/android/src/main/java/live/bunch/agora/NullRtcEngineEx.java @@ -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; @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } diff --git a/android/src/main/java/live/bunch/agora/RtcEngineWrapper.java b/android/src/main/java/live/bunch/agora/RtcEngineWrapper.java index a2d008c2f..e01d4cd44 100644 --- a/android/src/main/java/live/bunch/agora/RtcEngineWrapper.java +++ b/android/src/main/java/live/bunch/agora/RtcEngineWrapper.java @@ -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; @@ -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; @@ -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; } @@ -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(); } @@ -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); } @@ -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(); } @@ -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); } @@ -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); } @@ -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(); } diff --git a/package.json b/package.json index 89c733260..00a5ee91b 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/react-native-agora.podspec b/react-native-agora.podspec index 1766e85a6..b70b417cc 100644 --- a/react-native-agora.podspec +++ b/react-native-agora.podspec @@ -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