no message

zhangxiaowen
1 parent 8c888279
Showing 5 changed files with 141 additions and 198 deletions
CNLiveLoginModule/Classes/Controller/CNLiveLoginController.m
CNLiveLoginModule/Classes/Model/CNLiveLoginRequestModel.h → CNLiveLoginModule/Classes/Model/CNLiveLoginRequest.h
CNLiveLoginModule/Classes/Model/CNLiveLoginRequestModel.m → CNLiveLoginModule/Classes/Model/CNLiveLoginRequest.m
CNLiveLoginModule/Classes/View/CNLiveCompleteInfoView.m
CNLiveLoginModule/Classes/View/CNLiveLoginView.m
@@ -14,11 +14,13 @@
 #import "CNLiveUserAgreementManager.h"
 #import "CNLiveCategory.h"
+#import "CNUserInfoManager.h"
 #import "CNLiveLoginView.h"
 #import "CNLiveThreeLoginView.h"
 #import "CNLiveBindingTelController.h"//绑定手机号
 #import "CNLiveCompleteInfoController.h"//修改昵称
+#import "CNLiveLoginRequest.h"
 @interface CNLiveLoginController()<CNLiveLoginViewDelegate, CNLiveThreeLoginViewDelegate>
 @property (nonatomic, weak) CNLiveLoginView *loginView;
@@ -29,6 +31,7 @@
 @end
 @implementation CNLiveLoginController
+
 #pragma mark - 生命周期
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
@@ -97,6 +100,13 @@
     }else{
         // 老用户 -> home
+        [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
+            // 进入tabbar
+
+        } failed:^(int code, NSString * _Nonnull msg) {
+            // 错误逻辑
+
+        }];
     }
 //
-//  CNLiveLoginRequestModel.h
+//  CNLiveLoginRequest.h
 //  CNLiveLoginModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
@@ -9,16 +9,17 @@
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
-typedef void (^TIMLoginSucc)(void);
-typedef void (^TIMFail)(int code, NSString * msg);
-@interface CNLiveLoginRequestModel : NSObject
+@interface CNLiveLoginRequest : NSObject
+
 + (instancetype)manager;
-- (void)getTIMLoginToken:(NSString *)identifier success:(void (^)(NSString *))success failed:(void (^)(int, NSString *))failed;
+- (void)getTIMLoginToken:(NSString *)identifier success:(void (^)(NSString * token))success failed:(void (^)(int code, NSString * msg))failed;
+
+- (void)loginTIM:(NSString *)uid success:(void (^)(void))success failed:(void (^)(int code, NSString * msg))failed;
-- (void)loginTIM:(NSString *)uid success:(TIMLoginSucc)success failed:(TIMFail)failed;
+- (void)resumeLogin;
 @end
 //
-//  CNLiveLoginRequestModel.m
+//  CNLiveLoginRequest.m
 //  CNLiveLoginModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
 //  Copyright (c) 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNLiveLoginRequestModel.h"
+#import "CNLiveLoginRequest.h"
 #import <UIKit/UIKit.h>
 #import "QMUIKit.h"
-#import "CNUserInfoManager.h"
 #import "CNLiveEnvironment.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "TIMAdapter.h"
 #import "CommonLibrary.h"
-@interface CNLiveLoginRequestModel()
+#import "NBSAppAgent.h"
+#import "CNLiveBusinessTools.h"
+
+@interface CNLiveLoginRequest()
 @property (nonatomic, strong) IMALoginParam *loginParam;
 @end
-@implementation CNLiveLoginRequestModel
+@implementation CNLiveLoginRequest
+static const NSInteger timeValue = 1.5;
+
 #pragma mark - 单例
 + (instancetype)manager {
-    static CNLiveLoginRequestModel *_singleton = nil;
+    static CNLiveLoginRequest *_singleton = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        //不能再使用alloc方法
-        //因为已经重写了allocWithZone方法，所以这里要调用父类的分配空间的方法
         _singleton = [[super allocWithZone:NULL] init];
         BOOL isAutoLogin = [IMAPlatform isAutoLogin];
+
+        if (isAutoLogin) {
+            _singleton.loginParam = [IMALoginParam loadFromLocal];
-       if (isAutoLogin) {
-           _singleton.loginParam = [IMALoginParam loadFromLocal];
-           
-       } else {
-           _singleton.loginParam = [[IMALoginParam alloc] init];
-           
-       }
+        } else {
+            _singleton.loginParam = [[IMALoginParam alloc] init];
+       
+        }
         [IMAPlatform configWith:_singleton.loginParam.config];
     });
