Merge pull request #40 from syanbo/v2.x

refactor. event

.gitignore

@@ -72,3 +72,4 @@ xcuserdata*
 .vscode
 samples/**/package-lock.json
 *.iml
+android/bin

.npmignore

@@ -37,3 +37,4 @@ proguard-rules.pro
 .settings
 .vscode
 package-lock.json
+android/bin

CHANGELOG

@@ -0,0 +1,50 @@
+## THE CHANGELOG
+
+#### 2.3.3-alpha
+- support agora video sdk 2.3.3
+- release 2.3.3-alpha.3
+- release 2.3.3-alpha.4 (remove deprecated native api)
+- release 2.3.3-alpha.5 (refactor event react api & refactor native wrapper)
+
+
+#### 1.1.2
+- add onVideoMute
+- add onAudioMute
+
+#### 1.1.1
+
+- add createDataStream
+- add sendStreamMessage
+- add onStreamMessage
+
+#### 1.0.9
+
+- update to agora sdk version 2.0.2
+
+- add setCameraAutoFocusFaceModeEnabled
+
+- add setDefaultAudioRouteToSpeakerphone
+
+- add setCameraTorchOn
+
+- fix bug: Android speaker's volume indication
+
+#### 1.0.8
+
+ - update to agora sdk version 1.12
+
+ - init wouldn't start video preview. Should manually use startPreview.
+
+ - init options add new boolean parameter `swapWidthAndHeight` to support swap width and height.
+
+ - add configPublisher
+
+ - add setLocalRenderMode
+
+ - add setRemoteRenderMode
+
+ - add enableAudioVolumeIndication
+
+ - add onAudioVolumeIndication
+
+ - add zOrderMediaOverlay for android platform, support media overlay

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

@@ -172,14 +172,6 @@ public int joinChannel(ReadableMap options) {
         return mRtcEngine.joinChannel(token, channelName, optionalInfo, uid);
     }
 
-//    public int joinChannelWithToken(ReadableMap options) {
-//        String token = options.getString("token");
-//        String channel = options.getString("channel");
-//        String optionalInfo = options.getString("optionalInfo");
-//        int uid = options.getInt("uid");
-//        return mRtcEngine.joinChannel(token, channel, optionalInfo, uid);
-//    }
-
     public int enableLastmileTest() {
         return mRtcEngine.enableLastmileTest();
     }

ios/RCTAgora/AgoraConst.h

@@ -10,73 +10,68 @@
 
 static NSString *RCTAgoraErrorDomain = @"RCTAgoraErrorDomain";
 
