iOS完善

RTCEngine.js

@@ -0,0 +1,28 @@
+import {
+    NativeModules,
+    findNodeHandle,
+    NativeAppEventEmitter
+} from 'react-native';
+
+const { Agora } = NativeModules
+
+export default {
+    ...Agora,
+    init(options = {}) {
+        this.listener && this.listener.remove();
+        Agora.init(options);
+    },
+    joinChannel(channelName = '001'){
+        Agora.joinChannel(channelName)
+    },
+    eventEmitter(fnConf) {
+        //there are no `removeListener` for NativeAppEventEmitter & DeviceEventEmitter
+        this.listener && this.listener.remove();
+        this.listener = NativeAppEventEmitter.addListener('agoraEvent', event => {
+            fnConf[event['type']] && fnConf[event['type']](event);
+        });
+    },
+    removeEmitter() {
+        this.listener && this.listener.remove();
+    }
+};

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

@@ -128,15 +128,30 @@ public class AgoraModule extends ReactContextBaseJavaModule {
          */
         @Override
         public void onLeaveChannel(RtcStats stats) {
-
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    WritableMap map = Arguments.createMap();
+                    map.putString("type", "onLeaveChannel");
+                    commonEvent(map);
+                }
+            });
         }
 
         /**
          * 用户uid离线时的回调
          */
         @Override
-        public void onUserOffline(int uid, int reason) {
-
+        public void onUserOffline(final int uid, int reason) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    WritableMap map = Arguments.createMap();
+                    map.putString("type", "onUserOffline");
+                    map.putInt("uid", uid);
+                    commonEvent(map);
+                }
+            });
         }
     };
 

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

@@ -123,6 +123,7 @@ enum WARN_CODE_TYPE
     WARN_ADM_RECORD_AUDIO_SILENCE = 1019,
     WARN_ADM_PLAYOUT_MALFUNCTION = 1020,
     WARN_ADM_RECORD_MALFUNCTION = 1021,
+    WARN_ADM_RECORD_AUDIO_LOWLEVEL = 1031,
     WARN_APM_HOWLING = 1051,
 
     // sdk: 100~1000
@@ -213,7 +214,7 @@ enum LOG_FILTER_TYPE
 
 enum MAX_DEVICE_ID_LENGTH_TYPE
 {
-    MAX_DEVICE_ID_LENGTH = 128
+    MAX_DEVICE_ID_LENGTH = 512
 };
 
 enum QUALITY_REPORT_FORMAT_TYPE
@@ -237,7 +238,7 @@ enum MEDIA_ENGINE_EVENT_CODE_TYPE
     MEDIA_ENGINE_ROLE_COMM_PEER = 23,
     MEDIA_ENGINE_ROLE_GAME_PEER = 24,
     // iOS adm sample rate changed
-    MEDIA_ENGINE_AUDIO_ADM_SAMPLE_RATE_CHANGE = 110
+    MEDIA_ENGINE_AUDIO_ADM_REQUIRE_RESTART = 110
 };
 
 enum MEDIA_DEVICE_STATE_TYPE
@@ -434,6 +435,41 @@ struct VideoCompositingLayout
     {}
 };
 
