diff --git a/ios-rongcallkit/RongCallKit/Controller/RCCallBaseViewController.m b/ios-rongcallkit/RongCallKit/Controller/RCCallBaseViewController.m index e32cc6b..46fe885 100644 --- a/ios-rongcallkit/RongCallKit/Controller/RCCallBaseViewController.m +++ b/ios-rongcallkit/RongCallKit/Controller/RCCallBaseViewController.m @@ -1182,23 +1182,25 @@ - (void)remoteUserDidJoin:(NSString *)userId */ - (void)remoteUserDidChangeMediaType:(NSString *)userId mediaType:(RCCallMediaType)mediaType { - if (!self.callSession.isMultiCall) { - if (mediaType == RCCallMediaAudio && - self.callSession.mediaType != RCCallMediaAudio) { - if ([self.callSession changeMediaType:RCCallMediaAudio]) { - [self.callSession - setVideoView:nil - userId:[RCIMClient sharedRCIMClient].currentUserInfo.userId]; - [self.callSession setVideoView:nil userId:self.callSession.targetId]; - [self resetLayout:self.callSession.isMultiCall - mediaType:RCCallMediaAudio - callStatus:self.callSession.callStatus]; + dispatch_async(dispatch_get_main_queue(), ^{ + if (!self.callSession.isMultiCall) { + if (mediaType == RCCallMediaAudio && + self.callSession.mediaType != RCCallMediaAudio) { + if ([self.callSession changeMediaType:RCCallMediaAudio]) { + [self.callSession + setVideoView:nil + userId:[RCIMClient sharedRCIMClient].currentUserInfo.userId]; + [self.callSession setVideoView:nil userId:self.callSession.targetId]; + [self resetLayout:self.callSession.isMultiCall + mediaType:RCCallMediaAudio + callStatus:self.callSession.callStatus]; + } } + } else if (self.callSession.mediaType == mediaType && + mediaType == RCCallMediaVideo) { + [self remoteUserDidDisableCamera:NO byUser:userId]; } - } else if (self.callSession.mediaType == mediaType && - mediaType == RCCallMediaVideo) { - [self remoteUserDidDisableCamera:NO byUser:userId]; - } + }); } /*! diff --git a/ios-rongcallkit/RongCallKit/Info.plist b/ios-rongcallkit/RongCallKit/Info.plist index 0380e07..056dcff 100644 --- a/ios-rongcallkit/RongCallKit/Info.plist +++ b/ios-rongcallkit/RongCallKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.8.19 + 2.8.20 CFBundleSignature ???? CFBundleVersion diff --git a/ios-rongcallkit/RongCallKit/Utility/RCCallFloatingBoard.m b/ios-rongcallkit/RongCallKit/Utility/RCCallFloatingBoard.m index ea1b006..cc12fb7 100644 --- a/ios-rongcallkit/RongCallKit/Utility/RCCallFloatingBoard.m +++ b/ios-rongcallkit/RongCallKit/Utility/RCCallFloatingBoard.m @@ -458,15 +458,17 @@ - (void)remoteUserDidJoin:(NSString *)userId */ - (void)remoteUserDidChangeMediaType:(NSString *)userId mediaType:(RCCallMediaType)mediaType { - if (!self.callSession.isMultiCall) { - if (mediaType == RCCallMediaAudio && - self.callSession.mediaType != RCCallMediaAudio) { - if ([self.callSession changeMediaType:RCCallMediaAudio]) { - [self.videoView removeFromSuperview]; - [self initBoard]; + dispatch_async(dispatch_get_main_queue(), ^{ + if (!self.callSession.isMultiCall) { + if (mediaType == RCCallMediaAudio && + self.callSession.mediaType != RCCallMediaAudio) { + if ([self.callSession changeMediaType:RCCallMediaAudio]) { + [self.videoView removeFromSuperview]; + [self initBoard]; + } } } - } + }); } /*! diff --git a/ios-rongcallkit/framework/AgoraRtcEngineKit.framework/Modules/module.modulemap b/ios-rongcallkit/framework/AgoraRtcEngineKit.framework/Modules/module.modulemap new file mode 100644 index 0000000..9f52925 --- /dev/null +++ b/ios-rongcallkit/framework/AgoraRtcEngineKit.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module AgoraRtcEngineKit { + umbrella header "AgoraRtcEngineKit.h" + + export * + module * { export * } +} diff --git a/ios-rongcallkit/framework/RongCallLib.framework/Info.plist b/ios-rongcallkit/framework/RongCallLib.framework/Info.plist index 5cf56f0..77dc416 100644 Binary files a/ios-rongcallkit/framework/RongCallLib.framework/Info.plist and b/ios-rongcallkit/framework/RongCallLib.framework/Info.plist differ diff --git a/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib b/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib index f84d7b8..2b87da5 100644 Binary files a/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib and b/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib differ diff --git a/ios-rongcallkit/framework/RongIMKit.framework/Info.plist b/ios-rongcallkit/framework/RongIMKit.framework/Info.plist index 4a0eac5..4bf7684 100644 Binary files a/ios-rongcallkit/framework/RongIMKit.framework/Info.plist and b/ios-rongcallkit/framework/RongIMKit.framework/Info.plist differ diff --git a/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit b/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit index d709993..0588e9e 100644 Binary files a/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit and b/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit differ diff --git a/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h b/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h index 1005206..c12933c 100644 --- a/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h +++ b/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h @@ -52,7 +52,6 @@ @property(nonatomic) int userTipTime; @property(nonatomic, strong) NSString *userTipWord; - /*! * 评价时机 */ diff --git a/ios-rongcallkit/framework/RongIMLib.framework/Info.plist b/ios-rongcallkit/framework/RongIMLib.framework/Info.plist index 7bf2ab2..947c588 100644 Binary files a/ios-rongcallkit/framework/RongIMLib.framework/Info.plist and b/ios-rongcallkit/framework/RongIMLib.framework/Info.plist differ diff --git a/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib b/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib index f5c4c9b..dc6a90a 100644 Binary files a/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib and b/ios-rongcallkit/framework/RongIMLib.framework/RongIMLib differ