no message

iOS-Xiaowen
1 parent 278cc581
Showing 14 changed files with 156 additions and 314 deletions
CNLiveBLoginModule/Classes/Controller/CNLiveCompleteInfoController.m
CNLiveBLoginModule/Classes/Controller/CNLiveLoginController.h
CNLiveBLoginModule/Classes/Controller/CNLiveLoginController.m
CNLiveBLoginModule/Classes/Model/CNLiveClassifyOffsetManager.h
CNLiveBLoginModule/Classes/Model/CNLiveClassifyOffsetManager.m
CNLiveBLoginModule/Classes/Model/CNLiveLoginRequest.h
CNLiveBLoginModule/Classes/Model/CNLiveLoginRequest.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelController.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.h
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveThreeLoginView.m
CNLiveBLoginModule/Classes/View/CNLiveCompleteInfoView.m
CNLiveBLoginModule/Classes/View/CNLiveLoginView.m
Example/CNLiveBLoginModule.xcodeproj/project.pbxproj
@@ -13,7 +13,13 @@
 #import "YYKit.h"
 #import "CNLiveNavigationBar.h"
+#import "CNLiveCategory.h"
+#import "CNUserInfoManager.h"
+#import "CNLiveEnvironment.h"
+#import "CNLiveManager.h"
+
 #import "CNLiveCompleteInfoView.h"
+#import "CNLiveLoginRequest.h"
 @interface CNLiveCompleteInfoController()<CNLiveCompleteInfoViewDelegate>
 @property (nonatomic, strong) CNLiveCompleteInfoView *infoView;
@@ -85,4 +91,30 @@
     return _infoView;
 }
+#pragma mark - 连接IM
+- (void)connectionIM:(id)result{
+    NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:result[@"data"]];
+    NSString *faceUrl = [dic objectForKey:@"faceUrl"];
+    if ([faceUrl containsString:@"/mobile/images/mobilehead/default/"]) {
+        //网家家默认头像地址
+        [dic setValue:CNLiveNetAddDefaultHead forKey:@"faceUrl"];
+    }
+    [CNUserInfoManager saveUserinfoDic:dic];
+
+    // 连接IM
+    __weak typeof(self) weakSelf = self;
+    [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        // 进入tabbar
+        [CNLiveNotificationManager postNotificationName:CNLiveLoginSuccess object:nil];
+
+    } failed:^(int code, NSString * _Nonnull msg) {
+        // 错误逻辑
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+
+    }];
+}
+
 @end
@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 NS_ASSUME_NONNULL_BEGIN
+UIKIT_EXTERN NSString *const kCNLiveLoginSuccess;
 @interface CNLiveLoginController : UIViewController
 @property (nonatomic, assign) BOOL isShowClose;
@@ -17,6 +17,8 @@
 #import "CNUserInfoManager.h"
 #import "CNLiveEnvironment.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import "CNLiveBusinessTools.h"
+#import "CNLiveManager.h"
 #import "CNLiveLoginView.h"
 #import "CNLiveThreeLoginView.h"
@@ -35,6 +37,7 @@
 @end
 @implementation CNLiveLoginController
+NSString *const kCNLiveLoginSuccess = @"CNLiveLoginSuccess";
 #pragma mark - 生命周期
 - (void)viewWillAppear:(BOOL)animated{
@@ -104,15 +107,7 @@
         [self.navigationController pushViewController:vc animated:YES];
     }else{
-        // 老用户 -> home
-        [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
-            // 进入tabbar
-
-        } failed:^(int code, NSString * _Nonnull msg) {
-            // 错误逻辑
-
-        }];
-
+        [self connectionIM:result];
     }
 }
@@ -151,9 +146,6 @@
         model.faceUrl = userInfo.faceUrl;
         model.thirdPartyId = userInfo.thirdPartyId;
-//        model.countryName = strongSelf->_countryStr;
-//        model.countryCode = strongSelf->_codeStr;
-//        model.frmId = [CNTools getFrmId];
         switch (type) {
             case CNLiveSendAuthRespApple:
             {
@@ -176,11 +168,42 @@
             }
                 break;
         }
