fix conflicts

.gitattributes

@@ -0,0 +1,3 @@
+*.psd filter=lfs diff=lfs merge=lfs -text
+*.framework filter=lfs diff=lfs merge=lfs -text
+*.so filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -58,3 +58,16 @@ android/src/main/res/drawable/
 .project
 .settings
 .classpath
+.jest/
+xcuserdata
+*.pbxproj
+lib
+*.xcworkspace
+*.zip
+.byebug_history
+Untitled*
+Pods
+**/*~
+xcuserdata*
+**/*/xcuserdata*
+.vscode

.npmignore

@@ -0,0 +1,26 @@
+*.*~
+**/*.*~
+*.md
+*.MD
+.DS_Store
+tsconfig.json
+samples
+__tests__
+docs
+.*.swp
+._*
+.DS_Store
+.git
+.hg
+.npmrc
+.lock-wscript
+.svn
+.wafpickle-*
+config.gypi
+CVS
+npm-debug.log
+node_modules
+ios/Pods
+ios/Podfile*
+xcuserdata*
+**/*/xcuserdata*

android/build.gradle

@@ -1,12 +1,36 @@
 apply plugin: 'com.android.library'
 
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.encoding = 'utf-8'
+            options.compilerArgs << "-Xlint:deprecation"
+        }
+    }
+}
+
+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 +43,36 @@ 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 {
+    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:2.3.3"
+    // from node_modules
     implementation "com.facebook.react:react-native:+"
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-configurations.all {
-    exclude group: 'com.facebook.react', module: 'react-native'
+repositories {
+    mavenCentral()
+    mavenLocal()
+    maven {
+        url "$rootDir/../node_modules/react-native/android"
+    }
+    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

android/src/main/java/com/syan/agora/AgoraManager.java

@@ -1,18 +1,25 @@
 package com.syan.agora;
 
 import android.content.Context;
+import android.support.v7.widget.LinearLayoutCompat;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.SurfaceView;
 
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import io.agora.rtc.IRtcEngineEventHandler;
 import io.agora.rtc.RtcEngine;
 import io.agora.rtc.video.VideoCanvas;
+import io.agora.rtc.video.VideoEncoderConfiguration;
+
+import static io.agora.rtc.video.VideoEncoderConfiguration.*;
+
 
 /**
  * Created by Leon on 2017/4/9.
@@ -45,31 +52,77 @@ public class AgoraManager {
         return sAgoraManager;
     }
 
+    private FRAME_RATE getVideoEncoderEnum (int val) {
+        FRAME_RATE type = FRAME_RATE.FRAME_RATE_FPS_1;
+        switch (val) {
+            case 1:
+                type = FRAME_RATE.FRAME_RATE_FPS_1;
+            case 7:
+                type = FRAME_RATE.FRAME_RATE_FPS_7;
+            case 10:
+                type = FRAME_RATE.FRAME_RATE_FPS_10;
+            case 15:
+                type = FRAME_RATE.FRAME_RATE_FPS_15;
+            case 24:
+                type = FRAME_RATE.FRAME_RATE_FPS_24;
+            case 30:
+                type = FRAME_RATE.FRAME_RATE_FPS_30;
+        }
+        return type;
+    }
+
+    private ORIENTATION_MODE getOrientationModeEnum (int val) {
+        ORIENTATION_MODE type = ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
+        switch (val) {
+            case 0:
+                type = ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
+            case 1:
+                type = ORIENTATION_MODE.ORIENTATION_MODE_FIXED_LANDSCAPE;
+            case 2:
+                type = ORIENTATION_MODE.ORIENTATION_MODE_FIXED_PORTRAIT;
+        }
+        return type;
+    }
+
     /**
-     * 初始化RtcEngine
+     * initialize rtc engine
      */
-    public void init(Context context, IRtcEngineEventHandler mRtcEventHandler, ReadableMap options) {
+    public int init(Context context, IRtcEngineEventHandler mRtcEventHandler, ReadableMap options) {
         this.context = context;
 
-        //创建RtcEngine对象，mRtcEventHandler为RtcEngine的回调
+        //create rtcEngine instance and setup rtcEngine eventHandler
         try {
             mRtcEngine = RtcEngine.create(context, options.getString("appid"), mRtcEventHandler);
-
+            if (options.hasKey("secret") && null != options.getString("secret")) {
+                mRtcEngine.setEncryptionSecret(options.getString("secret"));
+                if (options.hasKey("secretMode") && null != options.getString("secretMode")) {
+                    mRtcEngine.setEncryptionMode(options.getString("secretMode"));
+                }
+            }
         } catch (Exception e) {
-            throw new RuntimeException("NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e));
+            throw new RuntimeException("create rtc engine failed\n" + Log.getStackTraceString(e));
         }
-        //开启视频功能
+        mRtcEngine.enableDualStreamMode(true);
+        mRtcEngine.setChannelProfile(options.getInt("channelProfile"));
         mRtcEngine.enableVideo();
-        mRtcEngine.setVideoProfile(options.getInt("videoProfile"), options.getBoolean("swapWidthAndHeight")); //视频配置，
-        mRtcEngine.enableWebSdkInteroperability(true);  //设置和web通信
-        mRtcEngine.setChannelProfile(options.getInt("channelProfile")); //设置模式
-        mRtcEngine.setClientRole(options.getInt("clientRole"), null); //设置角色
+        ReadableMap config = options.getMap("videoEncoderConfig");
+        VideoEncoderConfiguration encoderConfig = new VideoEncoderConfiguration(
+            config.getInt("width"),
+            config.getInt("height"),
+            getVideoEncoderEnum(config.getInt("frameRate")),
+            config.getInt("bitrate"),
+            getOrientationModeEnum(config.getInt("orientationMode"))
+        );
+        mRtcEngine.setVideoEncoderConfiguration(encoderConfig);
+        mRtcEngine.setAudioProfile(options.getInt("audioProfile"), options.getInt("audioScenario"));
+        mRtcEngine.setClientRole(options.getInt("clientRole"));
+        return mRtcEngine.enableWebSdkInteroperability(true);
     }
 
     /**
      * 设置本地视频，即前置摄像头预览
      */
-    public AgoraManager setupLocalVideo() {
+    public int setupLocalVideo() {
         //创建一个SurfaceView用作视频预览
         SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
         //将SurfaceView保存起来在SparseArray中，后续会将其加入界面。key为视频的用户id，这里是本地视频, 默认id是0
@@ -78,36 +131,62 @@ public class AgoraManager {
 
         //设置本地视频，渲染模式选择VideoCanvas.RENDER_MODE_HIDDEN，如果选其他模式会出现视频不会填充满整个SurfaceView的情况，
         //具体渲染模式参考官方文档https://docs.agora.io/cn/user_guide/API/android_api.html#set-local-video-view-setuplocalvideo
-        mRtcEngine.setupLocalVideo(new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, mLocalUid));
-        return this;//返回AgoraManager以作链式调用
+        return mRtcEngine.setupLocalVideo(new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, mLocalUid));
     }
 
-    public AgoraManager setupRemoteVideo(int uid) {
+    public int setupRemoteVideo(int uid) {
 
         SurfaceView surfaceView = RtcEngine.CreateRendererView(context);
         mSurfaceViews.put(uid, surfaceView);
-        mRtcEngine.setupRemoteVideo(new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, uid));
-        return this;
+        return mRtcEngine.setupRemoteVideo(new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, uid));
     }
 
-    public AgoraManager joinChannel(String channel, int uid) {
-        mRtcEngine.joinChannel(null, channel, null, uid);
-        return this;
+    public int setEnableSpeakerphone(boolean enabled) {
+        return mRtcEngine.setEnableSpeakerphone(enabled);
     }
 
-    public AgoraManager joinChannelWithToken(String token, String channel, int uid) {
-        mRtcEngine.joinChannel(token, channel, null, uid);
-        return this;
+    public int setDefaultAudioRouteToSpeakerphone(boolean enabled) {
+        return mRtcEngine.setDefaultAudioRoutetoSpeakerphone(enabled);
     }
 
-    public AgoraManager enableLastmileTest() {
-        mRtcEngine.enableLastmileTest();
-        return this;
+    public int renewToken(String token) {
+        return mRtcEngine.renewToken(token);
+    }
+
+    public int setClientRole(int role) {
+        return mRtcEngine.setClientRole(role);
+    }
+
+    public int enableWebSdkInteroperability(boolean enabled) {
+        return mRtcEngine.enableWebSdkInteroperability(enabled);
+    }
+
+    public int getConnectionState() {
+        return mRtcEngine.getConnectionState();
+    }
+    public int joinChannel(ReadableMap options) {
+        String token = options.hasKey("token") ? options.getString("token") : null;
+        String channelName = options.hasKey("channelName") ? options.getString("channelName") : null;
+        String optionalInfo = options.hasKey("optionalInfo") ? options.getString("optionalInfo") : null;
+        int uid = options.hasKey("uid") ? options.getInt("uid") : 0;
+        this.mLocalUid = uid;
+        return mRtcEngine.joinChannel(token, channelName, optionalInfo, uid);
+    }
+
+//    public int joinChannelWithToken(ReadableMap options) {
+//        String token = options.getString("token");
+//        String channel = options.getString("channel");
+//        String optionalInfo = options.getString("optionalInfo");
+//        int uid = options.getInt("uid");
+//        return mRtcEngine.joinChannel(token, channel, optionalInfo, uid);
+//    }
+
+    public int enableLastmileTest() {
+        return mRtcEngine.enableLastmileTest();
     }
 
-    public AgoraManager disableLastmileTest() {
-        mRtcEngine.disableLastmileTest();
-        return this;
+    public int disableLastmileTest() {
+        return mRtcEngine.disableLastmileTest();
     }
 
     public void startPreview() {
@@ -118,8 +197,8 @@ public class AgoraManager {
         mRtcEngine.stopPreview();
     }
 
-    public void leaveChannel() {
-        mRtcEngine.leaveChannel();
+    public int leaveChannel() {
+        return mRtcEngine.leaveChannel();
     }
 
     public void removeSurfaceView(int uid) {

android/src/main/java/com/syan/agora/ConvertUtils.java

@@ -0,0 +1,298 @@
+package com.syan.agora;
+
+import android.support.annotation.Nullable;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.bridge.WritableNativeMap;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class ConvertUtils {
+    public static Map<String, Object> readableMapToMap(final @Nullable ReadableMap readableMap) {
+        if (readableMap == null) {
+            return new HashMap<>();
+        }
+
+        final ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+        if (!iterator.hasNextKey()) {
+            return new HashMap<>();
+        }
+
+        final Map<String, Object> result = new HashMap<>();
+        while (iterator.hasNextKey()) {
+            final String key = iterator.nextKey();
+            result.put(key, toObject(readableMap, key));
+        }
+
+        return result;
+    }
+
+    public static Object toObject(@Nullable ReadableMap readableMap, String key) {
+        if (readableMap == null) {
+            return null;
+        }
+
+        Object result;
+
+        final ReadableType readableType = readableMap.getType(key);
+        switch (readableType) {
+            case Null:
+                result = key;
+                break;
+            case Boolean:
+                result = readableMap.getBoolean(key);
+                break;
+            case Number:
+                // Can be int or double.
+                double tmp = readableMap.getDouble(key);
+                if (tmp == (int) tmp) {
+                    result = (int) tmp;
+                } else {
+                    result = tmp;
+                }
+                break;
+            case String:
+                result = readableMap.getString(key);
+                break;
+            case Map:
+                result = readableMapToMap(readableMap.getMap(key));
+                break;
+            case Array:
+                result = readableArrayToList(readableMap.getArray(key));
+                break;
+            default:
+                throw new IllegalArgumentException("Could not convert object with key: " + key + ".");
+        }
+
+        return result;
+    }
+
+    /**
+     * toList converts a {@link ReadableArray} into an ArrayList.
+     *
+     * @param readableArray The ReadableArray to be conveted.
+     * @return An ArrayList containing the data that was in the ReadableArray.
+     */
+    public static List<Object> readableArrayToList(final @Nullable ReadableArray readableArray) {
+        if (readableArray == null) {
+            return null;
+        }
+
+        List<Object> result = new ArrayList<>(readableArray.size());
+        for (int index = 0; index < readableArray.size(); index++) {
+            final ReadableType readableType = readableArray.getType(index);
+            switch (readableType) {
+                case Null:
+                    result.add(String.valueOf(index));
+                    break;
+                case Boolean:
+                    result.add(readableArray.getBoolean(index));
+                    break;
+                case Number:
+                    // Can be int or double.
+                    double tmp = readableArray.getDouble(index);
+                    if (tmp == (int) tmp) {
+                        result.add((int) tmp);
+                    } else {
+                        result.add(tmp);
+                    }
+                    break;
+                case String:
+                    result.add(readableArray.getString(index));
+                    break;
+                case Map:
+                    result.add(readableMapToMap(readableArray.getMap(index)));
+                    break;
+                case Array:
+                    result = readableArrayToList(readableArray.getArray(index));
+                    break;
+                default:
+                    throw new IllegalArgumentException("Could not convert object with index: " + index + ".");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * better
+     *
+     * @param jsonArray
+     * @return
+     * @throws JSONException
+     */
+    public static WritableArray jsonToReact(final JSONArray jsonArray) throws JSONException {
+        final WritableArray writableArray = Arguments.createArray();
+        for (int i = 0; i < jsonArray.length(); i++) {
+            final Object value = jsonArray.get(i);
+            if (value instanceof Float || value instanceof Double) {
+                writableArray.pushDouble(jsonArray.getDouble(i));
+            } else if (value instanceof Number) {
+                writableArray.pushInt(jsonArray.getInt(i));
+            } else if (value instanceof String) {
+                writableArray.pushString(jsonArray.getString(i));
+            } else if (value instanceof Boolean) {
+                writableArray.pushBoolean(jsonArray.getBoolean(i));
+            } else if (value instanceof JSONObject) {
+                writableArray.pushMap(jsonToReact(jsonArray.getJSONObject(i)));
+            } else if (value instanceof JSONArray) {
+                writableArray.pushArray(jsonToReact(jsonArray.getJSONArray(i)));
+            } else if (value == JSONObject.NULL) {
+                writableArray.pushNull();
+            }
+        }
+        return writableArray;
+    }
+
+    /**
+     * better
+     *
+     * @param jsonObject
+     * @return
+     * @throws JSONException
+     */
+    public static WritableMap jsonToReact(final JSONObject jsonObject) throws JSONException {
+        final WritableMap writableMap = Arguments.createMap();
+        final Iterator iterator = jsonObject.keys();
+        while (iterator.hasNext()) {
+            final String key = (String) iterator.next();
+            final Object value = jsonObject.get(key);
+            if (value instanceof Float || value instanceof Double) {
+                writableMap.putDouble(key, jsonObject.getDouble(key));
+            } else if (value instanceof Number) {
+                writableMap.putInt(key, jsonObject.getInt(key));
+            } else if (value instanceof String) {
+                writableMap.putString(key, jsonObject.getString(key));
+            } else if (value instanceof JSONObject) {
+                writableMap.putMap(key, jsonToReact(jsonObject.getJSONObject(key)));
+            } else if (value instanceof JSONArray) {
+                writableMap.putArray(key, jsonToReact(jsonObject.getJSONArray(key)));
+            } else if (value instanceof Boolean) {
+                writableMap.putBoolean(key, jsonObject.getBoolean(key));
+            } else if (value == JSONObject.NULL) {
+                writableMap.putNull(key);
+            }
+        }
+        return writableMap;
+    }
+
+    public static WritableMap convertJsonToMap(JSONObject jsonObject) throws JSONException {
+        WritableMap map = new WritableNativeMap();
+
+        Iterator<String> iterator = jsonObject.keys();
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+            Object value = jsonObject.get(key);
+            if (value instanceof JSONObject) {
+                map.putMap(key, convertJsonToMap((JSONObject) value));
+            } else if (value instanceof JSONArray) {
+                map.putArray(key, convertJsonToArray((JSONArray) value));
+            } else if (value instanceof Boolean) {
+                map.putBoolean(key, (Boolean) value);
+            } else if (value instanceof Integer) {
+                map.putInt(key, (Integer) value);
+            } else if (value instanceof Double) {
+                map.putDouble(key, (Double) value);
+            } else if (value instanceof String) {
+                map.putString(key, (String) value);
+            } else {
+                map.putString(key, value.toString());
+            }
+        }
+        return map;
+    }
+
+    public static WritableArray convertJsonToArray(JSONArray jsonArray) throws JSONException {
+        WritableArray array = new WritableNativeArray();
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            Object value = jsonArray.get(i);
+            if (value instanceof JSONObject) {
+                array.pushMap(convertJsonToMap((JSONObject) value));
+            } else if (value instanceof JSONArray) {
+                array.pushArray(convertJsonToArray((JSONArray) value));
+            } else if (value instanceof Boolean) {
+                array.pushBoolean((Boolean) value);
+            } else if (value instanceof Integer) {
+                array.pushInt((Integer) value);
+            } else if (value instanceof Double) {
+                array.pushDouble((Double) value);
+            } else if (value instanceof String) {
+                array.pushString((String) value);
+            } else {
+                array.pushString(value.toString());
+            }
+        }
+        return array;
+    }
+
+    public static JSONObject convertMapToJson(ReadableMap readableMap) throws JSONException {
+        JSONObject object = new JSONObject();
+        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+        while (iterator.hasNextKey()) {
+            String key = iterator.nextKey();
+            switch (readableMap.getType(key)) {
+                case Null:
+                    object.put(key, JSONObject.NULL);
+                    break;
+                case Boolean:
+                    object.put(key, readableMap.getBoolean(key));
+                    break;
+                case Number:
+                    object.put(key, readableMap.getDouble(key));
+                    break;
+                case String:
+                    object.put(key, readableMap.getString(key));
+                    break;
+                case Map:
+                    object.put(key, convertMapToJson(readableMap.getMap(key)));
+                    break;
+                case Array:
+                    object.put(key, convertArrayToJson(readableMap.getArray(key)));
+                    break;
+            }
+        }
+        return object;
+    }
+
+    public static JSONArray convertArrayToJson(ReadableArray readableArray) throws JSONException {
+        JSONArray array = new JSONArray();
+        for (int i = 0; i < readableArray.size(); i++) {
+            switch (readableArray.getType(i)) {
+                case Null:
+                    break;
+                case Boolean:
+                    array.put(readableArray.getBoolean(i));
+                    break;
+                case Number:
+                    array.put(readableArray.getDouble(i));
+                    break;
+                case String:
+                    array.put(readableArray.getString(i));
+                    break;
+                case Map:
+                    array.put(convertMapToJson(readableArray.getMap(i)));
+                    break;
+                case Array:
+                    array.put(convertArrayToJson(readableArray.getArray(i)));
+                    break;
+            }
+        }
+        return array;
+    }
+}

android/src/main/java/com/syan/agora/ReactNativeAgoraException.java

@@ -0,0 +1,19 @@
+package com.syan.agora;
+
+
+import com.facebook.react.bridge.WritableMap;
+
+public class ReactNativeAgoraException extends Exception {
+
+    private int code;
+
+    public ReactNativeAgoraException(String message, final int code) {
+        super(message);
+        this.code = code;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+}

android/src/main/jniLibs/include/IAgoraMediaEngine.h

@@ -1,181 +0,0 @@
-#ifndef AGORA_MEDIA_ENGINE_H
-#define AGORA_MEDIA_ENGINE_H
-#if defined _WIN32 || defined __CYGWIN__
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
-#endif
-
-namespace agora
-{
-namespace media
-{
-
-enum MEDIA_SOURCE_TYPE {
-    AUDIO_PLAYOUT_SOURCE = 0,
-    AUDIO_RECORDING_SOURCE = 1,
-};
-
-class IAudioFrameObserver
-{
-public:
-  enum AUDIO_FRAME_TYPE {
-    FRAME_TYPE_PCM16 = 0,  //PCM 16bit little endian
-  };
-  struct AudioFrame {
-    AUDIO_FRAME_TYPE type;
-    int samples;  //number of samples in this frame
-    int bytesPerSample;  //number of bytes per sample: 2 for PCM16
-    int channels;  //number of channels (data are interleaved if stereo)
-    int samplesPerSec;  //sampling rate
-    void* buffer;  //data buffer
-    int64_t renderTimeMs;
-  };
-public:
-  virtual bool onRecordAudioFrame(AudioFrame& audioFrame) = 0;
-  virtual bool onPlaybackAudioFrame(AudioFrame& audioFrame) = 0;
-  virtual bool onMixedAudioFrame(AudioFrame& audioFrame) = 0;
-  virtual bool onPlaybackAudioFrameBeforeMixing(unsigned int uid, AudioFrame& audioFrame) = 0;
-};
-
-class IVideoFrameObserver
-{
-public:
-  enum VIDEO_FRAME_TYPE {
-    FRAME_TYPE_YUV420 = 0,  //YUV 420 format
-  };
-  struct VideoFrame {
-    VIDEO_FRAME_TYPE type;
-    int width;  //width of video frame
-    int height;  //height of video frame
-    int yStride;  //stride of Y data buffer
-    int uStride;  //stride of U data buffer
-    int vStride;  //stride of V data buffer
-    void* yBuffer;  //Y data buffer
-    void* uBuffer;  //U data buffer
-    void* vBuffer;  //V data buffer
-    int rotation; // rotation of this frame (0, 90, 180, 270)
-    int64_t renderTimeMs;
-  };
-public:
-  virtual bool onCaptureVideoFrame(VideoFrame& videoFrame) = 0;
-  virtual bool onRenderVideoFrame(unsigned int uid, VideoFrame& videoFrame) = 0;
-};
-
-class IVideoFrame
-{
-public:
-  enum PLANE_TYPE {
-    Y_PLANE = 0,
-    U_PLANE = 1,
-    V_PLANE = 2,
-    NUM_OF_PLANES = 3
-  };
-  enum VIDEO_TYPE {
-    VIDEO_TYPE_UNKNOWN = 0,
-    VIDEO_TYPE_I420 = 1,
-    VIDEO_TYPE_IYUV = 2,
-    VIDEO_TYPE_RGB24 = 3,
-    VIDEO_TYPE_ABGR = 4,
-    VIDEO_TYPE_ARGB = 5,
-    VIDEO_TYPE_ARGB4444 = 6,
-    VIDEO_TYPE_RGB565 = 7,
-    VIDEO_TYPE_ARGB1555 = 8,
-    VIDEO_TYPE_YUY2 = 9,
-    VIDEO_TYPE_YV12 = 10,
-    VIDEO_TYPE_UYVY = 11,
-    VIDEO_TYPE_MJPG = 12,
-    VIDEO_TYPE_NV21 = 13,
-    VIDEO_TYPE_NV12 = 14,
-    VIDEO_TYPE_BGRA = 15,
-    VIDEO_TYPE_RGBA = 16,
-  };
-  virtual void release() = 0;
-  virtual const unsigned char* buffer(PLANE_TYPE type) const = 0;
-
-  // Copy frame: If required size is bigger than allocated one, new buffers of
-  // adequate size will be allocated.
-  // Return value: 0 on success ,-1 on error.
-  virtual int copyFrame(IVideoFrame** dest_frame) const = 0;
-
-  // Convert frame
-  // Input:
-  //   - src_frame        : Reference to a source frame.
-  //   - dst_video_type   : Type of output video.
-  //   - dst_sample_size  : Required only for the parsing of MJPG.
-  //   - dst_frame        : Pointer to a destination frame.
-  // Return value: 0 if OK, < 0 otherwise.
-  // It is assumed that source and destination have equal height.
-  virtual int convertFrame(VIDEO_TYPE dst_video_type, int dst_sample_size, unsigned char* dst_frame) const = 0;
-
-  // Get allocated size per plane.
-  virtual int allocated_size(PLANE_TYPE type) const = 0;
-
-  // Get allocated stride per plane.
-  virtual int stride(PLANE_TYPE type) const = 0;
-
-  // Get frame width.
-  virtual int width() const = 0;
-
-  // Get frame height.
-  virtual int height() const = 0;
-
-  // Get frame timestamp (90kHz).
-  virtual unsigned int timestamp() const = 0;
-
-  // Get render time in milliseconds.
-  virtual int64_t render_time_ms() const = 0;
-
-  // Return true if underlying plane buffers are of zero size, false if not.
-  virtual bool IsZeroSize() const = 0;
-};
-
-class IExternalVideoRenderCallback
-{
-public:
-  virtual void onViewSizeChanged(int width, int height) = 0;
-  virtual void onViewDestroyed() = 0;
-};
-
-struct ExternalVideoRenerContext
-{
-  IExternalVideoRenderCallback* renderCallback;
-  void* view;
-  int renderMode;
-  int zOrder;
-  float left;
-  float top;
-  float right;
-  float bottom;
-};
-
-class IExternalVideoRender
-{
-public:
-  virtual void release() = 0;
-  virtual int initialize() = 0;
-  virtual int deliverFrame(const IVideoFrame& videoFrame, int rotation, bool mirrored) = 0;
-};
-
-class IExternalVideoRenderFactory
-{
-public:
-  virtual IExternalVideoRender* createRenderInstance(const ExternalVideoRenerContext& context) = 0;
-};
-
-class IMediaEngine
-{
-public:
-  virtual void release() = 0;
-  virtual int registerAudioFrameObserver(IAudioFrameObserver* observer) = 0;
-  virtual int registerVideoFrameObserver(IVideoFrameObserver* observer) = 0;
-  virtual int registerVideoRenderFactory(IExternalVideoRenderFactory* factory) = 0;
-  virtual int pushAudioFrame(MEDIA_SOURCE_TYPE type, IAudioFrameObserver::AudioFrame *frame, bool wrap = false){ return -1; }
-};
-
-} //media
-
-} //agora
-
-#endif //AGORA_MEDIA_ENGINE_H

ios/RCTAgora.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		085CF7D72204A7B7002075D5 /* AgoraRtcCryptoLoader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 085CF7D52204A7B7002075D5 /* AgoraRtcCryptoLoader.framework */; };
+		085CF7D82204A7B7002075D5 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 085CF7D62204A7B7002075D5 /* libcrypto.a */; };
+		08B28CF72211239F00E57CEB /* AgoraRtcEngineKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08B28CF62211239F00E57CEB /* AgoraRtcEngineKit.framework */; };
 		23AF28211EEFECD800D771AB /* RCTAgora.m in Sources */ = {isa = PBXBuildFile; fileRef = 23AF28201EEFECD800D771AB /* RCTAgora.m */; };
 		23AF28221EEFECD800D771AB /* RCTAgora.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 23AF281F1EEFECD800D771AB /* RCTAgora.h */; };
 		23C20DD11F0A6ED80095F60C /* AgoraConst.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C20DCC1F0A6ED80095F60C /* AgoraConst.m */; };
@@ -28,7 +31,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		23ACF47C1EF0CF9500801BC7 /* libs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = libs; sourceTree = "<group>"; };
+		085CF7D52204A7B7002075D5 /* AgoraRtcCryptoLoader.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AgoraRtcCryptoLoader.framework; sourceTree = "<group>"; };
+		085CF7D62204A7B7002075D5 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcrypto.a; sourceTree = "<group>"; };
+		08B28CF62211239F00E57CEB /* AgoraRtcEngineKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AgoraRtcEngineKit.framework; path = ../samples/simpleDemo/ios/Pods/AgoraRtcEngine_iOS/AgoraRtcEngineKit.framework; sourceTree = "<group>"; };
 		23AF281C1EEFECD800D771AB /* libRCTAgora.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAgora.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		23AF281F1EEFECD800D771AB /* RCTAgora.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTAgora.h; sourceTree = "<group>"; };
 		23AF28201EEFECD800D771AB /* RCTAgora.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTAgora.m; sourceTree = "<group>"; };
@@ -45,17 +50,38 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				08B28CF72211239F00E57CEB /* AgoraRtcEngineKit.framework in Frameworks */,
+				085CF7D82204A7B7002075D5 /* libcrypto.a in Frameworks */,
+				085CF7D72204A7B7002075D5 /* AgoraRtcCryptoLoader.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		085CF7D42204A787002075D5 /* libs */ = {
+			isa = PBXGroup;
+			children = (
+				085CF7D52204A7B7002075D5 /* AgoraRtcCryptoLoader.framework */,
+				085CF7D62204A7B7002075D5 /* libcrypto.a */,
+			);
+			path = libs;
+			sourceTree = "<group>";
+		};
+		08B28CF52211239F00E57CEB /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				08B28CF62211239F00E57CEB /* AgoraRtcEngineKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		23AF28131EEFECD800D771AB = {
 			isa = PBXGroup;
 			children = (
 				23AF281E1EEFECD800D771AB /* RCTAgora */,
 				23AF281D1EEFECD800D771AB /* Products */,
+				08B28CF52211239F00E57CEB /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -70,7 +96,7 @@
 		23AF281E1EEFECD800D771AB /* RCTAgora */ = {
 			isa = PBXGroup;
 			children = (
-				23ACF47C1EF0CF9500801BC7 /* libs */,
+				085CF7D42204A787002075D5 /* libs */,
 				23C20DCB1F0A6ED80095F60C /* AgoraConst.h */,
 				23C20DCC1F0A6ED80095F60C /* AgoraConst.m */,
 				23C20DCD1F0A6ED80095F60C /* RCTAgoraVideoView.h */,
@@ -109,7 +135,7 @@
 		23AF28141EEFECD800D771AB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = Syan;
 				TargetAttributes = {
 					23AF281B1EEFECD800D771AB = {
@@ -161,15 +187,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -210,15 +244,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -248,12 +290,23 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = 342K4Q49RK;
 				ENABLE_BITCODE = YES;
-				FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/RCTAgora/libs\"";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../../../ios/Pods/**",
+					"$(PROJECT_DIR)/RCTAgora/libs/**",
+				);
 				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
 					"\"$(SRCROOT)/../../react-native/React\"/**",
 					"\"$(SRCROOT)/../../react-native/Libraries\"/**",
+					"$(SRCROOT)/../../../ios/Pods/**",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)",
+					"$(SRCROOT)/../../../ios/Pods/**",
+					"$(PROJECT_DIR)/RCTAgora/libs/**",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -265,12 +318,23 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = 342K4Q49RK;
 				ENABLE_BITCODE = YES;
-				FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/RCTAgora/libs\"";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../../../ios/Pods/**",
+					"$(PROJECT_DIR)/RCTAgora/libs/**",
+				);
 				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
 					"\"$(SRCROOT)/../../react-native/React\"/**",
 					"\"$(SRCROOT)/../../react-native/Libraries\"/**",
+					"$(SRCROOT)/../../../ios/Pods/**",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)",
+					"$(SRCROOT)/../../../ios/Pods/**",
+					"$(PROJECT_DIR)/RCTAgora/libs/**",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

ios/RCTAgora.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

ios/RCTAgora/AgoraConst.h

@@ -8,6 +8,76 @@
 
 #import <AgoraRtcEngineKit/AgoraRtcEngineKit.h>
 
+static NSString *RCTAgoraErrorDomain = @"RCTAgoraErrorDomain";
+
+static NSString *DidOccurWarning = @"onWarning";
+static NSString *DidOccurError = @"onError";
+static NSString *DidApiCallExecute = @"onApiCallExecute";
+static NSString *DidJoinChannel = @"onJoinChannelSuccess";
+static NSString *DidRejoinChannel = @"onRejoinChannelSuccess";
+static NSString *DidLeaveChannel = @"onLeaveChannel";
+static NSString *DidClientRoleChanged = @"onClientRoleChanged";
+static NSString *DidJoinedOfUid = @"onUserJoined";
+static NSString *DidOfflineOfUid = @"onUserOffline";
+static NSString *ConnectionChangedToState = @"onConnectionStateChanged";
+static NSString *ConnectionDidLost = @"onConnectionLost";
+static NSString *TokenPrivilegeWillExpire = @"onTokenPrivilegeWillExpire";
+static NSString *RequestToken = @"onRequestToken";
+
+static NSString *DidMicrophoneEnabled = @"onMicrophoneEnabled";
+static NSString *ReportAudioVolumeIndicationOfSpeakers = @"onAudioVolumeIndication";
+static NSString *ActiveSpeaker = @"onActiveSpeaker";
+static NSString *FirstLocalAudioFrame = @"onFirstLocalAudioFrame";
+static NSString *FirstRemoteAudioFrameOfUid = @"onFirstRemoteAudioFrame";
+static NSString *VideoDidStop = @"onVideoStopped";
+static NSString *FirstLocalVideoFrameWithSize = @"onFirstLocalVideoFrame";
+static NSString *FirstRemoteVideoDecodedOfUid = @"onFirstRemoteVideoDecoded";
+static NSString *FirstRemoteVideoFrameOfUid = @"onFirstRemoteVideoFrame";
+static NSString *DidAudioMuted = @"onUserMuteAudio";
+static NSString *DidVideoMuted = @"onUserMuteVideo";
+static NSString *DidVideoEnabled = @"onUserEnableVideo";
+static NSString *DidLocalVideoEnabled = @"onUserEnableLocalVideo";
+static NSString *VideoSizeChangedOfUid = @"onVideoSizeChanged";
+static NSString *RemoteVideoStateChangedOfUid = @"onRemoteVideoStateChanged";
+static NSString *DidLocalPublishFallbackToAudioOnly = @"onLocalPublishFallbackToAudioOnly";
+static NSString *DidRemoteSubscribeFallbackToAudioOnly = @"onRemoteSubscribeFallbackToAudioOnly";
+
+static NSString *DeviceTypeStateChanged = @"onDeviceTypeStateChanged";
+static NSString *DidAudioRouteChanged = @"onAudioRouteChanged";
+static NSString *CameraDidReady = @"onCameraReady";
+static NSString *CameraFocusDidChangedToRect = @"onCameraFocusAreaChanged";
+static NSString *CameraExposureDidChangedToRect = @"onCameraExposureAreaChanged";
+
+static NSString *ReportRtcStats = @"onRtcStats";
+static NSString *LastmileQuality = @"onLastmileQuality";
+static NSString *NetworkQuality = @"onNetworkQuality";
+static NSString *LocalVideoStats = @"onLocalVideoStats";
+static NSString *RemoteVideoStats = @"onRemoteVideoStats";
+static NSString *RemoteAudioStats = @"onRemoteAudioStats";
+static NSString *AudioTransportStatsOfUid = @"AudioTransportStatsOfUid";
+static NSString *VideoTransportStatsOfUid = @"VideoTransportStatsOfUid";
+
+static NSString *LocalAudioMixingDidFinish = @"onLocalAudioMixingFinish";
+static NSString *RemoteAudioMixingDidStart = @"onRemoteAudioMixingStart";
+static NSString *RemoteAudioMixingDidFinish = @"onRemoteAudioMixingFinish";
+static NSString *DidAudioEffectFinish = @"onAudioEffectFinish";
+
+static NSString *StreamPublished = @"onStreamPublished";
+static NSString *StreamUnpublish = @"onStreamUnpublish";
+static NSString *TranscodingUpdated = @"onTranscodingUpdate";
+
+static NSString *StreamInjectedStatus = @"onStreamInjectedStatus";
+
+static NSString *ReceiveStreamMessage = @"onReceiveStreamMessage";
+static NSString *DidOccurStreamMessageError = @"onOccurStreamMessageError";
+
+static NSString *MediaEngineDidLoaded = @"onMediaEngineLoaded";
+static NSString *MediaEngineDidStartCall = @"onMediaEngineStartCall";
+
+static NSString *ConnectionDidInterrupted = @"onConnectionInterrupted";
+static NSString *ConnectionDidBanned = @"onConnectionBanned";
+static NSString *AudioQualityOfUid = @"onAudioQuality";
+
 @interface AgoraConst : NSObject
 
 @property (nonatomic, copy) NSString *appid;

ios/RCTAgora/AgoraConst.m

@@ -12,25 +12,23 @@
 
 static AgoraConst *_person;
 + (instancetype)allocWithZone:(struct _NSZone *)zone{
-    static dispatch_once_t predicate;
-    dispatch_once(&predicate, ^{
-        _person = [super allocWithZone:zone];
-    });
-    return _person;
+  static dispatch_once_t predicate;
+  dispatch_once(&predicate, ^{
+    _person = [super allocWithZone:zone];
+  });
+  return _person;
 }
 
 + (instancetype)share {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _person = [[self alloc]init];
-    });
-    return _person;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    _person = [[self alloc]init];
+  });
+  return _person;
 }
 
 - (id)copyWithZone:(NSZone *)zone {
-    return _person;
+  return _person;
 }
 
-
-
 @end

ios/RCTAgora/RCTAgora.h

@@ -9,8 +9,8 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <React/RCTBridgeModule.h>
-#import <AgoraRtcEngineKit/AgoraRtcEngineKit.h>
+#import <React/RCTEventEmitter.h>
 
-@interface RCTAgora : NSObject<RCTBridgeModule, AgoraRtcEngineDelegate>
+@interface RCTAgora : RCTEventEmitter<RCTBridgeModule>
 
 @end

ios/RCTAgora/RCTAgoraVideoView.m

@@ -11,32 +11,32 @@
 @implementation RCTAgoraVideoView
 
 - (instancetype)init{
-    
-    if (self == [super init]) {
-        _rtcEngine = [AgoraConst share].rtcEngine;
-    }
-    
-    return self;
+  
+  if (self == [super init]) {
+    _rtcEngine = [AgoraConst share].rtcEngine;
+  }
+  
+  return self;
 }
 
 - (void)setShowLocalVideo:(BOOL)showLocalVideo {
-    if (showLocalVideo) {
-        AgoraRtcVideoCanvas *canvas = [[AgoraRtcVideoCanvas alloc] init];
-        canvas.uid = [AgoraConst share].localUid;
-        canvas.view = self;
-        canvas.renderMode = AgoraRtc_Render_Hidden;
-        [_rtcEngine setupLocalVideo:canvas];
-    }
+  if (showLocalVideo) {
+    AgoraRtcVideoCanvas *canvas = [[AgoraRtcVideoCanvas alloc] init];
+    canvas.uid = [AgoraConst share].localUid;
+    canvas.view = self;
+    canvas.renderMode = AgoraVideoRenderModeHidden;
+    [_rtcEngine setupLocalVideo:canvas];
+  }
 }
 
 -(void)setRemoteUid:(NSInteger)remoteUid {
-    if (remoteUid > 0) {
-        AgoraRtcVideoCanvas *canvas = [[AgoraRtcVideoCanvas alloc] init];
-        canvas.uid = remoteUid;
-        canvas.view = self;
-        canvas.renderMode = AgoraRtc_Render_Hidden;
-        [_rtcEngine setupRemoteVideo:canvas];
-    }
+  if (remoteUid > 0) {
+    AgoraRtcVideoCanvas *canvas = [[AgoraRtcVideoCanvas alloc] init];
+    canvas.uid = remoteUid;
+    canvas.view = self;
+    canvas.renderMode = AgoraVideoRenderModeHidden;
+    [_rtcEngine setupRemoteVideo:canvas];
+  }
 }
 
 @end

ios/RCTAgora/RCTAgoraViewManager.h

@@ -6,8 +6,7 @@
 //  Copyright © 2017年 Syan. All rights reserved.
 //
 
-#import "RCTViewManager.h"
-
+#import <React/RCTViewManager.h>
 
 @interface RCTAgoraViewManager : RCTViewManager
 

ios/RCTAgora/RCTAgoraViewManager.m

@@ -17,7 +17,7 @@ RCT_EXPORT_VIEW_PROPERTY(showLocalVideo, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(remoteUid, NSInteger)
 
 - (UIView *)view {
-    return [RCTAgoraVideoView new];
+  return [RCTAgoraVideoView new];
 }
 
 

ios/RCTAgora/libs/AgoraRtcCryptoLoader.framework/Headers/AgoraRtcCryptoLoader.h

@@ -2,8 +2,7 @@
 //  AgoraRtcCryptoLoader.h
 //  AgoraRtcCryptoLoader
 //
-//  Created by junhao wang on 1/5/17.
-//  Copyright © 2017 Agora. All rights reserved.
+//  Copyright © 2018 Agora. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

package.json

@@ -1,15 +1,18 @@
 {
   "name": "react-native-agora",
-  "version": "1.2.5",
+  "version": "2.3.3",
   "description": "声网Agora",
-  "main": "index.js",
+  "summary": "agora native sdk for react-native",
+  "main": "lib/index.js",
   "scripts": {
     "pu": "npm publish",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "tslint",
+    "build": "tsc"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/DBshaoYan/react-native-agora.git"
+    "url": "https://github.com/syanbo/react-native-agora.git"
   },
   "keywords": [
     "agora",
@@ -21,10 +24,53 @@
     "video",
     "react-native-video"
   ],
-  "author": "",
+  "author": "syanbo",
+  "authors": [
+    "https://github.com/syanbo/react-native-agora/graphs/contributors"
+  ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/DBshaoYan/react-native-agora/issues"
+    "url": "https://github.com/syanbo/react-native-agora/issues"
+  },
+  "homepage": "https://github.com/syanbo/react-native-agora#readme",
+  "peerDependencies": {
+    "react": ">=16.7.0",
+    "react-native": ">=0.58.3"
+  },
+  "devDependencies": {
+    "@types/jest": "^23.3.13",
+    "@types/react": "^16.7.20",
+    "@types/react-native": "^0.57.31",
+    "@types/react-test-renderer": "^16.0.3",
+    "react": "16.7.0",
+    "react-native": "0.58.3",
+    "react-native-typescript-transformer": "^1.2.11",
+    "ts-jest": "^23.10.5",
+    "tslint": "^5.12.1",
+    "typescript": "^3.2.4"
+  },
+  "types": [
+    "./types.d.ts"
+  ],
+  "jest": {
+    "preset": "react-native",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js"
+    ],
+    "transform": {
+      "^.+\\.(js)$": "<rootDir>/node_modules/babel-jest",
+      "\\.(ts|tsx)$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "testPathIgnorePatterns": [
+      "\\.snap$",
+      "<rootDir>/node_modules/"
+    ],
+    "cacheDirectory": ".jest/cache"
   },
-  "homepage": "https://github.com/DBshaoYan/react-native-agora#readme"
+  "dependencies": {
+    "tslib": "^1.9.3"
+  }
 }

react-native-agora.podspec

@@ -0,0 +1,99 @@
+#
+#  Be sure to run `pod spec lint react-native-agora.podspec' to ensure this is a
+#  valid spec and to remove all comments including this before submitting the spec.
+#
+#  To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+#  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
+#
+require 'json'
+
+package = JSON.parse File.read File.join __dir__, "package.json"
+Pod::Spec.new do |s|
+  s.name         = package["name"]
+  s.version      = package["version"]
+  s.summary      = package["summary"]
+  s.description  = package["description"]
+
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["authors"]
+
+  # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  If this Pod runs only on iOS or OS X, then specify the platform and
+  #  the deployment target. You can optionally include the target after the platform.
+  #
+
+  s.platform     = :ios
+  # s.platform     = :ios, "5.0"
+
+  #  When using multiple platforms
+  # s.ios.deployment_target = "5.0"
+  # s.osx.deployment_target = "10.7"
+  # s.watchos.deployment_target = "2.0"
+  # s.tvos.deployment_target = "9.0"
+
+
+  # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  Specify the location from where the source should be retrieved.
+  #  Supports git, hg, bzr, svn and HTTP.
+  #
+
+  #s.source       = { :http => "file:///./ios" }
+  s.source        = { :git => package["repository"]["url"] }
+  #s.source        = { :git => package["repository"]["url"] , :tag => "#{s.version}" }
+
+  s.source_files  = "RCTAgora", "RCTAgora/**/*.{h,m}"
+  # s.public_header_files = "Classes/**/*.h"
+
+
+  # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  A list of resources included with the Pod. These are copied into the
+  #  target bundle with a build phase script. Anything else will be cleaned.
+  #  You can preserve files from being cleaned, please don't preserve
+  #  non-essential files like tests, examples and documentation.
+  #
+
+  # s.resource  = "icon.png"
+  # s.resources = "Resources/*.png"
+
+  # s.preserve_paths = "FilesToSave", "MoreFilesToSave"
+
+
+  # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  Link your library with frameworks, or libraries. Libraries do not include
+  #  the lib prefix of their name.
+  #
+
+  # s.framework  = "SomeFramework"
+  # s.frameworks = "SomeFramework", "AnotherFramework"
+
+  # s.library   = "iconv"
+  # s.libraries = "iconv", "xml2"
+
+
+  # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  If your library depends on compiler flags you can set them in the xcconfig hash
+  #  where they will only apply to your library. If you depend on other Podspecs
+  #  you can include multiple dependencies to ensure it works.
+
+  # s.requires_arc = true
+  s.subspec 'AgoraRtcCryptoLoader' do |sp|
+    sp.source_files = './ios/RCTAgora/libs/AgoraRtcCryptoLoader.framework/**/*.{c,h,m,mm,S,cpp}'
+    sp.vendored_libraries = 'libcrypto.a'
+  end
+
+  s.xcconfig = {
+    "HEADER_SEARCH_PATHS" => [
+      "$(SDKROOT)../../node_modules/react-native/React",
+      "$(SDKROOT)../../ios/Pods"
+    ]
+  }
+  s.dependency "AgoraRtcEngine_iOS", "2.3.3"
+  s.dependency 'React'
+
+end

samples/simpleDemo/.flowconfig

@@ -67,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.78.0
+^0.86.0

samples/simpleDemo/.gitignore

@@ -54,3 +54,63 @@ buck-out/
 
 # Bundle artifact
 *.jsbundle
+Pods
+**/*~
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# BUCK
+buck-out/
+\.buckd/
+*.keystore
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/
+
+*/fastlane/report.xml
+*/fastlane/Preview.html
+*/fastlane/screenshots
+
+# Bundle artifact
+*.jsbundle
+Pods
+**/*~

samples/simpleDemo/App.js

@@ -8,17 +8,10 @@
 
 import React, {Component} from 'react';
 import {
-  Platform, StyleSheet, Text, View, TouchableOpacity, TextInput
+  StyleSheet, Text, View, TouchableOpacity, TextInput
 } from 'react-native';
 import AgoraRTCView from './components/agora';
 
-const instructions = Platform.select({
-  ios: 'Press Cmd+R to reload,\n' + 'Cmd+D or shake for dev menu',
-  android:
-    'Double tap R on your keyboard to reload,\n' +
-    'Shake or press menu button for dev menu',
-});
-
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -57,8 +50,9 @@ export default class App extends Component<Props> {
       channelProfile: 1,
       videoProfile: 40,
       clientRole: 1,
+      uid: 0,
       swapWidthAndHeight: true,
-      channelName: 'defaultChannel'
+      channelName: null
     };
   }
 
@@ -69,27 +63,27 @@ export default class App extends Component<Props> {
   }
 
   onCancel = (error) => {
-    console.log("[error]", error);
     this.setState({
       showLive: false,
-      error
+      error: JSON.stringify(error)
     })
   }
 
   render() {
     if (this.state.showLive) {
+      console.log('channelName', this.state.channelName);
       return (<AgoraRTCView
-        onCancel={this.onCancel}
         channelProfile={this.state.channelProfile}
+        channelName={this.state.channelName}
         videoProfile={this.state.videoProfile}
         clientRole={this.state.clientRole}
-        swapWidthAndHeight={this.state.swapWidthAndHeight}
-        channelName={this.state.channelName}
+        uid={this.state.uid}
+        onCancel={this.onCancel}
       ></AgoraRTCView>);
     }
     return (
       <View style={styles.container}>
-        {this.state.error && <Text>Error Message: {error}</Text>}
+        {this.state.error ? <Text>Error Message: {this.state.error}</Text> : null}
         <TextInput
           style={{height: 40}}
           keyboardType='numeric'
@@ -119,12 +113,26 @@ export default class App extends Component<Props> {
             let matched = text.match(/\d+/g) && text.match(/\d+/g)[0]
             if (matched) {
               this.setState({clientRole: +matched})
-            }          }
+            }
+          }
         } />
         <TextInput
           style={{height: 40}}
           placeholder="Enter channelName"
-          onChnageText={(text) => this.setState({channelName: text})}
+          onChangeText={
+            (text) => {
+              this.setState({channelName: text}) 
+            }
+          }
+        />
+        <TextInput
+          style={{height: 40}}
+          placeholder="Enter uid"
+          onChangeText={
+            (uid) => {
+              this.setState({uid: +uid}) 
+            }
+          }
         />
         <TouchableOpacity
           style={styles.button}

samples/simpleDemo/android/app/BUCK

@@ -8,23 +8,13 @@
 # - `buck install -r android/app` - compile, install and run application
 #
 
+load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
+
 lib_deps = []
 
-for jarfile in glob(['libs/*.jar']):
-  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
-  lib_deps.append(':' + name)
-  prebuilt_jar(
-    name = name,
-    binary_jar = jarfile,
-  )
+create_aar_targets(glob(["libs/*.aar"]))
 
-for aarfile in glob(['libs/*.aar']):
-  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
-  lib_deps.append(':' + name)
-  android_prebuilt_aar(
-    name = name,
-    aar = aarfile,
-  )
+create_jar_targets(glob(["libs/*.jar"]))
 
 android_library(
     name = "all-libs",

samples/simpleDemo/android/app/build.gradle

@@ -103,16 +103,13 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
     }
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86"
+            include "armeabi-v7a", "x86", "arm64-v8a"
         }
     }
     buildTypes {
@@ -126,7 +123,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2]
+            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
@@ -137,12 +134,22 @@ android {
 }
 
 dependencies {
-    compile project(':react-native-agora')
+    implementation project(':react-native-agora')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
 }
 
+repositories {
+    mavenCentral()
+    mavenLocal()
+    maven {
+        url "$rootDir/../node_modules/react-native/android"
+    }
+    jcenter()
+    google()
+}
+
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {

samples/simpleDemo/android/app/build_defs.bzl

@@ -0,0 +1,19 @@
+"""Helper definitions to glob .aar and .jar targets"""
+
+def create_aar_targets(aarfiles):
+    for aarfile in aarfiles:
+        name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
+        lib_deps.append(":" + name)
+        android_prebuilt_aar(
+            name = name,
+            aar = aarfile,
+        )
+
+def create_jar_targets(jarfiles):
+    for jarfile in jarfiles:
+        name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
+        lib_deps.append(":" + name)
+        prebuilt_jar(
+            name = name,
+            binary_jar = jarfile,
+        )

samples/simpleDemo/android/app/src/main/AndroidManifest.xml

@@ -8,8 +8,10 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="true"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      >
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

samples/simpleDemo/android/build.gradle

@@ -2,18 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "27.0.3"
+        buildToolsVersion = "28.0.2"
         minSdkVersion = 16
-        compileSdkVersion = 27
-        targetSdkVersion = 26
-        supportLibVersion = "27.1.1"
+        compileSdkVersion = 28
+        targetSdkVersion = 27
+        supportLibVersion = "28.0.0"
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -34,17 +34,6 @@ allprojects {
 
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.4'
+    gradleVersion = '4.7'
     distributionUrl = distributionUrl.replace("bin", "all")
 }
-
-subprojects {
-    afterEvaluate {project ->
-        if (project.hasProperty("android")) {
-            android {
-                compileSdkVersion 27
-                buildToolsVersion "27.0.3"
-            }
-        }
-    }
-}

samples/simpleDemo/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

samples/simpleDemo/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ["module:metro-react-native-babel-preset"]
+}

samples/simpleDemo/components/agora.js

@@ -1,7 +1,7 @@
 import React, {Component, PureComponent} from 'react';
 import {
   StyleSheet, Text, View, TouchableOpacity,
-  Image, Dimensions, Modal, Platform
+  Image, Dimensions, Modal, Platform, NativeModules
 } from 'react-native';
 
 import {RtcEngine, AgoraView} from 'react-native-agora';
@@ -10,6 +10,20 @@ import {
   isIphoneX, isIphoneXR
 } from '../utils';
 
+const {Agora} = NativeModules;
+
+if (!Agora) {
+  throw new Error("Agora load failed in react-native, please check ur compiler environments");
+}
+
+const {
+  FPS30,
+  FixedLandscape,
+  Host,
+  AudioProfileDefault,
+  AudioScenarioDefault,
+} = Agora;
+
 const BtnEndCall = () => require('../assets/btn_endcall.png');
 const BtnMute = () => require('../assets/btn_mute.png');
 const BtnSpeaker = () => require('../assets/btn_speaker.png');
@@ -86,11 +100,11 @@ type Props = {
   channelName: String,
   videoProfile: Number,
   clientRole: Number,
-  swapWidthAndHeight: Boolean,
-  onCancel: Function
+  onCancel: Function,
+  uid: Number,
 }
 
-export default class Agora extends Component<Props> {
+export default class AgoraComponent extends Component<Props> {
   state = {
     peerIds: [],
     joinSucceed: false,
@@ -109,9 +123,19 @@ export default class Agora extends Component<Props> {
       channelProfile: this.props.channelProfile,
       videoProfile: this.props.videoProfile,
       clientRole: this.props.clientRole,
-      swapWidthAndHeight: this.props.swapWidthAndHeight
+      videoEncoderConfig: {
+        width: 360,
+        height: 480,
+        bitrate: 1,
+        frameRate: FPS30,
+        orientationMode: FixedLandscape,
+      },
+      clientRole: Host,
+      audioProfile: AudioProfileDefault,
+      audioScenario: AudioScenarioDefault
     }
-    console.log("[CONFIG]", config);
+    console.log("[CONFIG]", JSON.stringify(config));
+    console.log("[CONFIG.encoderConfig", config.videoEncoderConfig);
     RtcEngine.init(config);
   }
 
@@ -121,12 +145,21 @@ export default class Agora extends Component<Props> {
     })
 
     console.log('[joinChannel] ' + this.props.channelName);
-    RtcEngine.joinChannel(this.props.channelName);
+    RtcEngine.joinChannel(this.props.channelName, this.props.uid);
     RtcEngine.enableAudioVolumeIndication(500, 3);
     RtcEngine.eventEmitter({
       onFirstRemoteVideoDecoded: (data) => {
         console.log('[RtcEngine] onFirstRemoteVideoDecoded', data);
       },
+      onUserJoined: (data) => {
+        console.log('[RtcEngine] onUserJoined', data);
+        const {peerIds} = this.state;
+        if (peerIds.indexOf(data.uid) === -1) {
+          this.setState({
+            peerIds: [...peerIds, data.uid]
+          })
+        }
+      },
       onUserOffline: (data) => {
         console.log('[RtcEngine] onUserOffline', data);
         this.setState({
@@ -135,37 +168,40 @@ export default class Agora extends Component<Props> {
       },
       onJoinChannelSuccess: (data) => {
         console.log('[RtcEngine] onJoinChannelSuccess', data);
-        // RtcEngine.setShowLocalVideo()
         RtcEngine.startPreview();
         this.setState({
           joinSucceed: true
         })
-      },
-      onAudioVolumeIndication: (data) => {
-        console.log('[RtcEngine] onAudioVolumeIndication', data);
-      },
-      onUserJoined: (data) => {
-        console.log('[RtcEngine] onUserJoined', data);
         const {peerIds} = this.state;
-        if (peerIds.indexOf(data.uid) !== -1) {
+        if (peerIds.indexOf(data.uid) === -1) {
           this.setState({
             peerIds: [...peerIds, data.uid]
           })
         }
       },
+      onAudioVolumeIndication: (data) => {
+        console.log('[RtcEngine] onAudioVolumeIndication', data);
+      },
+      onClientRoleChanged: (data) => {
+        console.log("[RtcEngine] onClientRoleChanged", data);
+      },
       onError: (data) => {
         console.log('[RtcEngine] onError', data);
         if (data.error === 17) {
-          RtcEngine.leaveChannel();
-          RtcEngine.destroy();
+          RtcEngine.leaveChannel().then(_ => {
+            RtcEngine.destroy();
+            this.props.onCancel(data);
+          });
         }
-        this.props.onCancel(data.error);
       }
     })
   }
 
   componentWillUnmount () {
-    RtcEngine.removeEmitter()
+    if (this.state.joinSucceed) {
+      RtcEngine.leaveChannel();
+      RtcEngine.destroy();
+    }
   }
 
   handleCancel = () => {
@@ -198,7 +234,9 @@ export default class Agora extends Component<Props> {
     this.setState({
       isCameraTorch: !this.state.isCameraTorch
     }, () => {
-      RtcEngine.setCameraTorchOn(this.state.isCameraTorch)
+      RtcEngine.setCameraTorchOn(this.state.isCameraTorch).then(val => {
+        console.log("setCameraTorch", val);
+      })
     })
   }
 

samples/simpleDemo/ios/Podfile

@@ -0,0 +1,42 @@
+# Uncomment the next line to define a global platform for your project
+platform :ios, '9.0'
+react_native_path = "../node_modules/react-native"
+project "simpleDemo.xcodeproj"
+
+target 'simpleDemo' do
+  # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
+  # use_frameworks!
+
+  # Pods for simpleDemo
+
+  #target 'simpleDemo-tvOSTests' do
+  #  inherit! :search_paths
+  #  # Pods for testing
+  #end
+  pod "react-native-agora", path: "../../../"
+  pod 'yoga', path: '../node_modules/react-native/ReactCommon/yoga/Yoga.podspec'
+  pod 'React', path: '../node_modules/react-native'
+  #pod "React", path: react_native_path
+  #%w(DoubleConversion Folly glog).each do |lib_name|
+  #  pod lib_name, podspec: "#{react_native_path}/third-party-podspecs/#{lib_name}.podspec"
+  #end
+
+  target 'simpleDemoTests' do
+    inherit! :search_paths
+    # Pods for testing
+  end
+
+end
+
+target 'simpleDemo-tvOS' do
+  # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
+  # use_frameworks!
+
+  # Pods for simpleDemo-tvOS
+
+  target 'simpleDemo-tvOSTests' do
+    inherit! :search_paths
+    # Pods for testing
+  end
+
+end

samples/simpleDemo/ios/Podfile.lock

@@ -0,0 +1,41 @@
+PODS:
+  - AgoraRtcEngine_iOS (2.3.3)
+  - React (0.58.3):
+    - React/Core (= 0.58.3)
+  - react-native-agora (2.3.3):
+    - AgoraRtcEngine_iOS (= 2.3.3)
+    - React
+    - react-native-agora/AgoraRtcCryptoLoader (= 2.3.3)
+  - react-native-agora/AgoraRtcCryptoLoader (2.3.3):
+    - AgoraRtcEngine_iOS (= 2.3.3)
+    - React
+  - React/Core (0.58.3):
+    - yoga (= 0.58.3.React)
+  - yoga (0.58.3.React)
+
+DEPENDENCIES:
+  - React (from `../node_modules/react-native`)
+  - react-native-agora (from `../../../`)
+  - yoga (from `../node_modules/react-native/ReactCommon/yoga/Yoga.podspec`)
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - AgoraRtcEngine_iOS
+
+EXTERNAL SOURCES:
+  React:
+    :path: "../node_modules/react-native"
+  react-native-agora:
+    :path: "../../../"
+  yoga:
+    :path: "../node_modules/react-native/ReactCommon/yoga/Yoga.podspec"
+
+SPEC CHECKSUMS:
+  AgoraRtcEngine_iOS: 8ad4b58dafed2cec5df03fa1f0ddbdad2c9ff958
+  React: 9b873b38b92ed8012d7cdf3b965477095ed364c4
+  react-native-agora: ad538661771e745fac8920412002e0e90903bbc8
+  yoga: 0885622311729a02c2bc02dca97167787a51488b
+
+PODFILE CHECKSUM: 20565f1fb8643e49a8e76b33da6bb4e2d188134a
+
+COCOAPODS: 1.5.3

samples/simpleDemo/ios/simpleDemo.xcodeproj/project.pbxproj

@@ -13,17 +13,15 @@
 		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
 		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
 		00E356F31AD99517003FC87E /* simpleDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* simpleDemoTests.m */; };
-		083336BA21E5C1FB007059A4 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336B921E5C1FB007059A4 /* libresolv.tbd */; };
-		083336BC21E5C202007059A4 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336BB21E5C202007059A4 /* libc++.tbd */; };
-		083336BE21E5C207007059A4 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336BD21E5C207007059A4 /* AVFoundation.framework */; };
-		083336C021E5C20C007059A4 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336BF21E5C20C007059A4 /* AudioToolbox.framework */; };
-		083336C221E5C211007059A4 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336C121E5C211007059A4 /* VideoToolbox.framework */; };
-		083336C421E5C216007059A4 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336C321E5C216007059A4 /* CoreMotion.framework */; };
-		083336C621E5C21D007059A4 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336C521E5C21C007059A4 /* CoreMedia.framework */; };
-		083336C821E5C222007059A4 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336C721E5C222007059A4 /* CoreTelephony.framework */; };
-		083336CC21E5C246007059A4 /* AgoraRtcCryptoLoader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336C921E5C246007059A4 /* AgoraRtcCryptoLoader.framework */; };
-		083336CD21E5C246007059A4 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336CA21E5C246007059A4 /* libcrypto.a */; };
-		083336CE21E5C246007059A4 /* AgoraRtcEngineKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 083336CB21E5C246007059A4 /* AgoraRtcEngineKit.framework */; };
+		0842E3912206D315003875AC /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E36A2206D315003875AC /* libc++.tbd */; };
+		0842E3932206D31B003875AC /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E3922206D31B003875AC /* libresolv.tbd */; };
+		0842E3952206D320003875AC /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E3942206D320003875AC /* AVFoundation.framework */; };
+		0842E3982206D32B003875AC /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E3962206D32B003875AC /* VideoToolbox.framework */; };
+		0842E3992206D32B003875AC /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E3972206D32B003875AC /* AudioToolbox.framework */; };
+		0842E39C2206D332003875AC /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E39A2206D331003875AC /* CoreMedia.framework */; };
+		0842E39D2206D332003875AC /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E39B2206D332003875AC /* CoreMotion.framework */; };
+		0842E39F2206D338003875AC /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0842E39E2206D338003875AC /* CoreTelephony.framework */; };
+		08BFF1BD22147B2200E0E165 /* libRCTAgora.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 08BFF1BC2214766F00E0E165 /* libRCTAgora.a */; };
 		11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
 		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
 		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