+#if defined(_WIN32)
+
+enum RTMP_STREAM_LIFE_CYCLE_TYPE
+{
+	RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL = 1,
+	RTMP_STREAM_LIFE_CYCLE_BIND2OWNER = 2,
+};
+
+struct PublisherConfiguration {
+	int width;
+	int height;
+	int framerate;
+	int bitrate;
+	int defaultLayout;
+	int lifecycle;
+	bool owner;
+	const char* publishUrl;
+	const char* rawStreamUrl;
+	const char* extraInfo;
+
+	PublisherConfiguration()
+		: width(640)
+		, height(360)
+		, framerate(15)
+		, bitrate(500)
+		, defaultLayout(1)
+		, lifecycle(RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL)
+		, owner(true)
+		, publishUrl(NULL)
+		, rawStreamUrl(NULL)
+		, extraInfo(NULL)
+	{}
+
+};
+#endif
 #if !defined(__ANDROID__)
 struct VideoCanvas
 {
@@ -570,7 +606,7 @@ public:
     * @param [in] uid
     *        the uid of the peer
     * @param [in] quality
-    *        the quality of the user 0~5 the higher the better
+    *        the quality of the user, see QUALITY_TYPE for value definition
     * @param [in] delay
     *        the average time of the audio packages delayed
     * @param [in] lost
@@ -900,6 +936,28 @@ public:
     */
     virtual void onRequestChannelKey() {
     }
+
+    /**
+    * when the first local audio frame generated, the function will be called
+    * @param [in] elapsed
+    *        the time elapsed from remote user called joinChannel in ms
+    */
+    virtual void onFirstLocalAudioFrame(int elapsed) {
+        (void)elapsed;
+    }
+
+    /**
+    * when the first remote audio frame arrived, the function will be called
+    * @param [in] uid
+    *        the UID of the remote user
+    * @param [in] elapsed
+    *        the time elapsed from remote user called joinChannel in ms
+    */
+    virtual void onFirstRemoteAudioFrame(uid_t uid, int elapsed) {
+        (void)uid;
+        (void)elapsed;
+    }
+
 };
 
 /**
@@ -1339,6 +1397,10 @@ public:
 
     virtual int setVideoCompositingLayout(const VideoCompositingLayout& sei) = 0;
     virtual int clearVideoCompositingLayout() = 0;
+
+#if defined(_WIN32)
+	virtual int configPublisher(const PublisherConfiguration& config) = 0;
+#endif
 };
 
 
@@ -1616,25 +1678,6 @@ public:
         return setObject("rtc.video.set_remote_video_stream", "{\"uid\":%u,\"stream\":%d}", uid, streamType);
     }
 
-
-    /**
-     * play the video stream from network
-     * @param [in] uri the link of video source
-     * @return return 0 if success or an error code
-     */
-    int startPlayingStream(const char* uri) {
-        return m_parameter ? m_parameter->setString("rtc.api.video.start_play_stream", uri) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     *  stop playing the video stream from network
-     *
-     * @return return 0 if success or an error code
-     */
-    int stopPlayingStream() {
-        return m_parameter ? m_parameter->setBool("rtc.api.video.stop_play_stream", true) : -ERR_NOT_INITIALIZED;
-    }
-
     /**
     * set play sound volume
     * @param [in] volume
@@ -1752,6 +1795,9 @@ public:
             r = pos;
         return r;
     }
+    int setAudioMixingPosition(int pos /*in ms*/) {
+        return m_parameter ? m_parameter->setInt("che.audio.mixing.file.position", pos) : -ERR_NOT_INITIALIZED;
+    }
 #if defined(__APPLE__)
 	/**
 	* start screen capture

index.js

@@ -1,38 +1,6 @@
-import {
-    NativeModules,
-    findNodeHandle,
-    NativeAppEventEmitter
-} from 'react-native';
 
-const { Agora } = NativeModules
+import _AgoraView from './AgoraView'
+import _RTCEngine from './RTCEngine'
 
-export default {
-
-    init(options = {}) {
-        this.listener && this.listener.remove();
-        Agora.init(options);
-    },
-    joinChannel(channelName = '001'){
-        Agora.joinChannel(channelName)
-    },
-    eventEmitter(fnConf) {
-        // const {
-        //     onFirstRemoteVideoDecoded = () => {},
-        //     onJoinChannelSuccess = () => {},
-        //     onUserJoined = () => {},
-        //     onError = () => {},
-        //     onWarning = () => {}
-        // } = options;
-
-        // let fnConf = {...options};
-        //there are no `removeListener` for NativeAppEventEmitter & DeviceEventEmitter
-        this.listener && this.listener.remove();
-        this.listener = NativeAppEventEmitter.addListener('agoraEvent', event => {
-            fnConf[event['type']] && fnConf[event['type']](event);
-        });
-    },
-    removeEmitter() {
-        this.listener && this.listener.remove();
-    }
-
-};
+export const AgoraView = _AgoraView;
+export const RTCEngine = _RTCEngine;

ios/RCTAgora/AgoraConst.h

@@ -0,0 +1,17 @@
+//
+//  MyAgoraRtcEngineKit.h
+//  RCTAgora
+//
+//  Created by 邓博 on 2017/6/30.
+//  Copyright © 2017年 Syan. All rights reserved.
+//
+
+#import <AgoraRtcEngineKit/AgoraRtcEngineKit.h>
+
+@interface AgoraConst : NSObject
+
+@property (nonatomic, copy) NSString *appid;
+
++ (instancetype)share;
+
+@end

ios/RCTAgora/AgoraConst.m

@@ -0,0 +1,36 @@
+//
+//  MyAgoraRtcEngineKit.m
+//  RCTAgora
+//
+//  Created by 邓博 on 2017/6/30.
+//  Copyright © 2017年 Syan. All rights reserved.
+//
+
+#import "AgoraConst.h"
+
+@implementation AgoraConst
+
+static AgoraConst *_person;
++ (instancetype)allocWithZone:(struct _NSZone *)zone{
+    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;
+}
+
+- (id)copyWithZone:(NSZone *)zone {
+    return _person;
+}
+
+
+
+@end

ios/RCTAgora/RCTAgora.m

@@ -11,6 +11,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTView.h>
+#import "AgoraConst.h"
 
 @interface RCTAgora ()
 @property (strong, nonatomic) AgoraRtcEngineKit *rtcEngine;
@@ -45,7 +46,9 @@ RCT_EXPORT_MODULE();
  *  @param reactTag        绑定view的tag
  *  @return 0 when executed successfully. return negative value if failed.
  */
