remove unused files

android/build.gradle

@@ -1,12 +1,27 @@
 apply plugin: 'com.android.library'
 
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.1.2'
+    }
+}
+
+def DEFAULT_COMPILE_SDK_VERSION = 27
+def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
+def DEFAULT_TARGET_SDK_VERSION = 27
+def DEFAULT_ANDROID_SUPPORT_VERSION = "27.1.0"
+
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
+    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
         versionCode 1
         versionName "1.0"
 
@@ -19,13 +34,42 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    splits {
+        abi {
+            enable true
+
+            reset()
+
+            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            // Specify that we do not want an additional universal SDK
+            universalApk false
+        }
+    }
 }
 
 dependencies {
-    implementation "com.facebook.react:react-native:+"
+    def androidSupportVersion = rootProject.hasProperty("androidSupportVersion")  ? rootProject.androidSupportVersion : DEFAULT_ANDROID_SUPPORT_VERSION
+    // from internet
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "com.android.support:appcompat-v7:$androidSupportVersion"
+    implementation "io.agora.rtc:full-sdk:2.3.3"
+    // from node_modules
+    implementation "com.facebook.react:react-native:+"
+    implementation 'com.google.code.gson:gson:2.8.5'
 }
+//
+//configurations.all {
+//    exclude group: 'com.facebook.react', module: 'react-native'
+//}
 