@@ -48,24 +50,21 @@
 // 防止外部调用alloc 或者 new
 + (instancetype)allocWithZone:(struct _NSZone *)zone {
-    return [CNLiveLoginRequestModel manager];
-    
+    return [CNLiveLoginRequest manager];
 }
 // 防止外部调用copy
 - (id)copyWithZone:(nullable NSZone *)zone {
-    return [CNLiveLoginRequestModel manager];
-    
+    return [CNLiveLoginRequest manager];
 }
 // 防止外部调用mutableCopy
 - (id)mutableCopyWithZone:(nullable NSZone *)zone {
-    return [CNLiveLoginRequestModel manager];
-    
+    return [CNLiveLoginRequest manager];
 }
 //获取token
-- (void)getTIMLoginToken:(NSString *)identifier success:(void (^)(NSString *))success failed:(void (^)(int, NSString *))failed{
+- (void)getTIMLoginToken:(NSString *)identifier success:(void (^)(NSString * token))success failed:(void (^)(int code, NSString * msg))failed{
     NSDictionary *params = @{@"appId":AppId,
                              @"plat":@"i",
                              @"sdkAppId":SdkAppId,
@@ -75,7 +74,7 @@
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:TIM_GetTokenUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (!error) {
-            if (responseObject && ![responseObject isKindOfClass:[NSNull class]] && [responseObject isKindOfClass:[NSDictionary class]] && [[responseObject allKeys] containsObject:@"data"] && [[responseObject objectForKey:@"data"] isKindOfClass:[NSDictionary class]]) {
+            if (responseObject && [responseObject isKindOfClass:[NSDictionary class]] && [[responseObject allKeys] containsObject:@"data"] && [[responseObject objectForKey:@"data"] isKindOfClass:[NSDictionary class]]) {
                 NSNumber *code = responseObject[@"errorCode"];
                 if (code && code.intValue == 0) {
                     if (success) {
@@ -90,72 +89,118 @@
             }
         }else{
-            if (failed) failed(31012,@"Token acquisition failure");
+            if (failed) failed(31012, @"获取token失败");
         }
     }];
 }
-- (void)loginTIM:(NSString *)uid success:(TIMLoginSucc)success failed:(TIMFail)failed{
-    
+- (void)loginTIM:(NSString *)uid success:(void (^)(void))success failed:(void (^)(int code, NSString * msg))failed{
+    [QMUITips showLoading:@"正在连接服务器..." inView:[UIApplication sharedApplication].keyWindow];
+
+    // 1.获取token
     [self getTIMLoginToken:uid success:^(NSString * _Nonnull token) {
-        self.loginParam.identifier = CNUserShareModel.uid;
+        
+        self.loginParam.identifier = uid;
         self.loginParam.userSig = token;
         self.loginParam.tokenTime = [[NSDate date] timeIntervalSince1970];
+        // 2.登录im
         [[IMAPlatform sharedInstance] login:self.loginParam succ:^{
-            
-//                [NBSAppAgent setUserIdentifier:[CNLiveBusinessTools getSidIdfv]];
             [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
-            [QMUITips showSucceed:@"登录成功" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];
+
             [self.loginParam saveToLocal];
-//                [[AppDelegate sharedAppDelegate] registNotification];
-            [[IMAPlatform sharedInstance] configHost:self.loginParam];
-            [IMAPlatform sharedInstance].didConnectSuccess = YES;
-            //电商
-            NSString *userID =  CNUserShareModel.uid;
-//                [[DSCnliveShopSDKManager sharedManager] loginUser:userID];
-            //设置APP已活跃
-            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"is_Active_Application"];
-            [[NSUserDefaults standardUserDefaults] synchronize];
             [[IMAPlatform sharedInstance].contactMgr asyncUpdateContact];
             [[IMAPlatform sharedInstance].contactMgr saveGroupIdList:YES];
             [[IMAPlatform sharedInstance] configHost:self.loginParam];
             [IMAPlatform sharedInstance].didConnectSuccess = YES;
-            //电商
-//            NSString *userID =  CNUserShareModel.uid;
-//            [[DSCnliveShopSDKManager sharedManager] loginUser:userID];
+            
+            // 听云
+            [NBSAppAgent setUserIdentifier:[CNLiveBusinessTools getSidIdfv]];
+
+            // 设置电商sdk
+//            [[DSCnliveShopSDKManager sharedManager] loginUser:uid];
+            
             //设置APP已活跃
             [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"is_Active_Application"];
             [[NSUserDefaults standardUserDefaults] synchronize];
+            [QMUITips showSucceed:@"登录成功" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
+            success?success():@"";
+
+            // 3.im配置信息
             [[IMAPlatform sharedInstance].host asyncSetAllowType:TIM_FRIEND_NEED_CONFIRM succ:^{
                 NSLog(@"asyncSetAllowType Suc");
                 [self.loginParam saveToLocal];
             } fail:^(int code, NSString *msg) {
                 NSLog(@"asyncSetAllowType failed : %@", msg);
+                
             }];
-            success?success():@"";
         } fail:^(int code, NSString *msg) {
             NSLog(@"login failed : %@", msg);
-            failed?failed(code, msg):@"";
-
+            [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
             if (code == 6208) {
                 //离线被踢下线重新登录
-//                    [weakSelf resumeLogin];
+                [self resumeLogin];
+            }
+            else{
+                [QMUITips showError:msg inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
+                failed?failed(code, msg):@"";
             }
-            else
-                [QMUITips showError:msg inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:1.5];
-            [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
         }];
+        
     } failed:^(int code, NSString * _Nonnull msg) {
         NSLog(@"token code:%d     msg:%@", code, msg);
         [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
+        [QMUITips showError:msg inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
         failed?failed(code, msg):@"";
+        
     }];
 }
+
+// 如果遇到离线被踢下线重新登录
+- (void)resumeLogin {
+    __weak typeof(self)weakSelf = self;
+    [[IMAPlatform sharedInstance] login:self.loginParam succ:^{
+        [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
+        [QMUITips showSucceed:@"登录成功" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
+        [self.loginParam saveToLocal];
+
+        [[IMAPlatform sharedInstance] configHost:self.loginParam];
+        [IMAPlatform sharedInstance].didConnectSuccess = YES;
+        
+        [[IMAPlatform sharedInstance].host asyncSetAllowType:TIM_FRIEND_NEED_CONFIRM succ:^{
+            NSLog(@"asyncSetAllowType Suc");
+            [self.loginParam saveToLocal];
+            
+        } fail:^(int code, NSString *msg) {
+            NSLog(@"asyncSetAllowType failed : %@", msg);
+        }];
+        
+    } fail:^(int code, NSString *msg) {
+        NSLog(@"tokenCode login failed : %@", msg);
+        if (code == 6028) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                QMUIAlertAction *action = [QMUIAlertAction actionWithTitle:@"重试" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+                    [weakSelf resumeLogin];
+                }];
+                QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"连接服务器失败，请点击重试" message:@"" preferredStyle:QMUIAlertControllerStyleActionSheet];
+                [alertController addAction:action];
+                
+                NSMutableDictionary *titleAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
+                       
+                titleAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+
+                action.buttonAttributes = titleAttributs;
+                [alertController showWithAnimated:YES];
+                
+            });
+        }
+    }];
+}
+
 @end
@@ -23,11 +23,9 @@
 #import "TIMAdapter.h"
 #import "CommonLibrary.h"
-#import "NBSAppAgent.h"
-#import "CNLiveBusinessTools.h"
 #import "CNLiveCategory.h"
-#import "CNLiveLoginRequestModel.h"
+#import "CNLiveLoginRequest.h"
 @interface CNLiveCompleteInfoView()<UITextFieldDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,QMUIAlertControllerDelegate>{
     UIImage *_image;
@@ -173,8 +171,6 @@ static const NSInteger timeValue = 1.5;
                 if(!strongSelf) return ;
                 strongSelf->_image = image;
                 [strongSelf modifyIcon];
-//                [strongSelf.head setImage:image forState:UIControlStateNormal];
-               
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [weakCameraController dismissViewControllerAnimated:YES completion:nil];
                 });
@@ -201,7 +197,6 @@ static const NSInteger timeValue = 1.5;
                 if(!strongSelf) return ;
                 strongSelf->_image = [photos firstObject];
                 [strongSelf modifyIcon];
-//                [strongSelf.head setImage:[photos firstObject] forState:UIControlStateNormal];
             }];
             [(UIViewController *)strongSelf.delegate presentViewController:picker animated:YES completion:nil];
         }];
@@ -287,8 +282,7 @@ static const NSInteger timeValue = 1.5;
             [strongSelf.delegate loginSuccess:strongSelf result:result];
         }
-        [QMUITips showLoading:@"正在连接服务器..." inView:strongSelf.superview];
-        [strongSelf syncIM];
+        [strongSelf connectionIM];
     } failure:^(NSDictionary *errorDic) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