-        [strongSelf thirdPartyLoginWithType:type model:model];
+        if (type == CNLiveSendAuthRespApple) {
+            [strongSelf appleLogin:model];
+        }else {
+            [strongSelf thirdPartyLoginWithType:type model:model];
+        }
     }];
 }
+- (void)appleLogin:(CNLiveThreeLoginModel *)model{
+    NSDictionary *params = @{@"thirdPartyPlat":model.thirdPartyPlat?model.thirdPartyPlat:@"",
+                             @"thirdPartyId":model.thirdPartyId?model.thirdPartyId:@"",
+                             @"frmId":model.frmId?model.frmId:@"",
+                             @"clientPlat":@"i",
+                             @"nickName":model.nickName?model.nickName:@"",
+                             @"gender":model.gender?model.gender:@"",
+                             @"location":model.location?model.location:@"",
+                             @"faceUrl":model.faceUrl?model.faceUrl:@"",
+                             @"uuid":[CNLiveBusinessTools getUidForStat:[NSDate date]],
+                             @"appId":AppId};
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    
+    [QMUITips showLoadingInView:self.view];
+    __weak typeof(self) weakSelf = self;
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:@"https://api.cnlive.com/open/api2/user/loginIn3rdForWJJApple" Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        [QMUITips hideAllToastInView:strongSelf.view animated:YES];
+        if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            [strongSelf connectionIM:responseObject];
+        }
+
+    }];
+    
+}
 - (void)thirdPartyLoginWithType:(CNLiveSendAuthResp)type model:(CNLiveThreeLoginModel *)model{
     [QMUITips showLoadingInView:self.view];
@@ -196,10 +219,6 @@
             vc.block = ^(NSString * _Nonnull countryName, NSString * _Nonnull countryCode) {
                 __strong typeof(weakSelf) strongSelf = weakSelf;
                 if(!strongSelf) return;
-//                strongSelf->_mobileLocaLbl.text = countryName;
-//                strongSelf->_countryStr = countryName;
-//                strongSelf->_countryLbl.text = [NSString stringWithFormat:@"+%@",countryCode];
-//                strongSelf->_codeStr = countryCode;
             };
             vc.hidesBottomBarWhenPushed = YES;
             [strongSelf presentViewController:vc animated:YES completion:nil];
@@ -213,17 +232,7 @@
             [userDefaults setObject:responseObject[@"data"][@"uid"] forKey:@"CNLiveUserSid"];
             [userDefaults synchronize];
-            // 连接IM
-            __weak typeof(strongSelf) weakSelf = strongSelf;
-            [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
-                // 进入tabbar
-
-            } failed:^(int code, NSString * _Nonnull msg) {
-                // 错误逻辑
-                __strong typeof(weakSelf) strongSelf = weakSelf;
-                if(!strongSelf) return;
-
-            }];
+            [strongSelf connectionIM:responseObject];
         }
         else if ([responseObject isKindOfClass:[NSDictionary class]] ) {
@@ -271,4 +280,30 @@
 }
+#pragma mark - 连接IM
+- (void)connectionIM:(id)result{
+    NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:result[@"data"]];
+    NSString *faceUrl = [dic objectForKey:@"faceUrl"];
+    if ([faceUrl containsString:@"/mobile/images/mobilehead/default/"]) {
+        //网家家默认头像地址
+        [dic setValue:CNLiveNetAddDefaultHead forKey:@"faceUrl"];
+    }
+    [CNUserInfoManager saveUserinfoDic:dic];
+
+    // 连接IM
+    __weak typeof(self) weakSelf = self;
+    [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        // 进入tabbar
+        [CNLiveNotificationManager postNotificationName:CNLiveLoginSuccess object:nil];
+
+    } failed:^(int code, NSString * _Nonnull msg) {
+        // 错误逻辑
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+
+    }];
+}
+
 @end
