refactor. event & exception

CHANGELOG

@@ -3,7 +3,7 @@
 #### 2.4.1-alpha.2
 - deprecated `sendMessage` & `createDataStream` & `removeAllListeners`
 - refactor event system
-
+- fix `android` enum convert failed.
 
 #### 2.4.1-alpha
 - support 2.4.1-alpha.1 agora video sdk android-2.4.1 / iOS-2.4.1

README.md

@@ -55,74 +55,6 @@ Either way, then link with:
 
 ## [API DOCS](https://syanbo.github.io/react-native-agora/globals.html)
 
-#### Events
-
-```javascript
-RtcEngine.on('eventName', (data) => {
-    console.log(data);
-});
-```
-
-| Name                      | Description  | Platform |
-| ------------------------- | ------------ | ------- |
-| warning                 | warning | all |
-| error                   | error | all |
-| apiCallExecute | capture agora native api call executed| all |
-| joinChannelSuccess      | join channel success | all |
-| reJoinChannelSuccess      | rejoin channel success | all |
-| leaveChannel            | quit channel | all |
-| clientRoleChanged | when changed client role | all |
-| userJoined              | when user joined channel | all |
-| userOffline             | when user left channel | all |
-| connectionStateChanged | when connection state changed | all |
-| connectionLost | when connection lost | all |
-| tokenPrivilegeWillExpire | when token will expire | all |
-| requestToken | when token expired | all |
-| microphoneEnabled | when microphone enabled | all |
-| audioVolumeIndication | notice audio volume | all |
-| activeSpeaker | reports which user is the loudest speaker | all |
-| firstLocalAudioFrame | when the first local audio frame is sent | all |
-| firstRemoteAudioFrame | when the first remote audio frame is sent | all |
-| videoStopped | when video stopped | all |
-| firstLocalVideoFrame | when first local video frame is sent | all |
-| firstRemoteVideoDecoded | when first remote video is decoded | all |
-| firstRemoteVideoFrame | when first remote video frame is rendered | all |
-| userMuteAudio | when a remote user's audio stream is muted/unmuted | all |
-| userMuteVideo | when a remote user's video stream is muted/unmuted | all |
-| userEnableVideo | when a remote user enables/disables the video module | all |
-| userEnableLocalVideo | when a remote user enables/disables the local video capture function | all |
-| videoSizeChanged | when the video size or rotation information of a specified remote user changes | all|
-| remoteVideoStateChanged | when the remote video stream state changes | all |
-| localPublishFallbackToAudioOnly | Occurs when the published video stream falls back to an audio-only stream due to unreliable network conditions or switches back to the video when the network conditions improve. | all |
-| remoteSubscribeFallbackToAudioOnly | Occurs when the remote video stream falls back to an audio-only stream due to unreliable network conditions or switches back to the video after the network conditions improve. | all |
-| audioRouteChanged | when the local audio pkayout route changes | all |
-| cameraReady | when the camera is turned on and ready to capture video | all |
-| cameraFocusAreaChanged | when the camera focus area is changed | all |
-| cameraExposureAreaChanged | The camera exposure area has changed | all |
-| remoteAudioStats | Reports the statistics of the audio stream from each remote user/host. | all |
-| rtcStats | Reports the statistics of the RtcEngine once every two seconds | all |
-| lastmileQuality | Reports the last mile network quality of the local user once every two seconds before the user joins the channel. Last mile refers to the connection between the local device and Agora's edge server. After the application calls the enableLastmileTest method, this callback reports once every two seconds the uplink and downlink last mile network conditions of the local user before the user joins the channel. | all |
-| networkQuality | Reports the last mile network quality of each user in the channel once every two seconds. Last mile refers to the connection between the local device and Agora's edge server. This callback reports once every two seconds the uplink last mile network conditions of each user in the channel. If a channel includes multiple users, then this callback will be triggered as many times. | all |
-| localVideoStats | Reports the statistics of the uploading local video streams. This callback is triggered once every two seconds for each individual user/host. If there are multiple users/hosts in the channel, this callback is triggered multiple times every 2 seconds. | all |
-| remoteVideoStats | Reports the statistics of the video stream from each remote user/host. The SDK triggers this callback once every two seconds for each remote user/host. If a channel includes multiple remote users, the SDK triggers this callback as many times. This callback reports statistics more closely linked to the real-user experience of the video transmission quality than the statistics that the onRemoteVideoTransportStats callback reports | all |
-| audioTransportStatsOfUid | Reports the transport-layer statistics of each remote audio stream. | all |
-| videoTransportStatsOfUid | Reports the transport-layer statistics of each remote video stream. | all |
-| localAudioMixingFinish | Occurs when the audio mixing file playback finishes. | all |
-| remoteAudioMixingStart | Occurs when a remote user starts audio mixing. | ios |
-| remoteAudioMixingFinish | Occurs when a remote user finishes audio mixing. | ios |
-| audioEffectFinish | Occurs when the audio effect file playback finishes. | all |
-| streamPublished | Occurs when a CDN live stream is published. | all |
-| streamUnpublish | Occurs when CDN live streaming stops. This callback notifies the host that the CDN live stream is unpublished. | all |
-| transcodingUpdate | Occurs when the publisher's transcoding settings are updated. | all |
-| streamInjectedStatus | Reports the status of the injected online media stream. | all |
-| receiveStreamMessage | Occurs when the local user receives a remote data stream within five seconds. | all |
-| occurStreamMessageError | Occurs when the local user fails to receive a remote data stream. | all |
-| mediaEngineLoaded | Occurs when the media engine is loaded. | all |
-| mediaEngineStartCall | Occurs when the media engine starts. | all |
-| startEchoTestWithInterval | Occurs when you startEchoTestWithInterval | all |
-| audioMixingStateChanged | Occurs when audio mixing state changed | all |
-| lastmileProbeTestResult | Reports the last-mile network probe result. | all|
-
 ## Resources
 * Complete [API documentation](https://docs.agora.io/en/) at the Developer Center
 * [File bugs about this sample](https://github.com/syanbo/react-native-agora/issues)

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

@@ -22,7 +22,6 @@ public class AgoraConst {
     public final static String AGActiveSpeaker = "activeSpeaker";
     public final static String AGFirstLocalAudioFrame = "firstLocalAudioFrame";
     public final static String AGFirstRemoteAudioFrame = "firstRemoteAudioFrame";
-    public final static String AGVideoStopped = "videoStopped";
     public final static String AGFirstLocalVideoFrame = "firstLocalVideoFrame";
     public final static String AGFirstRemoteVideoDecoded = "firstRemoteVideoDecoded";
     public final static String AGFirstRemoteVideoFrame = "firstRemoteVideoFrame";
@@ -41,7 +40,6 @@ public class AgoraConst {
     public final static String AGRemoteSubscribeFallbackToAudioOnly = "remoteSubscribeFallbackToAudioOnly";
 
     public final static String AGAudioRouteChanged = "audioRouteChanged";
-    public final static String AGCameraReady = "cameraReady";
     public final static String AGCameraFocusAreaChanged = "cameraFocusAreaChanged";
     public final static String AGCameraExposureAreaChanged = "cameraExposureAreaChanged";
 

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

@@ -59,16 +59,22 @@ public class AgoraManager {
         switch (val) {
             case 1:
                 type = FRAME_RATE.FRAME_RATE_FPS_1;
+                break;
             case 7:
                 type = FRAME_RATE.FRAME_RATE_FPS_7;
+                break;
             case 10:
                 type = FRAME_RATE.FRAME_RATE_FPS_10;
+                break;
             case 15:
                 type = FRAME_RATE.FRAME_RATE_FPS_15;
+                break;
             case 24:
                 type = FRAME_RATE.FRAME_RATE_FPS_24;
+                break;
             case 30:
                 type = FRAME_RATE.FRAME_RATE_FPS_30;
+                break;
         }
         return type;
     }
@@ -78,10 +84,13 @@ public class AgoraManager {
         switch (val) {
             case 0:
                 type = ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
+                break;
             case 1:
                 type = ORIENTATION_MODE.ORIENTATION_MODE_FIXED_LANDSCAPE;
+                break;
             case 2:
                 type = ORIENTATION_MODE.ORIENTATION_MODE_FIXED_PORTRAIT;
+                break;
         }
         return type;
     }
@@ -193,7 +202,7 @@ public class AgoraManager {
 
     /**
      * set local video render mode
-     * @param Integer renderMode
+     * @param renderMode Integer
      * @return result state
      */
     public int setLocalRenderMode(final Integer renderMode) {
@@ -250,12 +259,12 @@ public class AgoraManager {
         return mRtcEngine.disableLastmileTest();
     }
 
-    public void startPreview() {
-        mRtcEngine.startPreview();
+    public int startPreview() {
+        return mRtcEngine.startPreview();
     }
 
-    public void stopPreview() {
-        mRtcEngine.stopPreview();
+    public int stopPreview() {
+        return mRtcEngine.stopPreview();
     }
 
     public int leaveChannel() {

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

@@ -54,6 +54,6 @@ public class MediaObserver implements IMetadataObserver {
         map.putString("uid", Integer.toString(uid));
         map.putString("ts", Long.toString(timeStampMs));
         reactCtx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit("mediaMetaDataReceived", map);
+                .emit(AgoraConst.AGMediaMetaDataReceived, map);
     }
 }

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

@@ -1,16 +0,0 @@
-package com.syan.agora;
-
-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;
-    }
-
-}

ios/RCTAgora/AgoraConst.h

@@ -32,7 +32,6 @@ static NSString *AGActiveSpeaker = @"activeSpeaker";
 static NSString *AGFirstLocalAudioFrame = @"firstLocalAudioFrame";
 static NSString *AGFirstRemoteAudioFrame = @"firstRemoteAudioFrame";
 static NSString *AGFirstRemoteAudioDecoded = @"firstRemoteAudioDecoded";
-static NSString *AGVideoStopped = @"videoStopped";
 static NSString *AGFirstLocalVideoFrame = @"firstLocalVideoFrame";
 static NSString *AGFirstRemoteVideoDecoded = @"firstRemoteVideoDecoded";
 static NSString *AGFirstRemoteVideoFrame = @"firstRemoteVideoFrame";
@@ -46,7 +45,6 @@ static NSString *AGLocalPublishFallbackToAudioOnly = @"localPublishFallbackToAud
 static NSString *AGRemoteSubscribeFallbackToAudioOnly = @"remoteSubscribeFallbackToAudioOnly";
 
 static NSString *AGAudioRouteChanged = @"audioRouteChanged";
-static NSString *AGCameraReady = @"cameraReady";
 static NSString *AGCameraFocusAreaChanged = @"cameraFocusAreaChanged";
 static NSString *AGCameraExposureAreaChanged = @"cameraExposureAreaChanged";
 

ios/RCTAgora/AgoraConst.m

@@ -48,7 +48,6 @@ static AgoraConst *_person;
                                   AGFirstLocalAudioFrame,
                                   AGFirstRemoteAudioFrame,
                                   AGFirstRemoteAudioDecoded,
-                                  AGVideoStopped,
                                   AGFirstLocalVideoFrame,
                                   AGFirstRemoteVideoDecoded,
                                   AGFirstRemoteVideoFrame,
@@ -62,7 +61,6 @@ static AgoraConst *_person;
                                   AGRemoteSubscribeFallbackToAudioOnly,
                                   
                                   AGAudioRouteChanged,
-                                  AGCameraReady,
                                   AGCameraFocusAreaChanged,
                                   AGCameraExposureAreaChanged,
                                   

ios/RCTAgora/RCTAgora.h

@@ -13,7 +13,7 @@
 #import <AgoraRtcEngineKit/AgoraRtcEngineKit.h>
 
 @interface RCTAgora : RCTEventEmitter<RCTBridgeModule, AgoraMediaMetadataDelegate, AgoraMediaMetadataDataSource>
-- (void) sendEvent:(NSString *)msg params:(NSDictionary *)params;
+- (void) sendEvent:(NSString *_Nullable)msg params:(NSDictionary *_Nullable)params;
 - (NSInteger) metadataMaxSize;
 - (NSData *_Nullable)readyToSendMetadataAtTimestamp:(NSTimeInterval)timestamp;
 - (void)receiveMetadata:(NSData *_Nonnull)data fromUser:(NSInteger)uid atTimestamp:(NSTimeInterval)timestamp;