Merge pull request #10 from lixm1988/main

update rtc version to 4.1.0

Author: lixm1988

Classes/Process/EaseCallManager.m

@@ -91,7 +91,7 @@ - (void)initWithConfig:(EaseCallConfig*)aConfig delegate:(id<EaseCallDelegate>)a
         self.agoraKit = [AgoraRtcEngineKit sharedEngineWithAppId:self.config.agoraAppId delegate:self];
         [self.agoraKit setChannelProfile:AgoraChannelProfileLiveBroadcasting];
         [self.agoraKit setClientRole:AgoraClientRoleBroadcaster];
-        [self.agoraKit enableAudioVolumeIndication:1000 smooth:5 report_vad:NO];
+        [self.agoraKit enableAudioVolumeIndication:1000 smooth:5 reportVad:NO];
     }
 
     self.modal.curUserAccount = [[EMClient sharedClient] currentUsername];
@@ -240,7 +240,6 @@ - (BOOL)isBusy
 
 - (void)clearRes
 {
-    NSLog(@"cleraRes");
     if(self.modal.currentCall)
     {
         if(self.modal.currentCall.callType != EaseCallType1v1Audio)
@@ -252,8 +251,7 @@ - (void)clearRes
             dispatch_async(self.workQueue, ^{
                 self.modal.hasJoinedChannel = NO;
                 [self.agoraKit leaveChannel:^(AgoraChannelStats * _Nonnull stat) {
-                    NSLog(@"leaveChannel");
-                    //[[EMClient sharedClient] log:@"leaveChannel"];
+                    [[EMClient sharedClient] log:@"leaveChannel"];
                 }];
             });
 
@@ -402,6 +400,7 @@ - (void)setupVideo {
 
     // Set up the configuration such as dimension, frame rate, bit rate and orientation
     [self.agoraKit setVideoEncoderConfiguration:self.config.encoderConfiguration];
+    
 }
 
 - (EaseCallSingleViewController*)getSingleVC
@@ -444,7 +443,7 @@ - (void)callStateWillChangeTo:(EaseCallState)newState from:(EaseCallState)preSta
 - (void)messagesDidReceive:(NSArray *)aMessages
 {
     __weak typeof(self) weakself = self;
-    dispatch_async(weakself.workQueue, ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
         for (EMChatMessage *msg in aMessages) {
             [weakself _parseMsg:msg];
         }
@@ -454,7 +453,7 @@ - (void)messagesDidReceive:(NSArray *)aMessages
 - (void)cmdMessagesDidReceive:(NSArray *)aCmdMessages
 {
     __weak typeof(self) weakself = self;
-    dispatch_async(weakself.workQueue, ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
         for (EMChatMessage *msg in aCmdMessages) {
             [weakself _parseMsg:msg];
         }
@@ -685,10 +684,8 @@ - (void)_parseMsg:(EMChatMessage*)aMsg
         //[[EMClient sharedClient] log:[NSString stringWithFormat:@"parseAnswerMsgExt currentCallId:%@,state:%ld",weakself.modal.currentCall.callId,weakself.modal.state]];
         if(weakself.modal.currentCall && [weakself.modal.currentCall.callId isEqualToString:callId] && [weakself.modal.curDevId isEqualToString:callerDevId]) {
             if(weakself.modal.currentCall.callType == EaseCallTypeMulti) {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    if(![result isEqualToString:kAcceptResult])
-                        [[weakself getMultiVC] removePlaceHolderForMember:from];
-                });
+                if(![result isEqualToString:kAcceptResult])
+                    [[weakself getMultiVC] removePlaceHolderForMember:from];
 
                 NSTimer* timer = [self.callTimerDic objectForKey:from];
                 if(timer) {
@@ -702,9 +699,7 @@ - (void)_parseMsg:(EMChatMessage*)aMsg
                     if([result isEqualToString:kAcceptResult]) {
 
                             if(isVideoToVoice && isVideoToVoice.boolValue) {
-                                dispatch_async(dispatch_get_main_queue(), ^{
                                 [weakself switchToVoice];
-                                });
                             }
                             weakself.modal.state = EaseCallState_Answering;
                     }else
@@ -753,12 +748,9 @@ - (void)_parseMsg:(EMChatMessage*)aMsg
                 // 仲裁为自己
                 if([result isEqualToString:kAcceptResult]) {
                     weakself.modal.state = EaseCallState_Answering;
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        if(weakself.modal.currentCall.callType != EaseCallType1v1Audio)
-                            [weakself setupLocalVideo];
-                        [weakself fetchToken];
-                    });
+                    if(weakself.modal.currentCall.callType != EaseCallType1v1Audio)
+                        [weakself setupLocalVideo];
+                    [weakself fetchToken];
                 }
             }else{
                 // 已在其他端处理
@@ -775,10 +767,7 @@ - (void)_parseMsg:(EMChatMessage*)aMsg
     };
     void (^parseVideoToVoiceMsg)(NSDictionary*) = ^void (NSDictionary* ext){
         if(weakself.modal.currentCall && [weakself.modal.currentCall.callId isEqualToString:callId]) {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [weakself switchToVoice];
-            });
-            
+            [weakself switchToVoice];
         }
     };
     if([msgType isEqualToString:kMsgTypeValue]) {
@@ -1113,10 +1102,10 @@ - (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteAudioFrameOfUid:(NSUInt
     NSLog(@"firstRemoteAudioFrameOfUid:%lu",(unsigned long)uid);
 }
 
-- (void)rtcEngine:(AgoraRtcEngineKit *)engine remoteVideoStateChangedOfUid:(NSUInteger)uid state:(AgoraVideoRemoteState)state reason:(AgoraVideoRemoteStateReason)reason elapsed:(NSInteger)elapsed
+- (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine
+     remoteVideoStateChangedOfUid:(NSUInteger)uid state:(AgoraVideoRemoteState)state reason:(AgoraVideoRemoteReason)reason elapsed:(NSInteger)elapsed
 {
-    NSLog(@"staate:%d,reason:%d",state,reason);
-    if(reason == AgoraVideoRemoteStateReasonRemoteMuted && self.modal.currentCall.callType == EaseCallType1v1Video) {
+    if(reason == AgoraVideoRemoteReasonRemoteMuted && self.modal.currentCall.callType == EaseCallType1v1Video) {
         __weak typeof(self) weakself = self;
         dispatch_async(dispatch_get_main_queue(), ^{
             [weakself switchToVoice];
@@ -1335,7 +1324,7 @@ - (void)joinChannel
         if(weakself.modal.hasJoinedChannel)
             [weakself.agoraKit leaveChannel:nil];
         [weakself.agoraKit joinChannelByToken:weakself.modal.agoraRTCToken channelId:weakself.modal.currentCall.channelName info:@"" uid:self.modal.agoraUid joinSuccess:^(NSString * _Nonnull channel, NSUInteger uid, NSInteger elapsed) {
-            NSLog(@"join success");
+            [EMClient.sharedClient log:[NSString stringWithFormat:@"joinChannel:%@ success",channel]];
             if([self.delegate respondsToSelector:@selector(callDidJoinChannel:uid:)]) {
                 [self.delegate callDidJoinChannel:channel uid:uid];
             }

Classes/Store/EaseCallConfig.m

@@ -65,10 +65,7 @@ - (void)_initParams
 - (AgoraVideoEncoderConfiguration*)encoderConfiguration
 {
     if(!_encoderConfiguration) {
-        _encoderConfiguration = [[AgoraVideoEncoderConfiguration alloc] initWithSize:AgoraVideoDimension640x360
-                                                                           frameRate:AgoraVideoFrameRateFps15
-                                                                             bitrate:AgoraVideoBitrateStandard
-                                                                     orientationMode:AgoraVideoOutputOrientationModeAdaptative];
+        _encoderConfiguration = [[AgoraVideoEncoderConfiguration alloc] initWithSize:AgoraVideoDimension640x360 frameRate:AgoraVideoFrameRateFps15 bitrate:AgoraVideoBitrateStandard orientationMode:AgoraVideoOutputOrientationModeAdaptative mirrorMode:AgoraVideoMirrorModeAuto];
     }
     return _encoderConfiguration;
 }

EaseCallKit.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
     s.name             = 'EaseCallKit'
-    s.version          = '3.9.9'
+    s.version          = '4.0.0'
     s.summary          = 'A Ease Call UIKit'
     s.description      = <<-DESC
         ‘‘一套使用环信IM以及声网SDK实现音视频呼叫的UI库，可以实现单人语音、视频呼叫，以及多人音视频通话’’
     DESC
     s.homepage = 'https://www.easemob.com'
-    s.license          = 'MIT'
+    s.license          = { :type => 'MIT' }
     s.author           = { 'easemob' => '[email protected]' }
     s.source           = { :git => 'https://github.com/easemob/easecallkitui-ios.git', :tag => s.version.to_s }
     s.frameworks = 'UIKit'
@@ -23,11 +23,11 @@ Pod::Spec.new do |s|
     s.resources = 'Assets/EaseCall.bundle'
     s.dependency 'HyphenateChat', '>= 3.9.0'
     s.dependency 'Masonry'
-    s.dependency 'AgoraRtcEngine_iOS/RtcBasic','3.6.3'
+    s.dependency 'AgoraRtcEngine_iOS/RtcBasic', '~>4.1.1'
     s.dependency 'SDWebImage'
 
     s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64',
-                              'VALID_ARCHS' => 'arm64 armv7 x86_64'
+                              'VALID_ARCHS' => 'arm64 armv7 x86_64','ENABLE_BITCODE' => 'NO'
                             }
-    s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+    s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64','ENABLE_BITCODE' => 'NO' }
 end