-RCT_EXPORT_METHOD(loadAgoraKit:(NSDictionary *)options callback:(RCTResponseSenderBlock)callback) {
+RCT_EXPORT_METHOD(init:(NSDictionary *)options) {
+    
+    [AgoraConst share].appid = options[@"appid"];
     
     self.rtcEngine = [AgoraRtcEngineKit sharedEngineWithAppId:options[@"appid"] delegate:self];
     
@@ -60,35 +63,23 @@ RCT_EXPORT_METHOD(loadAgoraKit:(NSDictionary *)options callback:(RCTResponseSend
     //开启预览
     [self.rtcEngine startPreview];
     
-    [self.rtcEngine joinChannelByKey:nil channelName:options[@"channelName"] info:options[@"info"] uid:0 joinSuccess:^(NSString *channel, NSUInteger uid, NSInteger elapsed) {
-        
-        NSMutableDictionary *params = [NSMutableDictionary dictionary];
-        
-        params[@"channel"] = channel;
-        params[@"uid"] = [NSNumber numberWithInteger:uid];
-        params[@"elapsed"] = [NSNumber numberWithInteger:elapsed];
-        callback(@[params]);
-        
-        //绑定本地视图
-        AgoraRtcVideoCanvas *canvas = [[AgoraRtcVideoCanvas alloc] init];
-        canvas.uid = uid;
-        canvas.view = [self.bridge.uiManager viewForReactTag:options[@"reactTag"]];
-        canvas.renderMode = AgoraRtc_Render_Hidden;
-        [self.rtcEngine setupLocalVideo:canvas];
-        
-    }];
-    
     //Agora Native SDK 与 Agora Web SDK 间的互通
     [self.rtcEngine enableWebSdkInteroperability:YES];
     
 }
 
+//加入房间
+RCT_EXPORT_METHOD(joinChannel:(NSString *)channelName) {
+    [self.rtcEngine joinChannelByKey:nil channelName:channelName info:nil uid:0 joinSuccess:NULL];
+}
 
 //离开频道
 RCT_EXPORT_METHOD(leaveChannel){
-    [AgoraRtcEngineKit destroy];
     [self.rtcEngine leaveChannel:^(AgoraRtcStats *stat) {
+        NSMutableDictionary *params = @{}.mutableCopy;
+        params[@"type"] = @"onLeaveChannel";
         
+        [self sendEvent:params];
     }];
 }
 
@@ -175,20 +166,48 @@ RCT_EXPORT_METHOD(stopRecordingService:(NSString*)recordingKey){
     [self.rtcEngine stopRecordingService:recordingKey];
 }
 
+//获取版本号
+RCT_EXPORT_METHOD(getSdkVersion:(RCTResponseSenderBlock)callback){
+    callback(@[[AgoraRtcEngineKit getSdkVersion]]);
+}
+
+
 /*
  该回调方法表示SDK运行时出现了（网络或媒体相关的）错误。通常情况下，SDK上报的错误意味着SDK无法自动恢复，需要应用程序干预或提示用户。
  比如启动通话失败时，SDK会上报AgoraRtc_Error_StartCall(1002)错误。
  应用程序可以提示用户启动通话失败，并调用leaveChannel退出频道。
  */
 - (void)rtcEngine:(AgoraRtcEngineKit *)engine didOccurError:(AgoraRtcErrorCode)errorCode{
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"type"] = @"onError";
+    params[@"err"] = [NSNumber numberWithInteger:errorCode];;
+    
+    [self sendEvent:params];
+}
+
+/*
+ 警告
+ */
+- (void)rtcEngine:(AgoraRtcEngineKit *)engine didOccurWarning:(AgoraRtcWarningCode)warningCode {
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"type"] = @"onWarning";
+    params[@"err"] = [NSNumber numberWithInteger:warningCode];;
     
+    [self sendEvent:params];
 }
 
+
 /*
  客户端成功加入了指定的频道
  */
 - (void)rtcEngine:(AgoraRtcEngineKit *)engine didJoinChannel:(NSString*)channel withUid:(NSUInteger)uid elapsed:(NSInteger) elapsed {
+
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"type"] = @"onJoinChannelSuccess";
+    params[@"uid"] = [NSNumber numberWithInteger:uid];
+    params[@"channel"] = channel;
     
+    [self sendEvent:params];
 }
 
 /*
@@ -196,13 +215,11 @@ RCT_EXPORT_METHOD(stopRecordingService:(NSString*)recordingKey){
  */
 - (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteVideoDecodedOfUid:(NSUInteger)uid size:(CGSize)size elapsed:(NSInteger)elapsed {
     
-    NSMutableDictionary *params = [NSMutableDictionary dictionary];
-    
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"type"] = @"onFirstRemoteVideoDecoded";
     params[@"uid"] = [NSNumber numberWithInteger:uid];
-    params[@"size"] = @{@"width": [NSString stringWithFormat:@"%f", size.width], @"height": [NSString stringWithFormat:@"%f", size.height]};
-    params[@"elapsed"] = [NSNumber numberWithInteger:elapsed];
     
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"firstRemoteVideoDecodedOfUid" body:params];
+    [self sendEvent:params];
 
 }
 
