Browse Source

移除自动新建数据流通道的支持,以便使用者按需自主创建

Riant 6 years ago
parent
commit
ea9b02e923

+ 1
- 3
android/src/main/java/com/syan/agora/AgoraModule.java View File

21
 import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
21
 import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
22
 
22
 
23
 public class AgoraModule extends ReactContextBaseJavaModule {
23
 public class AgoraModule extends ReactContextBaseJavaModule {
24
-    private int defaultStreamId = -1;
25
 
24
 
26
     public AgoraModule(ReactApplicationContext context) {
25
     public AgoraModule(ReactApplicationContext context) {
27
 
26
 
206
     @ReactMethod
205
     @ReactMethod
207
     public void init(ReadableMap options) {
206
     public void init(ReadableMap options) {
208
         AgoraManager.getInstance().init(getReactApplicationContext(), mRtcEventHandler, options);
207
         AgoraManager.getInstance().init(getReactApplicationContext(), mRtcEventHandler, options);
209
-        this.defaultStreamId = AgoraManager.getInstance().mRtcEngine.createDataStream(false, false);
210
     }
208
     }
211
 
209
 
212
     //进入房间
210
     //进入房间
375
     // 发送数据
373
     // 发送数据
376
     @ReactMethod
374
     @ReactMethod
377
     public void sendStreamMessage(int streamId, String message, Callback onError) {
375
     public void sendStreamMessage(int streamId, String message, Callback onError) {
378
-        onError.invoke(AgoraManager.getInstance().mRtcEngine.sendStreamMessage(streamId > 0 ? streamId : this.defaultStreamId, message.getBytes()));
376
+        onError.invoke(AgoraManager.getInstance().mRtcEngine.sendStreamMessage(streamId, message.getBytes()));
379
     }
377
     }
380
 
378
 
381
     //销毁引擎实例
379
     //销毁引擎实例

+ 1
- 6
ios/RCTAgora/RCTAgora.m View File

34
     return @{};
34
     return @{};
35
 }
35
 }
36
 
36
 
37
-NSInteger defaultDataStreamId = -1;
38
-
39
 /**
37
 /**
40
  *  初始化AgoraKit
38
  *  初始化AgoraKit
41
  *
39
  *
64
     [self.rtcEngine setVideoProfile:[options[@"videoProfile"] integerValue]swapWidthAndHeight:[options[@"swapWidthAndHeight"]boolValue]];
62
     [self.rtcEngine setVideoProfile:[options[@"videoProfile"] integerValue]swapWidthAndHeight:[options[@"swapWidthAndHeight"]boolValue]];
65
     [self.rtcEngine setClientRole:[options[@"clientRole"] integerValue] withKey:nil];
63
     [self.rtcEngine setClientRole:[options[@"clientRole"] integerValue] withKey:nil];
66
 
64
 
67
-    // 创建默认数据通道
68
-    [self.rtcEngine createDataStream:&dataChannelId reliable:0 ordered:0];
69
-
70
     //Agora Native SDK 与 Agora Web SDK 间的互通
65
     //Agora Native SDK 与 Agora Web SDK 间的互通
71
     [self.rtcEngine enableWebSdkInteroperability:YES];
66
     [self.rtcEngine enableWebSdkInteroperability:YES];
72
 
67
 
255
 发送数据流
250
 发送数据流
256
 */
251
 */
257
 RCT_EXPORT_METHOD(sendStreamMessage:(NSInteger)streamId data:(NSData*)data callback:(RCTResponseSenderBlock)callback){
252
 RCT_EXPORT_METHOD(sendStreamMessage:(NSInteger)streamId data:(NSData*)data callback:(RCTResponseSenderBlock)callback){
258
-  int err = [self.rtcEngine sendStreamMessage:(streamId > 0 ? streamId : defaultDataStreamId) data:data];
253
+  int err = [self.rtcEngine sendStreamMessage:(streamId) data:data];
259
   callback(@[[NSNumber numberWithInteger:err]]);
254
   callback(@[[NSNumber numberWithInteger:err]]);
260
 }
255
 }
261
 
256