-//
-//  CNLiveClassifyOffsetManager.h
-//  CNLiveLoginModule
-//
-//  Created by CNLive-zxw on 2019/3/27.
-//  Copyright © 2019年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNLiveClassifyOffsetManager : NSObject
-+ (instancetype)manager;
-
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNLiveClassifyOffsetManager.m
-//  CNLiveLoginModule
-//
-//  Created by CNLive-zxw on 2019/3/27.
-//  Copyright © 2019年 cnlive. All rights reserved.
-//
-
-#import "CNLiveClassifyOffsetManager.h"
-
-@interface CNLiveClassifyOffsetManager ()
-
-@end
-
-@implementation CNLiveClassifyOffsetManager
-#pragma mark - 单例
-+ (instancetype)manager {
-    static CNLiveClassifyOffsetManager *_singleton = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        //不能再使用alloc方法
-        //因为已经重写了allocWithZone方法，所以这里要调用父类的分配空间的方法
-        _singleton = [[super allocWithZone:NULL] init];
-    });
-    return _singleton;
-    
-}
-
-// 防止外部调用alloc 或者 new
-+ (instancetype)allocWithZone:(struct _NSZone *)zone {
-    return [CNLiveClassifyOffsetManager manager];
-    
-}
-
-// 防止外部调用copy
-- (id)copyWithZone:(nullable NSZone *)zone {
-    return [CNLiveClassifyOffsetManager manager];
-    
-}
-
-// 防止外部调用mutableCopy
-- (id)mutableCopyWithZone:(nullable NSZone *)zone {
-    return [CNLiveClassifyOffsetManager manager];
-    
-}
-
-@end
@@ -14,12 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)manager;
-- (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)resumeLogin;
 @end
@@ -9,39 +9,22 @@
 #import "CNLiveLoginRequest.h"
 #import <UIKit/UIKit.h>
 #import "QMUIKit.h"
-
+#import <CNLiveBServices/CNLiveBServices.h>
 #import "CNLiveEnvironment.h"
-#import <CNLiveRequestBastKit/CNLiveNetworking.h>
-#import "TIMAdapter.h"
-#import "CommonLibrary.h"
-
-#import "NBSAppAgent.h"
-#import "CNLiveBusinessTools.h"
 @interface CNLiveLoginRequest()
-@property (nonatomic, strong) IMALoginParam *loginParam;
 @end
 @implementation CNLiveLoginRequest
-static const NSInteger timeValue = 1.5;
-#define XWKeyWindow [UIApplication sharedApplication].keyWindow
+//static const NSInteger timeValue = 1.5;
+//#define XWKeyWindow [UIApplication sharedApplication].keyWindow
 #pragma mark - 单例
 + (instancetype)manager {
     static CNLiveLoginRequest *_singleton = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         _singleton = [[super allocWithZone:NULL] init];
-        BOOL isAutoLogin = [IMAPlatform isAutoLogin];
-
-        if (isAutoLogin) {
-            _singleton.loginParam = [IMALoginParam loadFromLocal];
-           
-        } else {
-            _singleton.loginParam = [[IMALoginParam alloc] init];
-       
-        }
-        [IMAPlatform configWith:_singleton.loginParam.config];
     });
     return _singleton;
@@ -63,134 +46,12 @@ static const NSInteger timeValue = 1.5;
     return [CNLiveLoginRequest manager];
 }
