Skip to content

新增数据流相关 API #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syanbo merged 5 commits into from
Feb 28, 2018
Merged

新增数据流相关 API #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8adf86
添加数据流相关 API
Riant Feb 24, 2018
a32af64
移除创建默认数据流通道的参数配置
Riant Feb 24, 2018
ea9b02e
移除自动新建数据流通道的支持，以便使用者按需自主创建
Riant Feb 27, 2018
8509bc9
为 Android 添加 onStreamMessageError 监听
Riant Feb 28, 2018
fdfe4b2
更新说明文档
Riant Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
移除自动新建数据流通道的支持，以便使用者按需自主创建
  • Loading branch information
@Riant
Riant committed Feb 27, 2018
commit ea9b02e923cc60e77093aebb64258d6f36dfd0bb
4 changes: 1 addition & 3 deletions android/src/main/java/com/syan/agora/AgoraModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;

public class AgoraModule extends ReactContextBaseJavaModule {
private int defaultStreamId = -1;

public AgoraModule(ReactApplicationContext context) {

Expand Down Expand Up @@ -206,7 +205,6 @@ public void run() {
@ReactMethod
public void init(ReadableMap options) {
AgoraManager.getInstance().init(getReactApplicationContext(), mRtcEventHandler, options);
this.defaultStreamId = AgoraManager.getInstance().mRtcEngine.createDataStream(false, false);
}

//进入房间
Expand Down Expand Up @@ -375,7 +373,7 @@ public void createDataStream(boolean reliable, boolean ordered, Callback callbac
// 发送数据
@ReactMethod
public void sendStreamMessage(int streamId, String message, Callback onError) {
onError.invoke(AgoraManager.getInstance().mRtcEngine.sendStreamMessage(streamId > 0 ? streamId : this.defaultStreamId, message.getBytes()));
onError.invoke(AgoraManager.getInstance().mRtcEngine.sendStreamMessage(streamId, message.getBytes()));
}

//销毁引擎实例
Expand Down
7 changes: 1 addition & 6 deletions ios/RCTAgora/RCTAgora.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ - (NSDictionary *)constantsToExport {
return @{};
}

NSInteger defaultDataStreamId = -1;

/**
* 初始化AgoraKit
*
Expand Down Expand Up @@ -64,9 +62,6 @@ - (NSDictionary *)constantsToExport {
[self.rtcEngine setVideoProfile:[options[@"videoProfile"] integerValue]swapWidthAndHeight:[options[@"swapWidthAndHeight"]boolValue]];
[self.rtcEngine setClientRole:[options[@"clientRole"] integerValue] withKey:nil];

// 创建默认数据通道
[self.rtcEngine createDataStream:&dataChannelId reliable:0 ordered:0];

//Agora Native SDK 与 Agora Web SDK 间的互通
[self.rtcEngine enableWebSdkInteroperability:YES];

Expand Down Expand Up @@ -255,7 +250,7 @@ - (NSDictionary *)constantsToExport {
发送数据流
*/
RCT_EXPORT_METHOD(sendStreamMessage:(NSInteger)streamId data:(NSData*)data callback:(RCTResponseSenderBlock)callback){
  int err = [self.rtcEngine sendStreamMessage:(streamId > 0 ? streamId : defaultDataStreamId) data:data];
  int err = [self.rtcEngine sendStreamMessage:(streamId) data:data];
  callback(@[[NSNumber numberWithInteger:err]]);
}

Expand Down