-configurations.all {
-    exclude group: 'com.facebook.react', module: 'react-native'
+repositories {
+    mavenCentral()
+    mavenLocal()
+    maven {
+        url "file:///Users/ly/GithubPremium/react-native-agora/node_modules/react-native"
+    }
+    jcenter()
+    google()
 }
+

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

ios/RCTAgora/RCTAgora.m

@@ -316,6 +316,10 @@ RCT_EXPORT_METHOD(setDefaultAudioRouteToSpeakerphone:(BOOL)defaultToSpeaker){
   [self.rtcEngine setDefaultAudioRouteToSpeakerphone:defaultToSpeaker];
 }
 
+RCT_EXPORT_METHOD(setDefaultMuteAllRemoteAudioStreams:(BOOL)defaultToSpeaker){
+  [self.rtcEngine setDefaultMuteAllRemoteAudioStreams:defaultToSpeaker];
+}
+
 // enable video
 RCT_EXPORT_METHOD(enableVideo) {
   [self.rtcEngine enableVideo];
@@ -346,6 +350,10 @@ RCT_EXPORT_METHOD(muteRemoteVideoStream:(NSUInteger)uid mute:(BOOL)mute){
   [self.rtcEngine muteRemoteVideoStream:uid mute:mute];
 }
 
+RCT_EXPORT_METHOD(setDefaultMuteAllRemoteVideoStreams:(BOOL)mute) {
+  [self.rtcEngine setDefaultMuteAllRemoteVideoStreams:mute];
+}
+
 // enable audio
 RCT_EXPORT_METHOD(enableAudio) {
   [self.rtcEngine enableAudio];
@@ -376,15 +384,15 @@ RCT_EXPORT_METHOD(muteRemoteAudioStream:(NSUInteger)uid muted:(BOOL)mute){
   [self.rtcEngine muteRemoteAudioStream:uid mute:mute];
 }
 
-// start recoding service
-RCT_EXPORT_METHOD(startAudioRecording:(NSDictionary*)options){
-  [self.rtcEngine startAudioRecording:options[@"path"] quality:(AgoraAudioRecordingQuality)[options[@"quality"] integerValue]];
-}
-
-// stop recoding service
-RCT_EXPORT_METHOD(stopAudioRecording:(NSString*)recordingKey){
-  [self.rtcEngine stopAudioRecording];
-}
+//// start recoding service
+//RCT_EXPORT_METHOD(startAudioRecording:(NSDictionary*)options){
+//  [self.rtcEngine startAudioRecording:options[@"path"] quality:(AgoraAudioRecordingQuality)[options[@"quality"] integerValue]];
+//}
+//
+//// stop recoding service
+//RCT_EXPORT_METHOD(stopAudioRecording:(NSString*)recordingKey){
+//  [self.rtcEngine stopAudioRecording];
+//}
 
 // adjust recorcding signal volume
 RCT_EXPORT_METHOD(adjustRecordingSignalVolume: (NSInteger) volume){
@@ -435,7 +443,7 @@ RCT_EXPORT_METHOD(setLocalVoicePitch:(double) pitch) {
 }
 
 // set local video equalization of band frequency
-RCT_EXPORT_METHOD(setLocalVoiceEqualizationOfBandFrequency:(NSInteger)band gain:(NSInteger)gain) {
+RCT_EXPORT_METHOD(setLocalVoiceEqualization:(NSInteger)band gain:(NSInteger)gain) {
   AgoraAudioEqualizationBandFrequency bandType = AgoraAudioEqualizationBand31;
   switch (band) {
     case AgoraAudioEqualizationBand31:
@@ -473,7 +481,7 @@ RCT_EXPORT_METHOD(setLocalVoiceEqualizationOfBandFrequency:(NSInteger)band gain:
 }
 
 // set local voice reverb of type
-RCT_EXPORT_METHOD(setLocalVoiceReverbOfType:(NSInteger)reverb value:(NSInteger)value) {
+RCT_EXPORT_METHOD(setLocalVoiceReverb:(NSInteger)reverb value:(NSInteger)value) {
   AgoraAudioReverbType reverbType = AgoraAudioReverbDryLevel;
   switch (reverb) {
     case AgoraAudioReverbDryLevel:
@@ -525,7 +533,7 @@ RCT_EXPORT_METHOD(adjustAudioMixingVolume:(NSInteger) volume) {
 
 // adjust audio mixing playout volume
 RCT_EXPORT_METHOD(adjustAudioMixingPlayoutVolume:(NSInteger) volume) {
-  [self.rtcEngine adjustAudioMixingVolume:volume];
+  [self.rtcEngine adjustAudioMixingPlayoutVolume:volume];
 }
 
 // adjust audio mixing publish volume
@@ -783,7 +791,7 @@ RCT_EXPORT_METHOD(pauseEffect
                   :(NSInteger) soundId
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  NSInteger res = [self.rtcEngine unloadEffect:(int)soundId];
+  NSInteger res = [self.rtcEngine pauseEffect:(int)soundId];
   if (res != 0) {
     reject(@"131014", @"pauseEffect failed", [self makeNSError:@{
                                                                  @"code": @(131014),
@@ -801,10 +809,10 @@ RCT_EXPORT_METHOD(pauseEffect
 }
 
 // pause all effects
-RCT_EXPORT_METHOD(pauseAllEffects:(NSInteger) soundId
-                  resolve:(RCTPromiseResolveBlock)resolve
+RCT_EXPORT_METHOD(pauseAllEffects
+                  :(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  NSInteger res = [self.rtcEngine unloadEffect:(int)soundId];
+  NSInteger res = [self.rtcEngine pauseAllEffects];
   if (res != 0) {
     reject(@"131014", @"pauseAllEffects failed", [self makeNSError:@{
                                                                      @"code": @(131014),
@@ -943,8 +951,7 @@ RCT_EXPORT_METHOD(setAudioSessionOperationRestriction
 
 // gateway test start echo
 RCT_EXPORT_METHOD(startEchoTest
-                  :(RCTResponseSenderBlock)sender
-                  resolve:(RCTPromiseResolveBlock)resolve
+                  :(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
   NSInteger res = [self.rtcEngine startEchoTest:^(NSString * _Nonnull channel, NSUInteger uid, NSInteger elapsed) {
     sender(@{
@@ -1152,6 +1159,49 @@ RCT_EXPORT_METHOD(clearVideoWatermarks
   }
 }
 
+// set local publish fallback option
+RCT_EXPORT_METHOD(setLocalPublishFallbackOption:(NSInteger)option
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+  NSInteger res = [self.rtcEngine setLocalPublishFallbackOption:option];
+  if (res != 0) {
+    reject(@"131039", @"setLocalPublishFallbackOption failed", [self makeNSError:@{
+                                                                          @"code": @(131039),
+                                                                          @"message":@{
+                                                                              @"success":@(NO),
+                                                                              @"value":@(res)
+                                                                              }
+                                                                          }]);
+  } else {
+    resolve(@{
+              @"success": @(YES),
+              @"value": @(res)
+              });
+  }
+}
+
+// set remote subscribe fallback option
+RCT_EXPORT_METHOD(setRemoteSubscribeFallbackOption:(NSInteger)option
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+  NSInteger res = [self.rtcEngine setRemoteSubscribeFallbackOption:option];
+  if (res != 0) {
+    reject(@"131040", @"setRemoteSubscribeFallbackOption failed", [self makeNSError:@{
+                                                                                   @"code": @(131040),
+                                                                                   @"message":@{
+                                                                                       @"success":@(NO),
+                                                                                       @"value":@(res)
+                                                                                       }
+                                                                                   }]);
+  } else {
+    resolve(@{
+              @"success": @(YES),
+              @"value": @(res)
+              });
+  }
+}
+
+
 // enable dual stream mode
 RCT_EXPORT_METHOD(enableDualStreamMode
                   :(BOOL) enabled
@@ -1175,14 +1225,14 @@ RCT_EXPORT_METHOD(enableDualStreamMode
 }
 
 // set remote video stream
-RCT_EXPORT_METHOD(setRemoteVideoStream
+RCT_EXPORT_METHOD(setRemoteVideoStreamType
                   :(NSDictionary *) options
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
   NSInteger res = [self.rtcEngine setRemoteVideoStream:[options[@"uid"] integerValue]
                                                   type:(AgoraVideoStreamType)[options[@"streamType"] integerValue]];
   if (res != 0) {
-    reject(@"131029", @"setRemoteVideoStream failed", [self makeNSError:@{
+    reject(@"131029", @"setRemoteVideoStreamType failed", [self makeNSError:@{
                                                                           @"code": @(131029),
                                                                           @"message":@{
                                                                               @"success":@(NO),
@@ -1294,7 +1344,7 @@ RCT_EXPORT_METHOD(setVideoQualityParameters
 }
 
 // set local video mirror mode
-RCT_EXPORT_METHOD(setLocalVideoMirroMode
+RCT_EXPORT_METHOD(setLocalVideoMirrorMode
                   :(NSInteger) mode
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
@@ -1354,8 +1404,8 @@ RCT_EXPORT_METHOD(isCameraTorchSupported
             });
 }
 
-// isCameraFocusPositionInPreviewSupported
-RCT_EXPORT_METHOD(isCameraFocusPositionInPreviewSupported
+// isCameraFocusSupported
+RCT_EXPORT_METHOD(isCameraFocusSupported
                   :(RCTPromiseResolveBlock)resolve) {
   BOOL res = [self.rtcEngine isCameraFocusPositionInPreviewSupported];
   resolve(@{
@@ -1440,7 +1490,9 @@ RCT_EXPORT_METHOD(setCameraAutoFocusFaceModeEnabled:(BOOL)enable
 }
 
 // getCallId
-RCT_EXPORT_METHOD(getCallId:(RCTPromiseResolveBlock)resolve) {
+RCT_EXPORT_METHOD(getCallId
+                  :(RCTPromiseResolveBlock)resolve)
+                  reject:(RCTPromiseRejectBlock)reject) {
   resolve(@{
             @"success": @(YES),
             @"value": [self.rtcEngine getCallId]
@@ -1540,6 +1592,11 @@ RCT_EXPORT_METHOD(addPublishStreamUrl:(NSDictionary *)options) {
   [self.rtcEngine setLiveTranscoding:AgoraLiveTranscoding.defaultTranscoding];
 }
 
+// remove publish stream url
+RCT_EXPORT_METHOD(removePublishStreamUrl:(NSDictionary *)options) {
+  [self.rtcEngine removePublishStreamUrl:options[@"url"]];
+}
+
 // set living transcoding
 RCT_EXPORT_METHOD(setLiveTranscoding:(NSDictionary *)options) {
   AgoraLiveTranscoding *transcoding = AgoraLiveTranscoding.defaultTranscoding;