-// 获取token
-- (void)getTIMLoginToken:(NSString *)identifier success:(void (^)(NSString * token))success failed:(void (^)(int code, NSString * msg))failed{
-    NSDictionary *params = @{@"appId":AppId,
-                             @"plat":@"i",
-                             @"sdkAppId":SdkAppId,
-                             @"identifier":identifier};
-    [CNLiveNetworking setupShowDataResult:NO];
-    [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:[NSDictionary class]] && [[responseObject allKeys] containsObject:@"data"] && [[responseObject objectForKey:@"data"] isKindOfClass:[NSDictionary class]]) {
-                NSNumber *code = responseObject[@"errorCode"];
-                if (code && code.intValue == 0) {
-                    if (success) {
-                        success(responseObject[@"data"][@"token"]);
-                    }
-                } else {
-                    if (failed) {
-                        failed(31012, @"获取token失败");
-                    }
-                }
-            }
-        }else{
-            if (failed) failed(31012, @"获取token失败");
-        }
-    }];
-    
-}
-
 // 登录IM
 - (void)loginTIM:(NSString *)uid success:(void (^)(void))success failed:(void (^)(int code, NSString * msg))failed{
-    [QMUITips showLoading:@"正在连接服务器..." inView:XWKeyWindow];
-    // 1.获取token
-    [self getTIMLoginToken:uid success:^(NSString * _Nonnull token) {
-        
-        self.loginParam.identifier = uid;
-        self.loginParam.userSig = token;
-        self.loginParam.tokenTime = [[NSDate date] timeIntervalSince1970];
-        
-        // 2.登录im
-        [[IMAPlatform sharedInstance] login:self.loginParam succ:^{
-            [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
-
-            [self.loginParam saveToLocal];
-                        
-            [[IMAPlatform sharedInstance].contactMgr asyncUpdateContact];
-            [[IMAPlatform sharedInstance].contactMgr saveGroupIdList:YES];
-            [[IMAPlatform sharedInstance] configHost:self.loginParam];
-            [IMAPlatform sharedInstance].didConnectSuccess = YES;
-            
-            // 听云
-            [NBSAppAgent setUserIdentifier:[CNLiveBusinessTools getSidIdfv]];
-            
-            [QMUITips showSucceed:@"登录成功" inView:XWKeyWindow 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);
-                
-            }];
-            
-        } fail:^(int code, NSString *msg) {
-            NSLog(@"login failed : %@", msg);
-            [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
-            if (code == 6208) {
-                // 离线被踢下线重新登录
-                [self resumeLogin];
-            }
-            else{
-                [QMUITips showError:msg inView:XWKeyWindow hideAfterDelay:timeValue];
-                failed?failed(code, msg):@"";
-            }
-        }];
-        
-    } failed:^(int code, NSString * _Nonnull msg) {
-        NSLog(@"token code:%d     msg:%@", code, msg);
-        [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
-        [QMUITips showError:msg inView:XWKeyWindow hideAfterDelay:timeValue];
-        failed?failed(code, msg):@"";
-        
-    }];
-    
+    id<CNLiveBMessageServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveBMessageServiceProtocol)];
+    [service loginIM:uid appId:AppId sdkAppId:SdkAppId appKey:APPKey busiId:IM_Cer_BusiId];
+    success?success():@"";
 }
