1、fixed 苹果登录直接退出会一直loading的问题

2、fixed 无法退出登录的问题

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FUSSocialLogin/FUSThirdAccountLoginHelper.m

@@ -146,13 +146,12 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
         // 配置 Facebook
         // 配置 Facebook
         [self setupFacebookWithApplication:application
         [self setupFacebookWithApplication:application
                                    Options:options];
                                    Options:options];
-    });
-    
-    // 配置 Twitter
+//         配置 Twitter
 //        [self setupTwitter];
 //        [self setupTwitter];
         
         
-    //配置 line
+//        配置 line
 //        [self setupLine];
 //        [self setupLine];
+    });
 }
 }
 
 
 /**
 /**
@@ -590,15 +589,16 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
     // 退出微信
     // 退出微信
     [ShareSDK cancelAuthorize:SSDKPlatformTypeWechat result:nil];
     [ShareSDK cancelAuthorize:SSDKPlatformTypeWechat result:nil];
   
   
-    // twitter
-    if (![NSString isNull:[TWTRAPIClient clientWithCurrentUser].userID]) {
-        [[[TWTRTwitter sharedInstance] sessionStore] logOutUserID:[TWTRAPIClient clientWithCurrentUser].userID];
-    }
-    
-    LineSDKConfiguration *confg = [LineSDKConfiguration defaultConfig];
-    [[[LineSDKAPI alloc] initWithConfiguration:confg] logoutWithCompletion:^(BOOL success, NSError * _Nullable error) {
-        FUSLogDebug(@"line退出成功");
-    }];
+    //TODO:暂时没有twitter 登录: added By Pidan
+//    // twitter
+//    if (![NSString isNull:[TWTRAPIClient clientWithCurrentUser].userID]) {
+//        [[[TWTRTwitter sharedInstance] sessionStore] logOutUserID:[TWTRAPIClient clientWithCurrentUser].userID];
+//    }
+    //TODO:暂时没有Line 登录: added By Pidan
+//    LineSDKConfiguration *confg = [LineSDKConfiguration defaultConfig];
+//    [[[LineSDKAPI alloc] initWithConfiguration:confg] logoutWithCompletion:^(BOOL success, NSError * _Nullable error) {
+//        FUSLogDebug(@"line退出成功");
+//    }];
 }
 }
 
 
 /**
 /**
@@ -1209,6 +1209,10 @@ didDisconnectWithUser:(GIDGoogleUser *)user
             break;
             break;
     }
     }
     
     
+    // 登录错误
+    if (self.loginFailure) {
+        self.loginFailure(error);
+    }
     NSLog(@"%@", errorMsg);
     NSLog(@"%@", errorMsg);
 }
 }
 
 

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMUserService.m

@@ -213,11 +213,12 @@
 
 
 - (void)fus_logOffWithSuccess:(void(^)(void))success failure:(void(^)(void))failure
 - (void)fus_logOffWithSuccess:(void(^)(void))success failure:(void(^)(void))failure
 {
 {
+    __weak typeof(self) weakSelf = self;
     // 是否解除device token的绑定 解除绑定后设备不会再收到消息推送 默认为YES
     // 是否解除device token的绑定 解除绑定后设备不会再收到消息推送 默认为YES
     [[EMClient sharedClient] logout:YES completion:^(EMError *aError) {
     [[EMClient sharedClient] logout:YES completion:^(EMError *aError) {
         
         
         // 重置重试次数
         // 重置重试次数
-        _retryCount = 0;
+        weakSelf.retryCount = 0;
         
         
         if (!aError) {
         if (!aError) {
             // 停止环信的代理服务
             // 停止环信的代理服务

Modules/FUSChatCenterModule/FUSChatCenterModule/Router/FUSChatCenterRouter.m

@@ -153,19 +153,6 @@
 }
 }
 
 
 - (void)fus_loginSuccess {
 - (void)fus_loginSuccess {
-    // 开发环境下可切换环信 Key，默认为正式 Key
-    if (FUSConfig.sharedInstanced.devConfigs.enableEaseMobChange) {
-        // 可修改，使用当前存储的 Key
-        NSString *currentKey = [[NSUserDefaults standardUserDefaults] objectForKey:FUSChatUDKeys.fus_CURRENT_EASE_MOB_KEY];
-        if ([NSString isNull:currentKey]) {
-            currentKey = FUSConfig.sharedInstanced.sdkConfigs.easeMobAppKey;
-        }
-        // 初始化环信SDK
-        [[FUSIMChatService shareInstance] fus_initEaseMobSDKWithAppKey:currentKey];
-    } else {
-        // 初始化环信SDK
-        [[FUSIMChatService shareInstance] fus_initEaseMobSDKWithAppKey:FUSConfig.sharedInstanced.sdkConfigs.easeMobAppKey];
-    }
     
     
 }
 }
 
 
@@ -481,6 +468,20 @@
 #pragma mark - UIApplicationDelegate
 #pragma mark - UIApplicationDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions {
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions {
     
     
+    // 开发环境下可切换环信 Key，默认为正式 Key
+    if (FUSConfig.sharedInstanced.devConfigs.enableEaseMobChange) {
+        // 可修改，使用当前存储的 Key
+        NSString *currentKey = [[NSUserDefaults standardUserDefaults] objectForKey:FUSChatUDKeys.fus_CURRENT_EASE_MOB_KEY];
+        if ([NSString isNull:currentKey]) {
+            currentKey = FUSConfig.sharedInstanced.sdkConfigs.easeMobAppKey;
+        }
+        // 初始化环信SDK
+        [[FUSIMChatService shareInstance] fus_initEaseMobSDKWithAppKey:currentKey];
+    } else {
+        // 初始化环信SDK
+        [[FUSIMChatService shareInstance] fus_initEaseMobSDKWithAppKey:FUSConfig.sharedInstanced.sdkConfigs.easeMobAppKey];
+    }
+    
     return YES;
     return YES;
 }
 }
 
 

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSStartPageViewController.m

@@ -717,7 +717,7 @@
     }
     }
     __weak typeof(self) weakSelf = self;
     __weak typeof(self) weakSelf = self;
     [FUSLoadingView fus_showProgressViewWithContentMessage:nil withView:self.view];
     [FUSLoadingView fus_showProgressViewWithContentMessage:nil withView:self.view];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [FUSLoadingView fus_dismissProgressViewWithView:weakSelf.view];
         [FUSLoadingView fus_dismissProgressViewWithView:weakSelf.view];
     });
     });