fix: JoinChannelSuccess RejoinChannelSuccess type in `RtcChannelE…

…vents`
AgoraIO-Extensions · Oct 23, 2020 · 25cf253 · 25cf253
1 parent 6f74266
commit 25cf253
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/example/src/examples/advanced/MultiChannel.tsx b/example/src/examples/advanced/MultiChannel.tsx
@@ -70,7 +70,7 @@ export default class MultiChannel extends Component<{}, State, any> {
     }
 
     this._channel0 = await RtcChannel.create(channelId0);
-    this._addListener(this._channel0, channelId0);
+    this._addListener(this._channel0);
 
     await this._channel0.setClientRole(ClientRole.Broadcaster);
     await this._channel0.joinChannel(
@@ -90,7 +90,7 @@ export default class MultiChannel extends Component<{}, State, any> {
     }
 
     this._channel1 = await RtcChannel.create(channelId1);
-    this._addListener(this._channel1, channelId1);
+    this._addListener(this._channel1);
 
     await this._channel1.setClientRole(ClientRole.Broadcaster);
     await this._channel1.joinChannel(
@@ -101,24 +101,25 @@ export default class MultiChannel extends Component<{}, State, any> {
     );
   };
 
-  _addListener = (channel: RtcChannel, channelId: string) => {
-    channel.addListener('JoinChannelSuccess', (uid, elapsed) => {
-      console.info('JoinChannelSuccess', channelId, uid, elapsed);
+  _addListener = (rtcChannel: RtcChannel) => {
+    const { channelId } = rtcChannel;
+    rtcChannel.addListener('JoinChannelSuccess', (channel, uid, elapsed) => {
+      console.info('JoinChannelSuccess', channel, uid, elapsed);
       if (channelId === channelId0) {
         this.setState({ isJoined0: true });
       } else if (channelId === channelId1) {
         this.setState({ isJoined1: true });
       }
     });
-    channel.addListener('UserJoined', (uid, elapsed) => {
+    rtcChannel.addListener('UserJoined', (uid, elapsed) => {
       console.info('UserJoined', channelId, uid, elapsed);
       if (channelId === channelId0) {
         this.setState({ remoteUid0: uid });
       } else if (channelId === channelId1) {
         this.setState({ remoteUid1: uid });
       }
     });
-    channel.addListener('UserOffline', (uid, reason) => {
+    rtcChannel.addListener('UserOffline', (uid, reason) => {
       console.info('UserOffline', channelId, uid, reason);
       if (channelId === channelId0) {
         if (uid === this.state.remoteUid0) {
@@ -130,7 +131,7 @@ export default class MultiChannel extends Component<{}, State, any> {
         }
       }
     });
-    channel.addListener('LeaveChannel', (stats) => {
+    rtcChannel.addListener('LeaveChannel', (stats) => {
       console.info('LeaveChannel', channelId, stats);
       if (channelId === channelId0) {
         this.setState({ isJoined0: false, remoteUid0: undefined });

diff --git a/src/common/RtcEvents.ts b/src/common/RtcEvents.ts
@@ -1409,7 +1409,7 @@ export interface RtcChannelEvents {
    *
    * @event JoinChannelSuccess
    */
-  JoinChannelSuccess: UidWithElapsedCallback;
+  JoinChannelSuccess: UidWithElapsedAndChannelCallback;
 
   /**
    * Occurs when a user rejoins the channel after being disconnected due to network problems.
@@ -1419,7 +1419,7 @@ export interface RtcChannelEvents {
    *
    * @event RejoinChannelSuccess
    */
-  RejoinChannelSuccess: UidWithElapsedCallback;
+  RejoinChannelSuccess: UidWithElapsedAndChannelCallback;
 
   /**
    * Occurs when a user leaves the channel.