Merge remote-tracking branch 'easemob/main' into du_dev

Author: dujiepeng

Classes/Process/EaseCallManager.m

@@ -156,7 +156,7 @@ - (void)startInviteUsers:(NSArray<NSString*>*)aUsers ext:(NSDictionary*)aExt  co
         if(weakself.modal.currentCall && weakself.callVC) {
             NSLog(@"inviteUsers in group");
             for(NSString* uId in aUsers) {
-                if([weakself.modal.currentCall.allUserAccounts.allKeys containsObject:uId])
+                if([weakself.modal.currentCall.allUserAccounts.allValues containsObject:uId])
                     continue;
                 [weakself sendInviteMsgToCallee:uId type:weakself.modal.currentCall.callType callId:weakself.modal.currentCall.callId channelName:weakself.modal.currentCall.channelName ext:aExt completion:nil];
                 [weakself _startCallTimer:uId];
@@ -296,6 +296,28 @@ - (void)clearRes
     self.bNeedSwitchToVoice = NO;
 }
 
+-(UIWindow*) getKeyWindow
+{
+    if(@available(iOS 13.0, *)) {
+        for(UIWindowScene* scene in [UIApplication sharedApplication].connectedScenes) {
+            if(scene.activationState == UISceneActivationStateForegroundActive) {
+                if(@available(iOS 15.0, *)) {
+                    return scene.keyWindow;
+                }else{
+                    for(UIWindow* window in scene.windows) {
+                        if(window.isKeyWindow) {
+                            return window;
+                        }
+                    }
+                }
+            }
+        }
+    }else{
+        return [UIApplication sharedApplication].keyWindow;
+    }
+    return nil;
+}
+
 - (void)refreshUIOutgoing
 {
     if(self.modal.currentCall) {
@@ -304,7 +326,10 @@ - (void)refreshUIOutgoing
             self.callVC = [[EaseCallSingleViewController alloc] initWithisCaller:self.modal.currentCall.isCaller type:self.modal.currentCall.callType remoteName:self.modal.currentCall.remoteUserAccount];
         self.callVC.modalPresentationStyle = UIModalPresentationFullScreen;
         __weak typeof(self) weakself = self;
-        UIViewController* rootVC = [[UIApplication sharedApplication].delegate window].rootViewController;
+        UIWindow* keyWindow = [self getKeyWindow];
+        if(!keyWindow)
+            return;
+        UIViewController* rootVC = keyWindow.rootViewController;
         [rootVC presentViewController:self.callVC animated:NO completion:^{
             if(weakself.modal.currentCall.callType == EaseCallType1v1Video)
                 [weakself setupLocalVideo];
@@ -319,7 +344,10 @@ - (void)refreshUIAnswering
         if(self.modal.currentCall.callType == EaseCallTypeMulti && self.modal.currentCall.isCaller) {
             self.callVC = [[EaseCallMultiViewController alloc] init];
             self.callVC.modalPresentationStyle = UIModalPresentationFullScreen;
-            UIViewController* rootVC = [[UIApplication sharedApplication].delegate window].rootViewController;
+            UIWindow* keyWindow = [self getKeyWindow];
+            if(!keyWindow)
+                return;
+            UIViewController* rootVC = keyWindow.rootViewController;
             __weak typeof(self) weakself = self;
             [rootVC presentViewController:self.callVC animated:NO completion:^{
                 [weakself setupLocalVideo];
@@ -342,7 +370,10 @@ - (void)refreshUIAlerting
             self.callVC = [[EaseCallMultiViewController alloc] init];
             [self getMultiVC].inviterId = self.modal.currentCall.remoteUserAccount;
             self.callVC.modalPresentationStyle = UIModalPresentationFullScreen;
-            UIViewController* rootVC = [[UIApplication sharedApplication].delegate window].rootViewController;
+            UIWindow* keyWindow = [self getKeyWindow];
+            if(!keyWindow)
+                return;
+            UIViewController* rootVC = keyWindow.rootViewController;
             if(rootVC.presentationController && rootVC.presentationController.presentedViewController)
                 [rootVC.presentationController.presentedViewController dismissViewControllerAnimated:NO completion:nil];
 
@@ -1339,4 +1370,5 @@ - (void)sendVideoToVoiceMsg
 {
     [self sendVideoToVoiceMsg:self.modal.currentCall.remoteUserAccount callId:self.modal.currentCall.callId];
 }
+
 @end

Classes/Store/EaseCallConfig.h

@@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
  * encoderConfiguration    声网RTC Video配置
  */
 @property (nonatomic,strong) AgoraVideoEncoderConfiguration *encoderConfiguration;
-@property (nonatomic) NSUInteger* agoraUid;
+@property (nonatomic) NSUInteger agoraUid;
 
 - (void)setUser:(NSString*)aUser info:(EaseCallUser*)aInfo;
 @end