@@ -47,9 +45,13 @@
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* simpleDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* simpleDemoTests.m */; };
 		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
+		5A931A3C341570AA3E833874 /* libPods-simpleDemo-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7045B20B3EC883C32AF1B5 /* libPods-simpleDemo-tvOSTests.a */; };
+		75EFD1DDB6D7C688791C27A6 /* libPods-simpleDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F5A5A3495E0D2D4CBC2035A /* libPods-simpleDemo.a */; };
+		813AD4D43E8DEAAF0478F6EF /* libPods-simpleDemo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 30E47B51FD9B743E449A9302 /* libPods-simpleDemo-tvOS.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
-		FE3240808F774A3B8D6D68B2 /* libRCTAgora.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 579173BBF9FA4C0B85E6C677 /* libRCTAgora.a */; };
+		ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
+		EEEC06144F8951761B114A63 /* libPods-simpleDemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB22B2D50EC2E4896C4F10E2 /* libPods-simpleDemoTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -95,9 +97,37 @@
 			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
 			remoteInfo = simpleDemo;
 		};
-		083336B721E5C177007059A4 /* PBXContainerItemProxy */ = {
+		0842E3362206D244003875AC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 040C0180048A4B0B9127DD27 /* RCTAgora.xcodeproj */;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
+			remoteInfo = jsi;
+		};
+		0842E3382206D244003875AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
+			remoteInfo = jsiexecutor;
+		};
+		0842E33A2206D244003875AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
+			remoteInfo = "jsi-tvOS";
+		};
+		0842E33C2206D244003875AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
+			remoteInfo = "jsiexecutor-tvOS";
+		};
+		08BFF1BB2214766F00E0E165 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08BFF1B72214766F00E0E165 /* RCTAgora.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 23AF281C1EEFECD800D771AB;
 			remoteInfo = RCTAgora;
@@ -193,20 +223,6 @@
 			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
 			remoteInfo = "double-conversion-tvOS";
 		};
-		2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
-			remoteInfo = privatedata;
-		};
-		2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
-			remoteInfo = "privatedata-tvOS";
-		};
 		3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -284,20 +300,6 @@
 			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
 			remoteInfo = "cxxreact-tvOS";
 		};
-		3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
-			remoteInfo = jschelpers;
-		};
-		3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
-			remoteInfo = "jschelpers-tvOS";
-		};
 		5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
@@ -345,18 +347,18 @@
 		00E356EE1AD99517003FC87E /* simpleDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = simpleDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* simpleDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = simpleDemoTests.m; sourceTree = "<group>"; };
-		040C0180048A4B0B9127DD27 /* RCTAgora.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTAgora.xcodeproj; path = "../node_modules/react-native-agora/ios/RCTAgora.xcodeproj"; sourceTree = "<group>"; };
-		083336B921E5C1FB007059A4 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
-		083336BB21E5C202007059A4 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-		083336BD21E5C207007059A4 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-		083336BF21E5C20C007059A4 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		083336C121E5C211007059A4 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
-		083336C321E5C216007059A4 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
-		083336C521E5C21C007059A4 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-		083336C721E5C222007059A4 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
-		083336C921E5C246007059A4 /* AgoraRtcCryptoLoader.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AgoraRtcCryptoLoader.framework; path = "../node_modules/react-native-agora/ios/RCTAgora/libs/AgoraRtcCryptoLoader.framework"; sourceTree = "<group>"; };
-		083336CA21E5C246007059A4 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../node_modules/react-native-agora/ios/RCTAgora/libs/libcrypto.a"; sourceTree = "<group>"; };
-		083336CB21E5C246007059A4 /* AgoraRtcEngineKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AgoraRtcEngineKit.framework; path = "../node_modules/react-native-agora/ios/RCTAgora/libs/AgoraRtcEngineKit.framework"; sourceTree = "<group>"; };
+		0842E36A2206D315003875AC /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+		0842E3922206D31B003875AC /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
+		0842E3942206D320003875AC /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		0842E3962206D32B003875AC /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
+		0842E3972206D32B003875AC /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		0842E39A2206D331003875AC /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		0842E39B2206D332003875AC /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
+		0842E39E2206D338003875AC /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
+		0842E3A02206D34C003875AC /* AgoraRtcEngineKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AgoraRtcEngineKit.framework; path = Pods/AgoraRtcEngine_iOS/AgoraRtcEngineKit.framework; sourceTree = "<group>"; };
+		0842E3A22206D360003875AC /* AgoraRtcCryptoLoader.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AgoraRtcCryptoLoader.framework; path = "../node_modules/react-native-agora/ios/RCTAgora/libs/AgoraRtcCryptoLoader.framework"; sourceTree = "<group>"; };
+		0842E3A32206D360003875AC /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../node_modules/react-native-agora/ios/RCTAgora/libs/libcrypto.a"; sourceTree = "<group>"; };
+		08BFF1B72214766F00E0E165 /* RCTAgora.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAgora.xcodeproj; path = "../node_modules/react-native-agora/ios/RCTAgora.xcodeproj"; sourceTree = "<group>"; };
 		139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
 		139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* simpleDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -370,11 +372,23 @@
 		2D02E47B1E0B4A5D006451C7 /* simpleDemo-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "simpleDemo-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E4901E0B4A5D006451C7 /* simpleDemo-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "simpleDemo-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		579173BBF9FA4C0B85E6C677 /* libRCTAgora.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTAgora.a; sourceTree = "<group>"; };
+		30E47B51FD9B743E449A9302 /* libPods-simpleDemo-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-simpleDemo-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3D4E3D78CA5AFF0A0DE8400B /* Pods-simpleDemo-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemo-tvOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemo-tvOSTests/Pods-simpleDemo-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
+		3F5A5A3495E0D2D4CBC2035A /* libPods-simpleDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-simpleDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		4F8422FC389657ECAE764F35 /* Pods-simpleDemo-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemo-tvOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemo-tvOSTests/Pods-simpleDemo-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
+		7C8CC895F34C3FFE167217AB /* Pods-simpleDemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemoTests/Pods-simpleDemoTests.debug.xcconfig"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
+		8C75CEB377545FED40C4F135 /* Pods-simpleDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemoTests/Pods-simpleDemoTests.release.xcconfig"; sourceTree = "<group>"; };
+		A6331DF634CD310F84C3B9D0 /* Pods-simpleDemo-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemo-tvOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemo-tvOS/Pods-simpleDemo-tvOS.release.xcconfig"; sourceTree = "<group>"; };
+		A8E3B1381976DA57BA54DF1C /* Pods-simpleDemo-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemo-tvOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemo-tvOS/Pods-simpleDemo-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
+		B76CA498082B698840FFCDE0 /* Pods-simpleDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemo/Pods-simpleDemo.release.xcconfig"; sourceTree = "<group>"; };
+		B8AF77DEAE35976FF56DAC57 /* Pods-simpleDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-simpleDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-simpleDemo/Pods-simpleDemo.debug.xcconfig"; sourceTree = "<group>"; };
+		BC7045B20B3EC883C32AF1B5 /* libPods-simpleDemo-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-simpleDemo-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		EB22B2D50EC2E4896C4F10E2 /* libPods-simpleDemoTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-simpleDemoTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -383,6 +397,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */,
+				EEEC06144F8951761B114A63 /* libPods-simpleDemoTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -390,17 +405,16 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				083336CC21E5C246007059A4 /* AgoraRtcCryptoLoader.framework in Frameworks */,
-				083336CD21E5C246007059A4 /* libcrypto.a in Frameworks */,
-				083336CE21E5C246007059A4 /* AgoraRtcEngineKit.framework in Frameworks */,
-				083336C821E5C222007059A4 /* CoreTelephony.framework in Frameworks */,
-				083336C621E5C21D007059A4 /* CoreMedia.framework in Frameworks */,
-				083336C421E5C216007059A4 /* CoreMotion.framework in Frameworks */,
-				083336C221E5C211007059A4 /* VideoToolbox.framework in Frameworks */,
-				083336C021E5C20C007059A4 /* AudioToolbox.framework in Frameworks */,
-				083336BE21E5C207007059A4 /* AVFoundation.framework in Frameworks */,
-				083336BC21E5C202007059A4 /* libc++.tbd in Frameworks */,
-				083336BA21E5C1FB007059A4 /* libresolv.tbd in Frameworks */,
+				08BFF1BD22147B2200E0E165 /* libRCTAgora.a in Frameworks */,
+				0842E39F2206D338003875AC /* CoreTelephony.framework in Frameworks */,
+				0842E39C2206D332003875AC /* CoreMedia.framework in Frameworks */,
+				0842E39D2206D332003875AC /* CoreMotion.framework in Frameworks */,
+				0842E3982206D32B003875AC /* VideoToolbox.framework in Frameworks */,
+				0842E3992206D32B003875AC /* AudioToolbox.framework in Frameworks */,
+				0842E3952206D320003875AC /* AVFoundation.framework in Frameworks */,
+				0842E3932206D31B003875AC /* libresolv.tbd in Frameworks */,
+				0842E3912206D315003875AC /* libc++.tbd in Frameworks */,
+				ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
 				ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
 				11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