@@ -301,41 +295,13 @@ static const NSInteger timeValue = 1.5;
 }
 // 连接IM
-- (void)syncIM {
-    [CNLiveLoginRequestModel getTIMLoginToken:CNUserShareModel.uid successBlock:^(NSString *token) {
-        self.loginParam.identifier = CNUserShareModel.uid;
-        self.loginParam.userSig = token;
-        self.loginParam.tokenTime = [[NSDate date] timeIntervalSince1970];
-
-        [[IMAPlatform sharedInstance] login:self.loginParam succ:^{
-            [QMUITips hideAllToastInView:self.superview animated:YES];
-            [NBSAppAgent setUserIdentifier:[CNLiveBusinessTools getSidIdfv]];
-            [self.loginParam saveToLocal];
-//            [[AppDelegate sharedAppDelegate] registNotification];
-            [[IMAPlatform sharedInstance] configHost:self.loginParam];
-
-//            [[AppDelegate sharedAppDelegate] enterMainUI];
-
-            //游客浏览后登陆
-//            [self showTouristsLoginTipsView];
-
-            [[IMAPlatform sharedInstance].host asyncSetAllowType:TIM_FRIEND_NEED_CONFIRM succ:^{
-                NSLog(@"asyncSetAllowType Suc");
-                [self.loginParam saveToLocal];
-            } fail:^(int code, NSString *msg) {
-                NSLog(@"asyncSetAllowType failed : %@", msg);
-            }];
-
-        } fail:^(int code, NSString *msg) {
-            NSLog(@"login failed : %@", msg);
-            [QMUITips hideAllToastInView:self.superview animated:YES];
-            [QMUITips showError:msg inView:self.superview hideAfterDelay:timeValue];
-        }];
+- (void)connectionIM {
+    [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
+        // 进入tabbar
+        
+    } failed:^(int code, NSString * _Nonnull msg) {
+        // 错误逻辑
-    } failedBlock:^(int code, NSString *errorMsg) {
-        NSLog(@"token code:%d     error:%@", code, errorMsg);
-        [QMUITips hideAllToastInView:self.superview animated:YES];
-        [QMUITips showError:errorMsg inView:self.superview hideAfterDelay:timeValue];
     }];
 }
@@ -19,7 +19,7 @@
 #import "TIMAdapter.h"
 #import "CommonLibrary.h"
-#import "CNLiveLoginRequestModel.h"
+#import "CNLiveLoginRequest.h"
 #import "CNLiveLoginCountryView.h"
 #import "CNLiveLoginTextField.h"
@@ -247,22 +247,24 @@ static const NSInteger timeValue = 1.5;
 #pragma mark - CNLiveCountDownButton Delegate
 // 倒计时按钮点击
 - (void)countDownButtonDidClick:(CNLiveCountDownButton *)button {
+    [_account resignFirstResponder];
+    [_code resignFirstResponder];
     //获取验证码
     if ([_account.text isEqualToString:@""]) {
-        [QMUITips showError:@"请输入手机号" inView:self.superview hideAfterDelay:timeValue];
+        [QMUITips showError:@"请输入手机号" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
         return;
     }
     // 按钮点击后将enabled设置为NO
     button.userInteractionEnabled = NO;
     __weak typeof(self) weakSelf = self;
-    [QMUITips showLoadingInView:self.superview];
+    [QMUITips showLoadingInView:[UIApplication sharedApplication].keyWindow];
     [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:_account.text countryCode:_countryCode success:^(id result) {
         button.userInteractionEnabled = YES;
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
-        [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
-        [QMUITips showSucceed:@"验证码已发送" inView:strongSelf.superview hideAfterDelay:timeValue];
+        [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
+        [QMUITips showSucceed:@"验证码已发送" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
         button.backgroundColor = [UIColor colorWithRed:222/255.0 green:222/255.0 blue:222/255.0 alpha:1.0];
         button.frame = CGRectMake(self.frame.size.width-110, self.account.bottom+space+10, 110, rowHeight-10);
         [button setImage:nil forState:UIControlStateNormal];
@@ -273,11 +275,11 @@ static const NSInteger timeValue = 1.5;
         button.userInteractionEnabled = YES;
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
-        [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
+        [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
         if ([errorDic[@"errorCode"] integerValue] == 408) {
-            [QMUITips showError:@"请输入正确的手机号" inView:strongSelf.superview hideAfterDelay:timeValue];
+            [QMUITips showError:@"请输入正确的手机号" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
         }else{
-            [QMUITips showError:[errorDic objectForKey:@"errorMessage"] inView:strongSelf.superview hideAfterDelay:timeValue];
+            [QMUITips showError:[errorDic objectForKey:@"errorMessage"] inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
         }
     }];
@@ -306,20 +308,22 @@ static const NSInteger timeValue = 1.5;
 #pragma mark - Action
 - (void)loginDidClicked:(UIButton *)btn{
+    [_account resignFirstResponder];
+    [_code resignFirstResponder];
     //登录
     if ([_account.text isEqualToString:@""]) {
-        [QMUITips showError:@"请输入手机号" inView:self.superview hideAfterDelay:timeValue];
+        [QMUITips showError:@"请输入手机号" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
         return;
     }
     if ([_code.text isEqualToString:@""]) {
-        [QMUITips showError:@"请输入验证码" inView:self.superview hideAfterDelay:timeValue];
+        [QMUITips showError:@"请输入验证码" inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
         return;
     }
     btn.userInteractionEnabled = NO;
     // 隐藏键盘
     [self.superview endEditing:YES];
-    [QMUITips showLoading:@"登录中" inView:self.superview];
+    [QMUITips showLoading:@"登录中" inView:[UIApplication sharedApplication].keyWindow];
     __weak typeof(self) weakSelf = self;
     [CNLiveUserSystemCenter shortcutLoginWithUserName:_account.text countryCode:_countryCode verificationCode:_code.text frmId:@"apple" success:^(id result) {
@@ -333,8 +337,8 @@ static const NSInteger timeValue = 1.5;
         btn.userInteractionEnabled = YES;
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
-        [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
-        [QMUITips showError:[errorDic objectForKey:@"errorMessage"] inView:strongSelf.superview hideAfterDelay:timeValue];
+        [QMUITips hideAllToastInView:[UIApplication sharedApplication].keyWindow animated:YES];
+        [QMUITips showError:[errorDic objectForKey:@"errorMessage"] inView:[UIApplication sharedApplication].keyWindow hideAfterDelay:timeValue];
     }];
 }
@@ -348,94 +352,11 @@ static const NSInteger timeValue = 1.5;
     }
     [CNUserInfoManager saveUserinfoDic:dic];
-//    // YES 新用户   NO 老用户
-//    BOOL isNewUser = [dic[@"isNewUser"] intValue] != 0;
-//    if (self.delegate && [self.delegate respondsToSelector:@selector(loginSuccess:isNewUser:result:)]) {
-//        [self.delegate loginSuccess:self isNewUser:isNewUser result:result];
-//    }
-    
-    [CNLiveLoginRequestModel getTIMLoginToken:CNUserShareModel.uid successBlock:^(NSString *token) {
-            
-            _loginParam.identifier = CNUserShareModel.uid;
-            _loginParam.userSig = token;
-            _loginParam.tokenTime = [[NSDate date] timeIntervalSince1970];
-            
-            [[IMAPlatform sharedInstance] login:_loginParam succ:^{
-                
-//                [NBSAppAgent setUserIdentifier:[CNLiveBusinessTools getSidIdfv]];
-                [QMUITips hideAllToastInView:self.superview animated:YES];
-                [QMUITips showSucceed:@"登录成功" inView:self.superview hideAfterDelay:1.5];
-                [_loginParam saveToLocal];
-//                [[AppDelegate sharedAppDelegate] registNotification];
-                [[IMAPlatform sharedInstance] configHost:_loginParam];
-                [IMAPlatform sharedInstance].didConnectSuccess = YES;
-                //电商
-                NSString *userID =  CNUserShareModel.uid;
-//                [[DSCnliveShopSDKManager sharedManager] loginUser:userID];
-                //设置APP已活跃
-                [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"is_Active_Application"];
-                [[NSUserDefaults standardUserDefaults] synchronize];
-                
-                
-                
-                if ([result[@"data"][@"isNewUser"] intValue] == 0) {
-                    //老用户
-//                    [[AppDelegate sharedAppDelegate] enterMainUI];
-//                    [[AppDelegate sharedAppDelegate] registNotification];
-                    [[IMAPlatform sharedInstance].contactMgr asyncUpdateContact];
-                    [[IMAPlatform sharedInstance].contactMgr saveGroupIdList:YES];
-                    [[IMAPlatform sharedInstance] configHost:_loginParam];
-                    [IMAPlatform sharedInstance].didConnectSuccess = YES;
-                    //电商
-                    NSString *userID =  CNUserShareModel.uid;
-//                    [[DSCnliveShopSDKManager sharedManager] loginUser:userID];
-                    //设置APP已活跃
-                    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"is_Active_Application"];
-                    [[NSUserDefaults standardUserDefaults] synchronize];
-                    
-                }
-                else {
-                    //新用户
-//                    [OpenInstallSDK reportRegister];
-//                    CNLoginIUsernfoViewController *vc = [[CNLoginIUsernfoViewController alloc] init];
-//                    NSString *tel = _accountTextF.text;
-//                    if(_accountTextF.text.length == 11){
-//                        tel = [_accountTextF.text stringByReplacingCharactersInRange:NSMakeRange(3, 4) withString:@"XXXX"];
-//                    }
-//                    NSLog(@"tel:%@",tel);
-//                    vc.mobileStr = tel;
-//                    [self presentViewController:vc animated:NO completion:NULL];
-                }
-//                [[NSNotificationCenter defaultCenter] postNotificationName:kCNLive_LoginSuccess object:nil];
-
-//                [CNDSShopActionViewModel networkParamAction];
-                
-                [[IMAPlatform sharedInstance].host asyncSetAllowType:TIM_FRIEND_NEED_CONFIRM succ:^{
-                    NSLog(@"asyncSetAllowType Suc");
-                    [_loginParam saveToLocal];
-                    
-                } fail:^(int code, NSString *msg) {
-                    NSLog(@"asyncSetAllowType failed : %@", msg);
-                }];
-    //            [self dismissViewControllerAnimated:YES completion:nil];
-                
-            } fail:^(int code, NSString *msg) {
-                NSLog(@"login failed : %@", msg);
-                if (code == 6208) {
-                    //离线被踢下线重新登录
-//                    [weakSelf resumeLogin];
-                }
-                else
-                    [QMUITips showError:msg inView:self.superview hideAfterDelay:1.5];
-                [QMUITips hideAllToastInView:self.superview animated:YES];
-            }];
-            
-        } failedBlock:^(int code, NSString *errorMsg) {
-            NSLog(@"token code:%d     error:%@", code, errorMsg);
-            [QMUITips hideAllToastInView:self.superview animated:YES];
-
-        }];
-    
+    // YES 新用户   NO 老用户
+    BOOL isNewUser = [dic[@"isNewUser"] intValue] != 0;
+    if (self.delegate && [self.delegate respondsToSelector:@selector(loginSuccess:isNewUser:result:)]) {
+        [self.delegate loginSuccess:self isNewUser:isNewUser result:result];
+    }
 }
 @end