-static NSString *DidOccurWarning = @"onWarning";
-static NSString *DidOccurError = @"onError";
-static NSString *DidApiCallExecute = @"onApiCallExecute";
-static NSString *DidJoinChannel = @"onJoinChannelSuccess";
-static NSString *DidRejoinChannel = @"onRejoinChannelSuccess";
-static NSString *DidLeaveChannel = @"onLeaveChannel";
-static NSString *DidClientRoleChanged = @"onClientRoleChanged";
-static NSString *DidJoinedOfUid = @"onUserJoined";
-static NSString *DidOfflineOfUid = @"onUserOffline";
-static NSString *ConnectionChangedToState = @"onConnectionStateChanged";
-static NSString *ConnectionDidLost = @"onConnectionLost";
-static NSString *TokenPrivilegeWillExpire = @"onTokenPrivilegeWillExpire";
-static NSString *RequestToken = @"onRequestToken";
-
-static NSString *DidMicrophoneEnabled = @"onMicrophoneEnabled";
-static NSString *ReportAudioVolumeIndicationOfSpeakers = @"onAudioVolumeIndication";
-static NSString *ActiveSpeaker = @"onActiveSpeaker";
-static NSString *FirstLocalAudioFrame = @"onFirstLocalAudioFrame";
-static NSString *FirstRemoteAudioFrameOfUid = @"onFirstRemoteAudioFrame";
-static NSString *VideoDidStop = @"onVideoStopped";
-static NSString *FirstLocalVideoFrameWithSize = @"onFirstLocalVideoFrame";
-static NSString *FirstRemoteVideoDecodedOfUid = @"onFirstRemoteVideoDecoded";
-static NSString *FirstRemoteVideoFrameOfUid = @"onFirstRemoteVideoFrame";
-static NSString *DidAudioMuted = @"onUserMuteAudio";
-static NSString *DidVideoMuted = @"onUserMuteVideo";
-static NSString *DidVideoEnabled = @"onUserEnableVideo";
-static NSString *DidLocalVideoEnabled = @"onUserEnableLocalVideo";
-static NSString *VideoSizeChangedOfUid = @"onVideoSizeChanged";
-static NSString *RemoteVideoStateChangedOfUid = @"onRemoteVideoStateChanged";
-static NSString *DidLocalPublishFallbackToAudioOnly = @"onLocalPublishFallbackToAudioOnly";
-static NSString *DidRemoteSubscribeFallbackToAudioOnly = @"onRemoteSubscribeFallbackToAudioOnly";
-
-static NSString *DeviceTypeStateChanged = @"onDeviceTypeStateChanged";
-static NSString *DidAudioRouteChanged = @"onAudioRouteChanged";
-static NSString *CameraDidReady = @"onCameraReady";
-static NSString *CameraFocusDidChangedToRect = @"onCameraFocusAreaChanged";
-static NSString *CameraExposureDidChangedToRect = @"onCameraExposureAreaChanged";
-
-static NSString *ReportRtcStats = @"onRtcStats";
-static NSString *LastmileQuality = @"onLastmileQuality";
-static NSString *NetworkQuality = @"onNetworkQuality";
-static NSString *LocalVideoStats = @"onLocalVideoStats";
-static NSString *RemoteVideoStats = @"onRemoteVideoStats";
-static NSString *RemoteAudioStats = @"onRemoteAudioStats";
-static NSString *AudioTransportStatsOfUid = @"AudioTransportStatsOfUid";
-static NSString *VideoTransportStatsOfUid = @"VideoTransportStatsOfUid";
-
-static NSString *LocalAudioMixingDidFinish = @"onLocalAudioMixingFinish";
-static NSString *RemoteAudioMixingDidStart = @"onRemoteAudioMixingStart";
-static NSString *RemoteAudioMixingDidFinish = @"onRemoteAudioMixingFinish";
-static NSString *DidAudioEffectFinish = @"onAudioEffectFinish";
-
-static NSString *StreamPublished = @"onStreamPublished";
-static NSString *StreamUnpublish = @"onStreamUnpublish";
-static NSString *TranscodingUpdated = @"onTranscodingUpdate";
-
-static NSString *StreamInjectedStatus = @"onStreamInjectedStatus";
-
-static NSString *ReceiveStreamMessage = @"onReceiveStreamMessage";
-static NSString *DidOccurStreamMessageError = @"onOccurStreamMessageError";
-
-static NSString *MediaEngineDidLoaded = @"onMediaEngineLoaded";
-static NSString *MediaEngineDidStartCall = @"onMediaEngineStartCall";
-
-static NSString *ConnectionDidInterrupted = @"onConnectionInterrupted";
-static NSString *ConnectionDidBanned = @"onConnectionBanned";
-static NSString *AudioQualityOfUid = @"onAudioQuality";
+static NSString *AGWarning = @"warning";
+static NSString *AGError = @"error";
+static NSString *AGApiCallExecute = @"apiCallExecute";
+static NSString *AGJoinChannelSuccess = @"joinChannelSuccess";
+static NSString *AGRejoinChannelSuccess = @"rejoinChannelSuccess";
+static NSString *AGLeaveChannel = @"leaveChannel";
+static NSString *AGClientRoleChanged = @"clientRoleChanged";
+static NSString *AGUserJoined = @"userJoined";
+static NSString *AGUserOffline = @"userOffline";
+static NSString *AGConnectionStateChanged = @"connectionStateChanged";
+static NSString *AGConnectionLost = @"connectionLost";
+static NSString *AGTokenPrivilegeWillExpire = @"tokenPrivilegeWillExpire";
+static NSString *AGRequestToken = @"requestToken";
+
+static NSString *AGMicrophoneEnabled = @"microphoneEnabled";
+static NSString *AGAudioVolumeIndication = @"audioVolumeIndication";
+static NSString *AGActiveSpeaker = @"activeSpeaker";
+static NSString *AGFirstLocalAudioFrame = @"firstLocalAudioFrame";
+static NSString *AGFirstRemoteAudioFrame = @"firstRemoteAudioFrame";
+static NSString *AGVideoStopped = @"videoStopped";
+static NSString *AGFirstLocalVideoFrame = @"firstLocalVideoFrame";
+static NSString *AGFirstRemoteVideoDecoded = @"firstRemoteVideoDecoded";
+static NSString *AGFirstRemoteVideoFrame = @"firstRemoteVideoFrame";
+static NSString *AGUserMuteAudio = @"userMuteAudio";
+static NSString *AGUserMuteVideo = @"userMuteVideo";
+static NSString *AGUserEnableVideo = @"userEnableVideo";
+static NSString *AGUserEnableLocalVideo = @"userEnableLocalVideo";
+static NSString *AGVideoSizeChanged = @"videoSizeChanged";
+static NSString *AGRemoteVideoStateChanged = @"remoteVideoStateChanged";
+static NSString *AGLocalPublishFallbackToAudioOnly = @"localPublishFallbackToAudioOnly";
+static NSString *AGRemoteSubscribeFallbackToAudioOnly = @"remoteSubscribeFallbackToAudioOnly";
+
+static NSString *AGAudioRouteChanged = @"audioRouteChanged";
+static NSString *AGCameraReady = @"cameraReady";
+static NSString *AGCameraFocusAreaChanged = @"cameraFocusAreaChanged";
+static NSString *AGCameraExposureAreaChanged = @"cameraExposureAreaChanged";
+
+static NSString *AGRtcStats = @"rtcStats";
+static NSString *AGLastmileQuality = @"lastmileQuality";
+static NSString *AGNetworkQuality = @"networkQuality";
+static NSString *AGLocalVideoStats = @"localVideoStats";
+static NSString *AGRemoteVideoStats = @"remoteVideoStats";
+static NSString *AGRemoteAudioStats = @"remoteAudioStats";
+static NSString *AGAudioTransportStatsOfUid = @"audioTransportStatsOfUid";
+static NSString *AGVideoTransportStatsOfUid = @"videoTransportStatsOfUid";
+
+static NSString *AGLocalAudioMixingFinish = @"localAudioMixingFinish";
+static NSString *AGRemoteAudioMixingStart = @"remoteAudioMixingStart";
+static NSString *AGRemoteAudioMixingFinish = @"remoteAudioMixingFinish";
+static NSString *AGAudioEffectFinish = @"audioEffectFinish";
+
+static NSString *AGStreamPublished = @"streamPublished";
+static NSString *AGStreamUnpublish = @"streamUnpublish";
+static NSString *AGTranscodingUpdate = @"transcodingUpdate";
+
+static NSString *AGStreamInjectedStatus = @"streamInjectedStatus";
+
+static NSString *AGReceiveStreamMessage = @"receiveStreamMessage";
+static NSString *AGOccurStreamMessageError = @"occurStreamMessageError";
+
+static NSString *AGMediaEngineLoaded = @"mediaEngineLoaded";
+static NSString *AGMediaEngineStartCall = @"mediaEngineStartCall";
 
 @interface AgoraConst : NSObject