@@ -413,7 +427,7 @@
 				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
 				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
 				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
-				FE3240808F774A3B8D6D68B2 /* libRCTAgora.a in Frameworks */,
+				75EFD1DDB6D7C688791C27A6 /* libPods-simpleDemo.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -429,6 +443,7 @@
 				2D02E4C61E0B4AEC006451C7 /* libRCTSettings-tvOS.a in Frameworks */,
 				2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */,
 				2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */,
+				813AD4D43E8DEAAF0478F6EF /* libPods-simpleDemo-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -437,6 +452,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */,
+				5A931A3C341570AA3E833874 /* libPods-simpleDemo-tvOSTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -502,18 +518,17 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		0833368E21E5C173007059A4 /* Recovered References */ = {
+		0842E3102206D244003875AC /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
-				579173BBF9FA4C0B85E6C677 /* libRCTAgora.a */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
-		083336B421E5C176007059A4 /* Products */ = {
+		08BFF1B82214766F00E0E165 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				083336B821E5C177007059A4 /* libRCTAgora.a */,
+				08BFF1BC2214766F00E0E165 /* libRCTAgora.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -561,35 +576,55 @@
 				3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
 				3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
-				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
-				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
 				2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
 				2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
 				2DF0FFE32056DD460020B375 /* libthird-party.a */,
 				2DF0FFE52056DD460020B375 /* libthird-party.a */,
 				2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
 				2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
-				2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
-				2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
+				0842E3372206D244003875AC /* libjsi.a */,
+				0842E3392206D244003875AC /* libjsiexecutor.a */,
+				0842E33B2206D244003875AC /* libjsi-tvOS.a */,
+				0842E33D2206D244003875AC /* libjsiexecutor-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
+		1FE1E6BD58AC46ED69A01571 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				B8AF77DEAE35976FF56DAC57 /* Pods-simpleDemo.debug.xcconfig */,
+				B76CA498082B698840FFCDE0 /* Pods-simpleDemo.release.xcconfig */,
+				A8E3B1381976DA57BA54DF1C /* Pods-simpleDemo-tvOS.debug.xcconfig */,
+				A6331DF634CD310F84C3B9D0 /* Pods-simpleDemo-tvOS.release.xcconfig */,
+				4F8422FC389657ECAE764F35 /* Pods-simpleDemo-tvOSTests.debug.xcconfig */,
+				3D4E3D78CA5AFF0A0DE8400B /* Pods-simpleDemo-tvOSTests.release.xcconfig */,
+				7C8CC895F34C3FFE167217AB /* Pods-simpleDemoTests.debug.xcconfig */,
+				8C75CEB377545FED40C4F135 /* Pods-simpleDemoTests.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				083336C921E5C246007059A4 /* AgoraRtcCryptoLoader.framework */,
-				083336CB21E5C246007059A4 /* AgoraRtcEngineKit.framework */,
-				083336CA21E5C246007059A4 /* libcrypto.a */,
-				083336C721E5C222007059A4 /* CoreTelephony.framework */,
-				083336C521E5C21C007059A4 /* CoreMedia.framework */,
-				083336C321E5C216007059A4 /* CoreMotion.framework */,
-				083336C121E5C211007059A4 /* VideoToolbox.framework */,
-				083336BF21E5C20C007059A4 /* AudioToolbox.framework */,
-				083336BD21E5C207007059A4 /* AVFoundation.framework */,
-				083336BB21E5C202007059A4 /* libc++.tbd */,
-				083336B921E5C1FB007059A4 /* libresolv.tbd */,
+				0842E3A22206D360003875AC /* AgoraRtcCryptoLoader.framework */,
+				0842E3A32206D360003875AC /* libcrypto.a */,
+				0842E3A02206D34C003875AC /* AgoraRtcEngineKit.framework */,
+				0842E39E2206D338003875AC /* CoreTelephony.framework */,
+				0842E39A2206D331003875AC /* CoreMedia.framework */,
+				0842E39B2206D332003875AC /* CoreMotion.framework */,
+				0842E3972206D32B003875AC /* AudioToolbox.framework */,
+				0842E3962206D32B003875AC /* VideoToolbox.framework */,
+				0842E3942206D320003875AC /* AVFoundation.framework */,
+				0842E3922206D31B003875AC /* libresolv.tbd */,
+				0842E36A2206D315003875AC /* libc++.tbd */,
+				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				2D16E6891FA4F8E400B85C8A /* libReact.a */,
+				3F5A5A3495E0D2D4CBC2035A /* libPods-simpleDemo.a */,
+				30E47B51FD9B743E449A9302 /* libPods-simpleDemo-tvOS.a */,
+				BC7045B20B3EC883C32AF1B5 /* libPods-simpleDemo-tvOSTests.a */,
+				EB22B2D50EC2E4896C4F10E2 /* libPods-simpleDemoTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -615,6 +650,7 @@
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				08BFF1B72214766F00E0E165 /* RCTAgora.xcodeproj */,
 				5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
@@ -627,7 +663,6 @@
 				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
 				00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
 				139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
-				040C0180048A4B0B9127DD27 /* RCTAgora.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -649,7 +684,8 @@
 				00E356EF1AD99517003FC87E /* simpleDemoTests */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
-				0833368E21E5C173007059A4 /* Recovered References */,
+				0842E3102206D244003875AC /* Recovered References */,
+				1FE1E6BD58AC46ED69A01571 /* Pods */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -683,6 +719,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "simpleDemoTests" */;
 			buildPhases = (
+				2D951AF5F54A943305AF47CE /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
@@ -701,6 +738,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "simpleDemo" */;
 			buildPhases = (
+				0C0449DF546B8196AD640260 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
@@ -719,6 +757,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "simpleDemo-tvOS" */;
 			buildPhases = (
+				6A62784F9CCD9039899ABD4F /* [CP] Check Pods Manifest.lock */,
 				2D02E4771E0B4A5D006451C7 /* Sources */,
 				2D02E4781E0B4A5D006451C7 /* Frameworks */,
 				2D02E4791E0B4A5D006451C7 /* Resources */,
@@ -737,6 +776,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "simpleDemo-tvOSTests" */;
 			buildPhases = (
+				08F266698EF8951602DE8B81 /* [CP] Check Pods Manifest.lock */,
 				2D02E48C1E0B4A5D006451C7 /* Sources */,
 				2D02E48D1E0B4A5D006451C7 /* Frameworks */,
 				2D02E48E1E0B4A5D006451C7 /* Resources */,
@@ -801,8 +841,8 @@
 					ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
 				},
 				{
-					ProductGroup = 083336B421E5C176007059A4 /* Products */;
-					ProjectRef = 040C0180048A4B0B9127DD27 /* RCTAgora.xcodeproj */;
+					ProductGroup = 08BFF1B82214766F00E0E165 /* Products */;
+					ProjectRef = 08BFF1B72214766F00E0E165 /* RCTAgora.xcodeproj */;
 				},
 				{
 					ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
@@ -895,11 +935,39 @@
 			remoteRef = 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		083336B821E5C177007059A4 /* libRCTAgora.a */ = {
+		0842E3372206D244003875AC /* libjsi.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsi.a;
+			remoteRef = 0842E3362206D244003875AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		0842E3392206D244003875AC /* libjsiexecutor.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsiexecutor.a;
+			remoteRef = 0842E3382206D244003875AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		0842E33B2206D244003875AC /* libjsi-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsi-tvOS.a";
+			remoteRef = 0842E33A2206D244003875AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		0842E33D2206D244003875AC /* libjsiexecutor-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsiexecutor-tvOS.a";
+			remoteRef = 0842E33C2206D244003875AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		08BFF1BC2214766F00E0E165 /* libRCTAgora.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libRCTAgora.a;
-			remoteRef = 083336B721E5C177007059A4 /* PBXContainerItemProxy */;
+			remoteRef = 08BFF1BB2214766F00E0E165 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		139105C11AF99BAD00B5F7CC /* libRCTSettings.a */ = {
@@ -986,20 +1054,6 @@
 			remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libprivatedata.a;
-			remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libprivatedata-tvOS.a";
-			remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1077,20 +1131,6 @@
 			remoteRef = 3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjschelpers.a;
-			remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjschelpers.a;
-			remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1175,7 +1215,51 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
+		};
+		08F266698EF8951602DE8B81 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-simpleDemo-tvOSTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		0C0449DF546B8196AD640260 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-simpleDemo-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
 		};
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1191,6 +1275,50 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
+		2D951AF5F54A943305AF47CE /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-simpleDemoTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		6A62784F9CCD9039899ABD4F /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-simpleDemo-tvOS-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1258,25 +1386,19 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7C8CC895F34C3FFE167217AB /* Pods-simpleDemoTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = 56968F5P8G;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = simpleDemoTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1289,22 +1411,16 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8C75CEB377545FED40C4F135 /* Pods-simpleDemoTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEVELOPMENT_TEAM = 56968F5P8G;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = simpleDemoTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1317,26 +1433,32 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = B8AF77DEAE35976FF56DAC57 /* Pods-simpleDemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 56968F5P8G;
-				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/libs\"\n\n";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../node_modules/react-native-agora/ios/**",
+				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
+					"$(SRCROOT)/../node_modules/react-native-agora/ios/**",
 				);
 				INFOPLIST_FILE = simpleDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/libs\"\n\n";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../node_modules/react-native-agora/ios/**",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.tori.simpleDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = tori.mori.mobi;
 				PRODUCT_NAME = simpleDemo;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1344,25 +1466,31 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = B76CA498082B698840FFCDE0 /* Pods-simpleDemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 56968F5P8G;
-				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/libs\"\n\n";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../node_modules/react-native-agora/ios/**",
+				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
+					"$(SRCROOT)/../node_modules/react-native-agora/ios/**",
 				);
 				INFOPLIST_FILE = simpleDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/libs\"\n\n";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../node_modules/react-native-agora/ios/**",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.tori.simpleDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = tori.mori.mobi;
 				PRODUCT_NAME = simpleDemo;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1370,6 +1498,7 @@
 		};
 		2D02E4971E0B4A5E006451C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = A8E3B1381976DA57BA54DF1C /* Pods-simpleDemo-tvOS.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -1380,16 +1509,10 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "simpleDemo-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1404,6 +1527,7 @@
 		};
 		2D02E4981E0B4A5E006451C7 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = A6331DF634CD310F84C3B9D0 /* Pods-simpleDemo-tvOS.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -1414,16 +1538,10 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "simpleDemo-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1438,6 +1556,7 @@
 		};
 		2D02E4991E0B4A5E006451C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4F8422FC389657ECAE764F35 /* Pods-simpleDemo-tvOSTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
@@ -1447,16 +1566,10 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "simpleDemo-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1471,6 +1584,7 @@
 		};
 		2D02E49A1E0B4A5E006451C7 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3D4E3D78CA5AFF0A0DE8400B /* Pods-simpleDemo-tvOSTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
@@ -1480,16 +1594,10 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-agora/ios/RCTAgora/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "simpleDemo-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1529,7 +1637,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1583,7 +1690,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;

samples/simpleDemo/ios/simpleDemo.xcodeproj/xcshareddata/xcschemes/simpleDemo-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

samples/simpleDemo/ios/simpleDemo.xcodeproj/xcshareddata/xcschemes/simpleDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

samples/simpleDemo/ios/simpleDemo/AppDelegate.h

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

samples/simpleDemo/ios/simpleDemo/AppDelegate.m

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -16,17 +16,13 @@
 {
   NSURL *jsCodeLocation;
 
-  #ifdef DEBUG
-    jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-  #else
-    jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-  #endif
+  jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"simpleDemo"
                                                initialProperties:nil
                                                    launchOptions:launchOptions];
-  rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
+  rootView.backgroundColor = [UIColor blackColor];
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [UIViewController new];

samples/simpleDemo/ios/simpleDemo/Info.plist

@@ -37,12 +37,8 @@
 			</dict>
 		</dict>
 	</dict>
-	<key>NSCameraUsageDescription</key>
-	<string>use camera for agora video call</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>use microphone for agora video call</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>
@@ -61,5 +57,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSCameraUsageDescription</key>
+	<string>use camera for avc</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>use microphone for avc sdk</string>
 </dict>
 </plist>

samples/simpleDemo/ios/simpleDemo/main.m

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

samples/simpleDemo/ios/simpleDemoTests/simpleDemoTests.m

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

samples/simpleDemo/package.json

@@ -11,14 +11,14 @@
     "test": "jest"
   },
   "dependencies": {
-    "react": "16.6.3",
-    "react-native": "0.57.8"
+    "react": "16.7.0",
+    "react-native": "0.58.3",
+    "react-native-agora": "file:../.."
   },
   "devDependencies": {
     "babel-jest": "23.6.0",
     "jest": "23.6.0",
     "metro-react-native-babel-preset": "0.51.1",
-    "react-native-agora": "^1.2.5",
     "react-test-renderer": "16.6.3"
   },
   "jest": {

src/AgoraView.native.tsx

@@ -0,0 +1,27 @@
+import React from 'react';
+import {
+    requireNativeComponent,
+} from 'react-native'
+
+import {
+    AgoraViewProps
+} from "./types.d";
+
+const RCTAgoraView = requireNativeComponent("RCTAgoraView");
+
+export default class AgoraView extends React.Component<AgoraViewProps> {
+    public render(): JSX.Element {
+        return (
+            <RCTAgoraView { ...this.getHTMLProps() } />
+        )
+    }
+
+    private getHTMLProps(): AgoraViewProps {
+        let htmlProps = {} as AgoraViewProps;
+        for (let key in this.props) {
+            htmlProps[key] = this.props[key];
+        }
+        return htmlProps;
+    }
+}
+

src/RtcEngine.native.ts

@@ -0,0 +1,295 @@
+import {
+    NativeModules,
+    NativeEventEmitter,
+    EmitterSubscription
+} from 'react-native';
+
+import {
+    Option, VideoOption,
+    EventScheduler,
+    PublisherConfig,
+    LiveTranscoding, Callback,
+    String, Number
+} from "./types.d";
+
+
+const { Agora } = NativeModules;
+const AgoraEventEmitter = new NativeEventEmitter(Agora);
+
+export default class RtcEngine {
+
+    private static listeners: Array<EmitterSubscription>;
+    static init(options: Option): void {
+        this.removeEmitter();
+        Agora.init(options);
+        this.listeners = [];
+    }
+
+    static joinChannel(channelName: String, uid?: Number, token?: String, info?: Object): void {
+        return Agora.joinChannel({channelName, uid, token, info});
+    }
+
+    static joinChannelWithToken(
+        channelName: string, token?: String, uid?: Number): void {
+        Agora.joinChannelWithToken(token, channelName, uid);
+    }
+
+    static eventEmitter(eventScheduler: EventScheduler) {
+        this.removeEmitter();
+        // const events = EventSchedulerKeys;
+        const events = [
+            "onWarning",
+            
+            "onError",
+            
+            "onJoinChannelSuccess",
+            
+            "onRejoinChannelSuccess",
+            
+            "onLeaveChannel",
+            
+            "onClientRoleChanged",
+            
+            "onUserJoined",
+            
+            "onUserOffline",
+            
+            "onConnectionStateChanged",
+            
+            "onConnectionInterrupted",
+            
+            "onConnectionLost",
+            
+            "onConnectionBanned",
+            
+            "onApiCallExecuted",
+            
+            "onTokenPrivilegeWillExpire",
+            
+            "onRequestToken",
+            
+            "onMicrophoneEnabled",
+            
+            "onAudioVolumeIndication",
+            
+            "onActiveSpeaker",
+            
+            "onFirstLocalAudioFrame",
+            
+            "onFirstRemoteAudioFrame",
+            
+            "onVideoStopped",
+            
+            "onFirstLocalVideoFrame",
+            
+            "onFirstRemoteVideoDecoded",
+            
+            "onFirstRemoteVideoFrame",
+            
+            "onUserMuteAudio",
+            
+            "onUserMuteVideo",
+            
+            "onUserEnableVideo",
+            
+            "onUserEnableLocalVideo",
+            
+            "onVideoSizeChanged",
+            
+            "onRemoteVideoStateChanged",
+            
+            "onLocalPublishFallbackToAudioOnly",
+            
+            "onRemoteSubscribeFallbackToAudioOnly",
+            
+            "onAudioRouteChanged",
+            
+            "onCameraReady",
+            
+            "onCameraFocusAreaChanged",
+            
+            "onCameraExposureAreaChanged",
+            
+            "onAudioQuality",
+            
+            "onRtcStats",
+            
+            "onLastmileQuality",
+            
+            "onNetworkQuality",
+            
+            "onLocalVideoStats",
+            
+            "onRemoteVideoStats",
+            
+            "onRemoteAudioStats",
+            
+            "onLocalVideoStat",
+            
+            "onRemoteVideoStat",
+            
+            "onRemoteAudioTransportStats",
+            
+            "onRemoteVideoTransportStats",
+            
+            "onAudioMixingFinished",
+            
+            "onAudioEffectFinished",
+            
+            "onStreamPublished",
+            
+            "onStreamUnpublished",
+            
+            "onTranscodingUpdated",
+            
+            "onStreamInjectedStatus",
+            
+            "onStreamMessage",
+            
+            "onStreamMessageError",
+            
+            "onMediaEngineLoadSuccess",
+            
+            "onMediaEngineStartCallSuccess",
+        ];
+        for (let event of events) {
+            const functor = (eventScheduler as any)[event];
+            if (functor) {
+                this.listeners.push(
+                    AgoraEventEmitter.addListener(event, msg => {
+                        functor(msg);
+                    })
+                );
+            }
+        }
+    }
+
+    static removeEmitter() {
+        if (this.listeners && this.listeners.length > 0) {
+            for (let listener of this.listeners) {
+                listener.remove();
+            }
+        }
+        this.listeners = [];
+    }
+
+    static enableLastmileTest() {
+        Agora.enableLastmileTest();
+    }
+
+    static disableLastmileTest() {
+        Agora.disableLastmileTest();
+    }
+
+    static leaveChannel() {
+        return Agora.leaveChannel();
+    }
+
+    static destroy() {
+        Agora.destroy();
+    }
+    
+    static setupLocalVideo(options: VideoOption) {
+        Agora.setupLocalVideo(options);
+    }
+
+    static setupRemoteVideo(options: VideoOption) {
+        Agora.setupRemoteVideo(options);
+    }
+
+    static startPreview() {
+        Agora.startPreview();
+    }
+
+    static stopPreview() {
+        Agora.stopPreview();
+    }
+
+    static configPublisher(options: PublisherConfig) {
+        Agora.configPublisher(options);
+    }
+
+    static setLiveTranscoding(options: LiveTranscoding) {
+        Agora.setLiveTranscoding(options);
+    }
+
+    static setLocalRenderMode(mode: number) {
+        Agora.setLocalRenderMode(mode);
+    }
+
+    static setRemoteRenderMode(mode: number) {
+        Agora.setRemoteRenderMode(mode);
+    }
+
+    static enableAudioVolumeIndication(interval: number, smooth: number) {
+        Agora.enableAudioVolumeIndication(interval, smooth);
+    }
+
+    static switchCamera() {
+        Agora.switchCamera();
+    }
+
+    static enableVideo() {
+        Agora.enableVideo();
+    }
+
+    static disableVideo() {
+        Agora.disableVideo();
+    }
+
+    static setEnableSpeakerphone(status: boolean) {
+        Agora.setEnableSpeakerphone(status);
+    }
+
+    static muteLocalAudioStream(status: boolean) {
+        Agora.muteLocalAudioStream(status);
+    }
+
+    static muteRemoteAudioStream(uid: number, status: boolean) {
+        Agora.muteRemoteAudioStream(uid, status);
+    }
+
+    static muteAllRemoteAudioStreams(status: boolean) {
+        Agora.muteAllRemoteAudioStreams(status);
+    }
+
+    static setCameraTorchOn(status: boolean) {
+        return Agora.setCameraTorchOn(status);
+    }
+
+    static setCameraAutoFocusFaceModeEnabled(status: boolean) {
+        Agora.setCameraAutoFocusFaceModeEnabled(status);
+    }
+
+    static setDefaultAudioRouteToSpeakerphone(status: boolean) {
+        Agora.setDefaultAudioRouteToSpeakerphone(status);
+    }
+
+    static muteLocalVideoStream(status: boolean) {
+        Agora.muteLocalVideoStream(status);
+    }
+
+    static enableLocalVideo(status: boolean) {
+        Agora.enableLocalVideo(status);
+    }
+
+    static muteAllRemoteVideoStreams(status: boolean) {
+        Agora.muteAllRemoteVideoStreams(status);
+    }
+
+    static muteRemoteVideoStream(uid: number, status: boolean) {
+        Agora.muteRemoteVideoStream(uid, status);
+    }
+
+    static createDataStream(reliable: boolean, ordered: boolean, callback: Callback<void>) {
+        Agora.createDataStream(reliable, ordered, callback);
+    }
+
+    static sendStreamMessage(streamId: number, data: any, callback: Callback<void>) {
+        Agora.sendStreamMessage(streamId, data, callback);
+    }
+
+    static getSdkVersion(callback: Callback<void>) {
+        Agora.getSdkVersion().then(callback);
+    }
+};

src/index.ts

@@ -0,0 +1,2 @@
+export {default as AgoraView} from './AgoraView.native';
+export {default as RtcEngine} from './RtcEngine.native';

src/types.d.ts

@@ -0,0 +1,289 @@
+import { View, ViewProps } from 'react-native';
+
+declare module "IAgora";
+
+export interface VideoEncoderConfig {
+  width: number,
+  height: number,
+  bitrate: number,
+  frameRate: number,
+  orientationMode: number,
+}
+
+export interface Option {
+  appid: String,
+  videoProfile: number
+  channelProfile: number,
+  videoEncoderConfig: VideoEncoderConfig,
+  clientRole: number,
+  audioProfile: number,
+  audioScenario: number
+}
+
+export interface PublisherConfig {
+  width: number,
+  height: number,
+  framerate: number,
+  bitrate: number,
+  defaultLayout: number,
+  lifeCycle: number,
+  pubishUrl: string,
+  rawStreamUrl: string,
+  extraInfo: String,
+  owner: boolean
+}
+
+export interface BackgroundImage {
+  url: string,
+  x: number,
+  y: number,
+  width: number,
+  height: number
+}
+
+export interface Rect {
+  x: number,
+  y: number,
+  width: number,
+  height: number
+}
+
+export interface Size {
+  width: number,
+  height: number
+}
+
+export interface TranscodingUser {
+  uid: number,
+  zOrder: number,
+  rect: Rect,
+  alpha: number,
+  audioChannel: number
+}
+
+export interface Color {
+  red: number,
+  green: number,
+  blue: number,
+  alpha: number
+}
+
+export interface LiveTranscoding {
+  size: Size,
+  videoBitrate: number,
+  videoFramerate: number,
+  lowLatency: boolean,
+  videoGop: number,
+  videoCodecProfile: number,
+  transcodingUsers: Array<TranscodingUser>,
+  transcodingExtraInfo: string,
+  watermark: BackgroundImage,
+  backgroundImage: BackgroundImage,
+  backgroundColor: Color,
+  audioSampleRate: number,
+  audioBitrate: number,
+  audioChannels: number,
+}
+
+export interface VideoOption {
+  uid: Number,
+  renderMode: number,
+  reactTag: number
+}
+
+export interface EventScheduler {
+  onWarning: Function,
+ 
+  onError: Function,
+   
+  onJoinChannelSuccess: Function,
+   
+  onRejoinChannelSuccess: Function,
+   
+  onLeaveChannel: Function,
+   
+  onClientRoleChanged: Function,
+   
+  onUserJoined: Function,
+   
+  onUserOffline: Function,
+   
+  onConnectionStateChanged: Function,
+   
+  onConnectionInterrupted?: Function,
+   
+  onConnectionLost: Function,
+   
+  onConnectionBanned: Function,
+   
+  onApiCallExecuted: Function,
+   
+  onTokenPrivilegeWillExpire: Function,
+   
+  onRequestToken: Function,
+   
+  onMicrophoneEnabled: Function,
+   
+  onAudioVolumeIndication: Function,
+   
+  onActiveSpeaker: Function,
+   
+  onFirstLocalAudioFrame: Function,
+   
+  onFirstRemoteAudioFrame: Function,
+   
+  onVideoStopped: Function,
+   
+  onFirstLocalVideoFrame: Function,
+   
+  onFirstRemoteVideoDecoded: Function,
+   
+  onFirstRemoteVideoFrame: Function,
+   
+  onUserMuteAudio: Function,
+   
+  onUserMuteVideo: Function,
+   
+  onUserEnableVideo: Function,
+   
+  onUserEnableLocalVideo: Function,
+   
+  onVideoSizeChanged: Function,
+   
+  onRemoteVideoStateChanged: Function,
+   
+  onLocalPublishFallbackToAudioOnly: Function,
+   
+  onRemoteSubscribeFallbackToAudioOnly: Function,
+   
+  onAudioRouteChanged: Function,
+   
+  onCameraReady: Function,
+   
+  onCameraFocusAreaChanged: Function,
+   
+  onCameraExposureAreaChanged: Function,
+   
+  onAudioQuality: Function,
+   
+  onRtcStats: Function,
+   
+  onLastmileQuality: Function,
+   
+  onNetworkQuality: Function,
+   
+  onLocalVideoStats: Function,
+   
+  onRemoteVideoStats: Function,
+   
+  onRemoteAudioStats: Function,
+   
+  onLocalVideoStat: Function,
+   
+  onRemoteVideoStat: Function,
+   
+  onRemoteAudioTransportStats: Function,
+   
+  onRemoteVideoTransportStats: Function,
+   
+  onAudioMixingFinished: Function,
+   
+  onAudioEffectFinished: Function,
+   
+  onStreamPublished: Function,
+   
+  onStreamUnpublished: Function,
+   
+  onTranscodingUpdated: Function,
+   
+  onStreamInjectedStatus: Function,
+   
+  onStreamMessage: Function,
+   
+  onStreamMessageError: Function,
+   
+  onMediaEngineLoadSuccess: Function,
+   
+  onMediaEngineStartCallSuccess: Function,
+  // onWarning: Function,
+  // onError: Function,
+  // onJoinChannelSuccess: Function,
+  // onRejoinChannelSuccess: Function,
+  // onLeaveChannel: Function,
+  // onApiCallExecute: Function,
+  // onClientRoleChanged: Function,
+  // onUserJoined: Function,
+  // onUserOffline: Function,
+  // onConnectionStateChanged: Function,
+  // onConnectionInterrupted: Function,
+  // onTokenPrivilegeWillExpire: Function,
+  // onRequestToken: Function,
+  
+  // DidMicrophoneEnabled: Function,
+  // ReportAudioVolumeIndicationOfSpeakers: Function,
+  // ActiveSpeaker: Function,
+  // FirstLocalAudioFrame: Function,
+  // FirstRemoteAudioFrameOfUid: Function,
+  // VideoDidStop: Function,
+  // FirstLocalVideoFrameWithSize: Function,
+  // FirstRemoteVideoDecodedOfUid: Function,
+  // FirstRemoteVideoFrameOfUid: Function,
+  // DidAudioMuted: Function,
+  // DidVideoMuted: Function,
+  // DidVideoEnabled: Function,
+  // DidLocalVideoEnabled: Function,
+  // VideoSizeChangedOfUid: Function,
+  // RemoteVideoStateChangedOfUid: Function,
+  // DidLocalPublishFallbackToAudioOnly: Function,
+  // DidRemoteSubscribeFallbackToAudioOnly: Function,
+  
+  // DeviceTypeStateChanged: Function,
+  // DidAudioRouteChanged: Function,
+  // CameraDidReady: Function,
+  // CameraFocusDidChangedToRect: Function,
+  // CameraExposureDidChangedToRect: Function,
+  
+  // ReportRtcStats: Function,
+  // LastmileQuality: Function,
+  // NetworkQuality: Function,
+  // LocalVideoStats: Function,
+  // RemoteVideoStats: Function,
+  // RemoteAudioStats: Function,
+  // AudioTransportStatsOfUid: Function,
+  // VideoTransportStatsOfUid: Function,
+  
+  // LocalAudioMixingDidFinish: Function,
+  // RemoteAudioMixingDidStart: Function,
+  // RemoteAudioMixingDidFinish: Function,
+  // DidAudioEffectFinish: Function,
+  
+  // StreamPublished: Function,
+  // StreamUnpublish: Function,
+  // TranscodingUpdated: Function,
+  
+  // StreamInjectedStatus: Function,
+  
+  // ReceiveStreamMessage: Function,
+  // DidOccurStreamMessageError: Function,
+  
+  // MediaEngineDidLoaded: Function,
+  // MediaEngineDidStartCall: Function,
+  
+  // ConnectionDidInterrupted: Function,
+  // ConnectionDidBanned: Function,
+  // AudioQualityOfUi: Function
+}
+
+export type Callback<T> = (err: any, data: any) => T;
+
+export type Nullable<T> = T | null | undefined;
+
+export type String = Nullable<string>;
+export type Number = Nullable<number> | 0;
+
+export interface AgoraViewProps extends ViewProps {
+  showLocalVideo: boolean,
+  remoteUid: Number,
+  zOrderMediaOverlay: boolean,
+  [key:string]: any;
+}

tsconfig.json

@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "types": [
+      "react",
+      "react-native"
+    ],
+    "target": "es2015",
+    "jsx": "react",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "importHelpers": true,
+    "outDir": "./lib",
+    "module": "commonjs",
+    "strict": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "lib": ["es2015"]
+  },
+  "compileOnSave": true,
+  "include": [
+    "src"
+  ]
+}