@@ -210,34 +227,38 @@ RCT_EXPORT_METHOD(stopRecordingService:(NSString*)recordingKey){
  用户加入回调
  */
 - (void)rtcEngine:(AgoraRtcEngineKit *)engine didJoinedOfUid:(NSUInteger)uid elapsed:(NSInteger)elapsed {
- 
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"didJoinedOfUid" body:[NSNumber numberWithInteger:uid]];
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"type"] = @"onUserJoined";
+    params[@"uid"] = [NSNumber numberWithInteger:uid];
+    
+    [self sendEvent:params];
 }
 
 /*
  用户离线回调
  */
 - (void)rtcEngine:(AgoraRtcEngineKit *)engine didOfflineOfUid:(NSUInteger)uid reason:(AgoraRtcUserOfflineReason)reason {
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"type"] = @"onUserOffline";
+    params[@"uid"] = [NSNumber numberWithInteger:uid];
     
+    [self sendEvent:params];
 }
 
-/*
- 报告本地用户的网络质量，该回调方法每两秒触发一次
- */
-- (void)rtcEngine:(AgoraRtcEngineKit *)engine lastmileQuality:(AgoraRtcQuality)quality {
-    
+- (void)sendEvent:(NSDictionary *)params {
+    [_bridge.eventDispatcher sendDeviceEventWithName:@"agoraEvent" body:params];
 }
 
 - (dispatch_queue_t)methodQueue {
     return dispatch_get_main_queue();
 }
 
-RCT_EXPORT_METHOD(getViewWithTag:(nonnull NSNumber *)reactTag) {
-    
-    UIView *view = [self.bridge.uiManager viewForReactTag:reactTag];
-    NSLog(@"%@",view);
-    
-}
+//RCT_EXPORT_METHOD(getViewWithTag:(nonnull NSNumber *)reactTag) {
+//    
+//    UIView *view = [self.bridge.uiManager viewForReactTag:reactTag];
+//    NSLog(@"%@",view);
+//    
+//}
 
 @end
 

ios/RCTAgora/RCTAgoraVideoView.h

@@ -0,0 +1,19 @@
+//
+//  RCTAgoraVideoView.h
+//  RCTAgora
+//
+//  Created by 邓博 on 2017/6/30.
+//  Copyright © 2017年 Syan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "AgoraConst.h"
+
+@interface RCTAgoraVideoView : UIView
+
+@property (strong, nonatomic) AgoraRtcEngineKit *rtcEngine;
+
+@property (nonatomic) NSInteger localUid;
+@property (nonatomic) NSInteger remoteUid;
+
+@end

ios/RCTAgora/RCTAgoraVideoView.m

@@ -0,0 +1,42 @@
+//
+//  RCTAgoraVideoView.m
+//  RCTAgora
+//
+//  Created by 邓博 on 2017/6/30.
+//  Copyright © 2017年 Syan. All rights reserved.
+//
+
+#import "RCTAgoraVideoView.h"
+
+@implementation RCTAgoraVideoView
+
+- (instancetype)init{
+    
+    if (self == [super init]) {
+        _rtcEngine =  [AgoraRtcEngineKit sharedEngineWithAppId:[AgoraConst share].appid delegate:nil];
+    }
+    
+    return self;
+}
+
+- (void)setLocalUid:(NSInteger)localUid {
+    if (localUid == 0) {
+        AgoraRtcVideoCanvas *canvas = [[AgoraRtcVideoCanvas alloc] init];
+        canvas.uid = localUid;
+        canvas.view = self;
+        canvas.renderMode = AgoraRtc_Render_Hidden;
+        [_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];
+    }
+}
+
+@end

ios/RCTAgora/RCTAgoraViewManager.h

@@ -0,0 +1,14 @@
+//
+//  AgoraViewManager.h
+//  RCTAgora
+//
+//  Created by 邓博 on 2017/6/30.
+//  Copyright © 2017年 Syan. All rights reserved.
+//
+
+#import "RCTViewManager.h"
+
+
+@interface RCTAgoraViewManager : RCTViewManager
+
+@end

ios/RCTAgora/RCTAgoraViewManager.m

@@ -0,0 +1,25 @@
+//
+//  AgoraViewManager.m
+//  RCTAgora
+//
+//  Created by 邓博 on 2017/6/30.
+//  Copyright © 2017年 Syan. All rights reserved.
+//
+
+#import "RCTAgoraViewManager.h"
+#import "RCTAgoraVideoView.h"
+
+@implementation RCTAgoraViewManager
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_VIEW_PROPERTY(localUid, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(remoteUid, NSInteger)
+
+- (UIView *)view {
+
+    return [RCTAgoraVideoView new];
+}
+
+
+@end

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

@@ -208,6 +208,10 @@ typedef NS_ENUM(NSUInteger, AgoraRtcLogFilter) {
     AgoraRtc_LogFilter_Critical = 0x0008,
 };
 
+typedef NS_ENUM(NSInteger, AgoraRtmpStreamLifeCycle) {
+    RtmpStream_LifeCycle_Bind2Channel = 1,
+    RtmpStream_LifeCycle_Bind2Ownner = 2,
+};
 
 typedef NS_ENUM(NSUInteger, AgoraRtcRenderMode) {
     /**
@@ -317,6 +321,8 @@ __attribute__((visibility("default"))) @interface AgoraRtcStats : NSObject
 @property (assign, nonatomic) NSUInteger txVideoKBitrate;
 @property (assign, nonatomic) NSUInteger rxVideoKBitrate;
 @property (assign, nonatomic) NSUInteger users;
+@property (assign, nonatomic) double cpuAppUsage;
+@property (assign, nonatomic) double cpuTotalUsage;
 @end
 
 __attribute__((visibility("default"))) @interface AgoraRtcLocalVideoStats : NSObject
@@ -358,6 +364,31 @@ __attribute__((visibility("default"))) @interface AgoraRtcVideoCompositingLayout
 @property (copy, nonatomic) NSString* appData;//app defined data
 @end
 
+__attribute__((visibility("default"))) @interface AgoraPublisherConfiguration : NSObject
+@property (assign, nonatomic) BOOL owner;
+@property (assign, nonatomic) NSInteger width;
+@property (assign, nonatomic) NSInteger height;
+@property (assign, nonatomic) NSInteger framerate;
+@property (assign, nonatomic) NSInteger bitrate;
+@property (assign, nonatomic) NSInteger defaultLayout;
+@property (assign, nonatomic) AgoraRtmpStreamLifeCycle lifeCycle;
+@property (copy, nonatomic) NSString* publishUrl;
+@property (copy, nonatomic) NSString* rawStreamUrl;
+@property (copy, nonatomic) NSString* extraInfo;
+-(BOOL) validate;
+-(NSString *) toJsonString;
+@end
+
+__attribute__((visibility("default"))) @interface AgoraPublisherConfigurationBuilder : NSObject
+- (AgoraPublisherConfigurationBuilder *) setOwner:(BOOL)isOwner;
+- (AgoraPublisherConfigurationBuilder *) setWidth:(NSInteger)width height:(NSInteger)height framerate:(NSInteger)framerate bitrate:(NSInteger)bitrate;
+- (AgoraPublisherConfigurationBuilder *) setDefaultLayout:(NSInteger)layoutStyle;
+- (AgoraPublisherConfigurationBuilder *) setLifeCycle:(AgoraRtmpStreamLifeCycle)lifecycle;
+- (AgoraPublisherConfigurationBuilder *) setPublisherUrl:(NSString*)url;
+- (AgoraPublisherConfigurationBuilder *) setRawStreamUrl:(NSString*)url;
+- (AgoraPublisherConfigurationBuilder *) setExtraInfo:(NSString *)info;
+- (AgoraPublisherConfiguration *) build;
+@end
 
 @class AgoraRtcEngineKit;
 @protocol AgoraRtcEngineDelegate <NSObject>
@@ -674,6 +705,24 @@ __attribute__((visibility("default"))) @interface AgoraRtcVideoCompositingLayout
  *  @param engine The engine kit
  */
 - (void)rtcEngineRequestChannelKey:(AgoraRtcEngineKit *)engine;
+
+/**
+ *  Event of the first audio frame is sent.
+ *
+ *  @param engine  The engine kit
+ *  @param elapsed The elapsed time(ms) from the beginning of the session.
+ */
+- (void)rtcEngine:(AgoraRtcEngineKit *)engine firstLocalAudioFrame:(NSInteger)elapsed;
+
+/**
+ *  Event of the first audio frame from remote user is received.
+ *
+ *  @param engine  The engine kit
+ *  @param uid     The remote user id
+ *  @param elapsed The elapsed time(ms) from the beginning of the session.
+ */
+- (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteAudioFrameOfUid:(NSUInteger)uid elapsed:(NSInteger)elapsed;
+
 @end
 
 
@@ -978,7 +1027,7 @@ __attribute__((visibility("default"))) @interface AgoraRtcEngineKit : NSObject
 - (int)adjustAudioMixingVolume:(NSInteger) volume;
 - (int)getAudioMixingDuration;
 - (int)getAudioMixingCurrentPosition;
-
+- (int)setAudioMixingPosition:(NSInteger) pos;
 
 /**
  *  Start screen capture
@@ -1217,15 +1266,6 @@ __attribute__((visibility("default"))) @interface AgoraRtcEngineKit : NSObject
 - (int) setRemoteVideoStream: (NSUInteger) uid
                         type: (AgoraRtcVideoStreamType) streamType;
 
-/**
- * play the video stream from network
- *
- * @param [in] uri the link of video source
- *
- * @return return 0 if success or an error code
- */
-- (int) startPlayingStream:(NSString*)uri __deprecated;
-- (int) stopPlayingStream __deprecated;
 
 - (int) startRecordingService:(NSString*)recordingKey;
 - (int) stopRecordingService:(NSString*)recordingKey;
@@ -1275,6 +1315,8 @@ __attribute__((visibility("default"))) @interface AgoraRtcEngineKit : NSObject
 
 - (int)setVideoQualityParameters:(BOOL)preferFrameRateOverImageQuality;
 
+- (int)configPublisher:(AgoraPublisherConfiguration *)config;
+
 - (int)setVideoCompositingLayout:(AgoraRtcVideoCompositingLayout*)layout;
 
 - (int)clearVideoCompositingLayout;

ios/RCTAgora/libs/AgoraRtcEngineKit.framework/Headers/IAgoraRtcEngine.h

@@ -123,6 +123,7 @@ enum WARN_CODE_TYPE
     WARN_ADM_RECORD_AUDIO_SILENCE = 1019,
     WARN_ADM_PLAYOUT_MALFUNCTION = 1020,
     WARN_ADM_RECORD_MALFUNCTION = 1021,
+    WARN_ADM_RECORD_AUDIO_LOWLEVEL = 1031,
     WARN_APM_HOWLING = 1051,
 
     // sdk: 100~1000
@@ -213,7 +214,7 @@ enum LOG_FILTER_TYPE
 
 enum MAX_DEVICE_ID_LENGTH_TYPE
 {
-    MAX_DEVICE_ID_LENGTH = 128
+    MAX_DEVICE_ID_LENGTH = 512
 };
 
 enum QUALITY_REPORT_FORMAT_TYPE
@@ -237,7 +238,7 @@ enum MEDIA_ENGINE_EVENT_CODE_TYPE
     MEDIA_ENGINE_ROLE_COMM_PEER = 23,
     MEDIA_ENGINE_ROLE_GAME_PEER = 24,
     // iOS adm sample rate changed
-    MEDIA_ENGINE_AUDIO_ADM_SAMPLE_RATE_CHANGE = 110
+    MEDIA_ENGINE_AUDIO_ADM_REQUIRE_RESTART = 110
 };
 
 enum MEDIA_DEVICE_STATE_TYPE
@@ -434,6 +435,41 @@ struct VideoCompositingLayout
     {}
 };
 
+#if defined(_WIN32)
+
+enum RTMP_STREAM_LIFE_CYCLE_TYPE
+{
+	RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL = 1,
+	RTMP_STREAM_LIFE_CYCLE_BIND2OWNER = 2,
+};
+
+struct PublisherConfiguration {
+	int width;
+	int height;
+	int framerate;
+	int bitrate;
+	int defaultLayout;
+	int lifecycle;
+	bool owner;
+	const char* publishUrl;
+	const char* rawStreamUrl;
+	const char* extraInfo;
+
+	PublisherConfiguration()
+		: width(640)
+		, height(360)
+		, framerate(15)
+		, bitrate(500)
+		, defaultLayout(1)
+		, lifecycle(RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL)
+		, owner(true)
+		, publishUrl(NULL)
+		, rawStreamUrl(NULL)
+		, extraInfo(NULL)
+	{}
+
+};
+#endif
 #if !defined(__ANDROID__)
 struct VideoCanvas
 {
@@ -570,7 +606,7 @@ public:
     * @param [in] uid
     *        the uid of the peer
     * @param [in] quality
-    *        the quality of the user 0~5 the higher the better
+    *        the quality of the user, see QUALITY_TYPE for value definition
     * @param [in] delay
     *        the average time of the audio packages delayed
     * @param [in] lost
@@ -900,6 +936,28 @@ public:
     */
     virtual void onRequestChannelKey() {
     }
+
+    /**
+    * when the first local audio frame generated, the function will be called
+    * @param [in] elapsed
+    *        the time elapsed from remote user called joinChannel in ms
+    */
+    virtual void onFirstLocalAudioFrame(int elapsed) {
+        (void)elapsed;
+    }
+
+    /**
+    * when the first remote audio frame arrived, the function will be called
+    * @param [in] uid
+    *        the UID of the remote user
+    * @param [in] elapsed
+    *        the time elapsed from remote user called joinChannel in ms
+    */
+    virtual void onFirstRemoteAudioFrame(uid_t uid, int elapsed) {
+        (void)uid;
+        (void)elapsed;
+    }
+
 };
 
 /**
@@ -1339,6 +1397,10 @@ public:
 
     virtual int setVideoCompositingLayout(const VideoCompositingLayout& sei) = 0;
     virtual int clearVideoCompositingLayout() = 0;
+
+#if defined(_WIN32)
+	virtual int configPublisher(const PublisherConfiguration& config) = 0;
+#endif
 };
 
 
@@ -1616,25 +1678,6 @@ public:
         return setObject("rtc.video.set_remote_video_stream", "{\"uid\":%u,\"stream\":%d}", uid, streamType);
     }
 
-
-    /**
-     * play the video stream from network
-     * @param [in] uri the link of video source
-     * @return return 0 if success or an error code
-     */
-    int startPlayingStream(const char* uri) {
-        return m_parameter ? m_parameter->setString("rtc.api.video.start_play_stream", uri) : -ERR_NOT_INITIALIZED;
-    }
-
-    /**
-     *  stop playing the video stream from network
-     *
-     * @return return 0 if success or an error code
-     */
-    int stopPlayingStream() {
-        return m_parameter ? m_parameter->setBool("rtc.api.video.stop_play_stream", true) : -ERR_NOT_INITIALIZED;
-    }
-
     /**
     * set play sound volume
     * @param [in] volume
@@ -1752,6 +1795,9 @@ public:
             r = pos;
         return r;
     }
+    int setAudioMixingPosition(int pos /*in ms*/) {
+        return m_parameter ? m_parameter->setInt("che.audio.mixing.file.position", pos) : -ERR_NOT_INITIALIZED;
+    }
 #if defined(__APPLE__)
 	/**
 	* start screen capture

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-agora",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "声网Agora",
   "main": "index.js",
   "scripts": {