-// 如果遇到离线被踢下线重新登录
-- (void)resumeLogin {
-    __weak typeof(self)weakSelf = self;
-    [[IMAPlatform sharedInstance] login:self.loginParam succ:^{
-        [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
-        [QMUITips showSucceed:@"登录成功" inView:XWKeyWindow 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
@@ -17,7 +17,7 @@
 #import "CNLiveNavigationBar.h"
 #import "CNLiveBindingTelView.h"
-@interface CNLiveBindingTelController()<CNLiveBindingTelViewDelegate>
+@interface CNLiveBindingTelController()
 @property (nonatomic, assign) CNLiveThreeLoginType type;
 @property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
@@ -59,11 +59,6 @@
     [self.view endEditing:YES];
 }
-#pragma mark - CNLiveBindingTelViewDelegate
-- (void)bindingSuccess:(CNLiveBindingTelView *)view type:(CNLiveThreeLoginType)type{
-
-}
-
 /*
 #pragma mark - Navigation
@@ -92,7 +87,6 @@
 - (CNLiveBindingTelView *)bindingTelView {
     if (!_bindingTelView) {
         _bindingTelView = [[CNLiveBindingTelView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop, self.view.frame.size.width*3/4.0, 400) type:self.type];
-        _bindingTelView.delegate = self;
     }
     return _bindingTelView;
 }
@@ -11,14 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
-@class CNLiveBindingTelView;
-@protocol CNLiveBindingTelViewDelegate <NSObject>
-- (void)bindingSuccess:(CNLiveBindingTelView *)view type:(CNLiveThreeLoginType)type;
-
-@end
-
 @interface CNLiveBindingTelView : UIView
-@property (nonatomic, weak) id<CNLiveBindingTelViewDelegate> delegate;
 - (instancetype)initWithFrame:(CGRect)frame type:(CNLiveThreeLoginType)type;
 @end
@@ -16,10 +16,12 @@
 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 #import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h>
 #import "CNUserInfoManager.h"
+#import "CNLiveManager.h"
 #import "CNLiveLoginCountryView.h"
 #import "CNLiveLoginTextField.h"
 #import "CNLiveCountDownButton.h"
+#import "CNLiveLoginRequest.h"
 @interface CNLiveBindingTelView()<UITextFieldDelegate,CNLiveCountDownButtonDataSource, CNLiveCountDownButtonDelegate>
 {
@@ -353,9 +355,20 @@ static const NSInteger timeValue = 1.5;
         [dic setValue:CNLiveNetAddDefaultHead forKey:@"faceUrl"];
     }
     [CNUserInfoManager saveUserinfoDic:dic];
-    if (self.delegate && [self.delegate respondsToSelector:@selector(bindingSuccess:type:)]) {
-        [self.delegate bindingSuccess:self type:self.type];
-    }
+    // 连接IM
+    __weak typeof(self) weakSelf = self;
+    [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        // 进入tabbar
+        [CNLiveNotificationManager postNotificationName:CNLiveLoginSuccess object:nil];
+
+    } failed:^(int code, NSString * _Nonnull msg) {
+        // 错误逻辑
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+
+    }];
 }
 @end
@@ -11,6 +11,7 @@
 #import "CNLiveCategory.h"
 #import "CNLiveShareImageManager.h"
 #import "WXApi.h"
+#import <AuthenticationServices/AuthenticationServices.h>
 @interface CNLiveThreeLoginView()
@@ -58,20 +59,30 @@ static NSInteger const rowHeight = 60;
     CGFloat btnWidth = width/number*1.0;
     for(int i = 0; i < pics.count; i++){
-        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
-        btn.tag = 10000+i;
-        btn.frame = CGRectMake(btnWidth*i, name.bottom, btnWidth, rowHeight);
-        if (@available(iOS 13, *)) {
-            if (i == pics.count-1) {
-                btn.frame = CGRectMake(btnWidth*i, name.bottom, 2*btnWidth, rowHeight);
-            }
+        // 苹果登录在最后一个
+        if (i == pics.count-1) {
+            if (@available(iOS 13, *)) {
+                ASAuthorizationAppleIDButton *btn = [ASAuthorizationAppleIDButton buttonWithType:ASAuthorizationAppleIDButtonTypeDefault style:ASAuthorizationAppleIDButtonStyleWhite];
+                btn.tag = 10000+i;
+                btn.layer.masksToBounds = YES;
+                btn.layer.cornerRadius = 18.0;
+                btn.layer.borderWidth = 1.0;
+                btn.layer.borderColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0].CGColor;
+                btn.frame = CGRectMake(btnWidth*i, name.bottom+12, 2*btnWidth, 36);
+                [btn addTarget:self action:@selector(btnDidClicked:)  forControlEvents:UIControlEventTouchUpInside];
+                [self addSubview:btn];
+             }
+            
+        }else {
+            UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+            btn.tag = 10000+i;
+            btn.frame = CGRectMake(btnWidth*i, name.bottom, btnWidth, rowHeight);
+            UIImage *image = [self getImageWithImageName:pics[i] bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+            [btn setImage:image forState:UIControlStateNormal];
+            btn.adjustsImageWhenHighlighted = NO;
+            [btn addTarget:self action:@selector(btnDidClicked:)  forControlEvents:UIControlEventTouchUpInside];
+            [self addSubview:btn];
         }
-        UIImage *image = [self getImageWithImageName:pics[i] bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
-        [btn setImage:image forState:UIControlStateNormal];
-        btn.adjustsImageWhenHighlighted = NO;
-        [btn addTarget:self action:@selector(btnDidClicked:)  forControlEvents:UIControlEventTouchUpInside];
-        [self addSubview:btn];
-        
     }
 }
@@ -260,8 +260,7 @@ static const NSInteger timeValue = 1.5;
         [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
         if (!strongSelf->_image) {
-            [strongSelf connectionIM:result];
-
+            [strongSelf callback:result];
         }else{
             [strongSelf modifyIcon];
         }
@@ -294,7 +293,7 @@ static const NSInteger timeValue = 1.5;
             faceUrl = deFaceUrl;
         }
         CNUserShareModel.faceUrl = faceUrl;
-        [strongSelf connectionIM:result];
+        [strongSelf callback:result];
     } failure:^(NSDictionary *errorDic) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
@@ -306,32 +305,12 @@ static const NSInteger timeValue = 1.5;
 }
-// 连接IM
-- (void)connectionIM:(id)result{
-    NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:result[@"data"]];
-    NSString *faceUrl = [dic objectForKey:@"faceUrl"];
-    if ([faceUrl containsString:@"/mobile/images/mobilehead/default/"]) {
-        //网家家默认头像地址
-        [dic setValue:CNLiveNetAddDefaultHead forKey:@"faceUrl"];
+// 回调
+- (void)callback:(id)result{
+    // 进入tabbar
+    if (self.delegate && [self.delegate respondsToSelector:@selector(loginSuccess:result:)]) {
+        [self.delegate loginSuccess:self result:result];
     }
-    [CNUserInfoManager saveUserinfoDic:dic];
-    
-    __weak typeof(self) weakSelf = self;
-    [[CNLiveLoginRequest manager] loginTIM:CNUserShareModel.uid success:^{
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-         if(!strongSelf) return;
-        // 进入tabbar
-        if (strongSelf.delegate && [strongSelf.delegate respondsToSelector:@selector(loginSuccess:result:)]) {
-            [strongSelf.delegate loginSuccess:strongSelf result:result];
-        }
-        
-    } failed:^(int code, NSString * _Nonnull msg) {
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-         if(!strongSelf) return;
-        // 错误逻辑
-        [QMUITips showError:msg inView:strongSelf.superview hideAfterDelay:timeValue];
-
-    }];
 }
@@ -327,7 +327,7 @@ static const NSInteger timeValue = 1.5;
         if(!strongSelf) return;
         [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
         // 连接IM
-        [strongSelf connectionIM:result];
+        [strongSelf callback:result];
     } failure:^(NSDictionary *errorDic) {
         btn.userInteractionEnabled = YES;
@@ -338,18 +338,11 @@ static const NSInteger timeValue = 1.5;
     }];
 }
-#pragma mark - 连接IM
-- (void)connectionIM:(id)result{
+#pragma mark - 回调
+- (void)callback:(id)result{
     NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:result[@"data"]];
-    NSString *faceUrl = [dic objectForKey:@"faceUrl"];
-    if ([faceUrl containsString:@"/mobile/images/mobilehead/default/"]) {
-        //网家家默认头像地址
-        [dic setValue:CNLiveNetAddDefaultHead forKey:@"faceUrl"];
-    }
-    [CNUserInfoManager saveUserinfoDic:dic];
-
-    // YES 新用户   NO 老用户
     BOOL isNewUser = [dic[@"isNewUser"] intValue] != 0;
+    // YES 新用户   NO 老用户
     if (self.delegate && [self.delegate respondsToSelector:@selector(loginSuccess:isNewUser:result:)]) {
         [self.delegate loginSuccess:self isNewUser:isNewUser result:result];
     }
@@ -585,7 +585,7 @@
 				GCC_PREFIX_HEADER = "CNLiveBLoginModule/CNLiveBLoginModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveBLoginModule/CNLiveBLoginModule-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetPlusBusiness;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -603,7 +603,7 @@
 				GCC_PREFIX_HEADER = "CNLiveBLoginModule/CNLiveBLoginModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveBLoginModule/CNLiveBLoginModule-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetPlusBusiness;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;