no message

iOS-Xiaowen
1 parent b986563f
Showing 9 changed files with 175 additions and 133 deletions
CNLiveLoginModule.podspec
CNLiveLoginModule/Classes/Controller/CNLiveLoginController.m
CNLiveLoginModule/Classes/Model/CNLiveLoginRequest.m
CNLiveLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.m
CNLiveLoginModule/Classes/View/CNLiveCompleteInfoView.m
CNLiveLoginModule/Classes/View/CNLiveLoginView.m
Example/CNLiveLoginModule.xcodeproj/project.pbxproj
Example/CNLiveLoginModule/CNLIVEAppDelegate.m
Example/Podfile
@@ -70,7 +70,7 @@ TODO: 网家家-登录模块.
     'CNLiveLoginModule' => ['CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets']
   }
-  # s.public_header_files = 'Pod/Classes/**/*.h'
+#  s.public_header_files = 'CNLiveLoginModule/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   # pod
@@ -94,7 +94,7 @@
 #pragma mark - CNLiveLoginViewDelegate
 - (void)loginSuccess:(CNLiveLoginView *)view isNewUser:(BOOL)isNewUser result:(id _Nonnull)result{
-    if (isNewUser) {
+    if (!isNewUser) {
         // 新用户 -> 设置昵称和头像
         CNLiveCompleteInfoController *vc = [[CNLiveCompleteInfoController alloc]init];
         vc.hidesBottomBarWhenPushed = YES;
@@ -84,9 +84,7 @@ static const NSInteger timeValue = 1.5;
                         failed(31012, @"获取token失败");
                     }
                 }
-                
             }
-           
         }else{
             if (failed) failed(31012, @"获取token失败");
         }
@@ -97,7 +95,6 @@ static const NSInteger timeValue = 1.5;
 // 登录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) {
@@ -9,8 +9,13 @@
 #import "CNLiveBindingTelView.h"
 #import "YYKit.h"
 #import "QMUIKit.h"
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+
 #import "CNLiveCategory.h"
 #import "CNLiveEnvironment.h"
+#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
+#import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h>
+#import "CNUserInfoManager.h"
 #import "CNLiveLoginCountryView.h"
 #import "CNLiveLoginTextField.h"
@@ -31,6 +36,7 @@
 @end
 @implementation CNLiveBindingTelView
+#define XWKeyWindow [UIApplication sharedApplication].keyWindow
 static NSInteger const rowHeight = 40;
 static NSInteger const space = 40;
 static const NSInteger timeValue = 1.5;
@@ -209,33 +215,42 @@ static const NSInteger timeValue = 1.5;
 - (void)countDownButtonDidClick:(CNLiveCountDownButton *)button {
     //获取验证码
     if ([_account.text isEqualToString:@""]) {
-        [QMUITips showError:@"请输入手机号" inView:self.superview hideAfterDelay:timeValue];
+        [QMUITips showWithText:@"请输入手机号"];
         return;
     }
-    // 按钮点击后将enabled设置为NO
+    if(![CNLiveNetworking isNetworking]){
+        [QMUITips showError:@"无法连接网络" inView:XWKeyWindow hideAfterDelay:timeValue];
+        return ;
+    }
+    _code.text = @"";
+    [_code becomeFirstResponder];
+
     button.userInteractionEnabled = NO;
-    __weak typeof(self) weakSelf = self;
-//    [XWUserRequest verificationCodeWithType:XWCodeTypeShortcutLogin mobile:_account.text countryCode:_countryCode success:^(id  _Nonnull result) {
-//        __strong typeof(weakSelf) strongSelf = weakSelf;
-//        if(!strongSelf) return;
-//        // 获取的验证码
-//        strongSelf->_verificationCode = @"666666";
-//
-//        [XWAlertView alertSucceedViewWithTextMessage:@"获取成功" view:strongSelf.superview];
+    [QMUITips showLoadingInView:XWKeyWindow];
+    
+    [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeShortcutLogin mobile:_account.text countryCode:@"86" success:^(id result) {
+        [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
+        [QMUITips showWithText:@"验证码已发送"];
+        
 //        button.backgroundColor = HexColor(0xdedede);
-//        button.frame = CGRectMake(self.frame.size.width-110, self.account.bottom+space+10, 110, rowHeight-10);
-//        [button setImage:nil forState:UIControlStateNormal];
-//        NSString *title = [NSString stringWithFormat:@"%d秒后重新发送", 60];
-//        [button setTitle:title forState:UIControlStateNormal];
-//        [button startCountDown];
-//
-//    } failure:^(NSDictionary * _Nonnull errorDic) {
-//        __strong typeof(weakSelf) strongSelf = weakSelf;
-//        if(!strongSelf) return;
-//        button.userInteractionEnabled = YES;
-//        [XWAlertView alertErrorViewWithTextMessage:@"获取失败" view:strongSelf.superview];
-//
-//    }];
+        button.frame = CGRectMake(self.frame.size.width-110, self.account.bottom+space+10, 110, rowHeight-10);
+        [button setImage:nil forState:UIControlStateNormal];
+        NSString *title = [NSString stringWithFormat:@"%d秒后重新发送", 60];
+        [button setTitle:title forState:UIControlStateNormal];
+        [button startCountDown];
+
+
+    } failure:^(NSDictionary *errorDic) {
+        [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
+        if ([errorDic[@"errorCode"] integerValue] == 408) {
+            [QMUITips showWithText:@"请输入正确的手机号"];
+        }
+        else{
+            [QMUITips showWithText:errorDic[@"errorMessage"]];
+        }
+        button.userInteractionEnabled = YES;
+
+    }];
 }
@@ -255,44 +270,92 @@ static const NSInteger timeValue = 1.5;
     button.backgroundColor = [UIColor whiteColor];
     button.userInteractionEnabled = YES;
     [button setTitle:@"" forState:UIControlStateNormal];
-    UIImage *image2 = [self getImageWithImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image2 = [self getImageWithImageName:Business?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [button setImage:image2 forState:UIControlStateNormal];
 }
 #pragma mark - Action
-- (void)codeDidClicked:(UIButton *)btn{
-    //获取验证码
-    if ([_account.text isEqualToString:@""]) {
-        [QMUITips showError:@"请输入手机号" inView:self.superview hideAfterDelay:timeValue];
+- (void)bindingDidClicked:(UIButton *)btn{
+    if ([self.account.text isEqualToString:@""]) {
+        [QMUITips showWithText:@"请输入手机号" inView:XWKeyWindow hideAfterDelay:1.5];
         return;
     }
-    __weak typeof(self) weakSelf = self;
-//    [XWUserRequest verificationCodeWithType:XWCodeTypeShortcutLogin mobile:_account.text countryCode:_countryCode success:^(id  _Nonnull result) {
-//        __strong typeof(weakSelf) strongSelf = weakSelf;
-//        if(!strongSelf) return;
-//        [XWAlertView alertSucceedViewWithTextMessage:@"获取成功" view:strongSelf.superview];
-//        strongSelf->_verificationCode = @"666666";
-//
-//    } failure:^(NSDictionary * _Nonnull errorDic) {
-//        __strong typeof(weakSelf) strongSelf = weakSelf;
-//        if(!strongSelf) return;
-//        [XWAlertView alertErrorViewWithTextMessage:@"获取失败" view:strongSelf.superview];
-//
-//    }];
+    if ([self.code.text isEqualToString:@""]) {
+        [QMUITips showWithText:@"请输入验证码" inView:XWKeyWindow hideAfterDelay:1.5];
+        return;
+    }
+    [self endEditing:YES];
+    if(![CNLiveNetworking isNetworking]){
+        [QMUITips showError:@"无法连接网络" inView:XWKeyWindow hideAfterDelay:1.5];
+        return ;
+    }
+    btn.userInteractionEnabled = NO;
+    // 绑定手机号请求登录
+    [self thirdPartyLoginBindingTel];
 }
-- (void)bindingDidClicked:(UIButton *)btn{
+// 绑定手机号请求登录
+- (void)thirdPartyLoginBindingTel{
+    NSDictionary *params = @{
+                             @"mobile":self.account.text,
+//                             @"countryCode":self.model.countryCode?self.model.countryCode:@"",
+//                             @"verificationCode":self.code.text,
+//                             @"thirdPartyPlat":self.model.thirdPartyPlat?self.model.thirdPartyPlat:@"",
+//                             @"thirdPartyId":self.model.thirdPartyId?self.model.thirdPartyId:@"",
+//                             @"frmId":self.model.frmId?self.model.frmId:@"",
+//                             @"clientPlat":@"i",
+//                             @"nickName":self.model.nickName?self.model.nickName:@"",
+//                             @"gender":self.model.gender?self.model.gender:@"",
+//                             @"location":self.model.location?self.model.location:@"",
+//                             @"faceUrl":self.model.faceUrl?self.model.faceUrl:@""
+                             };
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    
+    [QMUITips showLoadingInView:XWKeyWindow];
+    __weak typeof(self) weakSelf = self;
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNLoginIn3rdAndMobileForWJJUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
+        strongSelf.binding.userInteractionEnabled = YES;
+        if (error.code == -1001 || error.code == -1009) {
+            [QMUITips showError:@"无法连接网络" inView:XWKeyWindow hideAfterDelay:1.5];
+            return ;
+        }
+        if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            
+            // 给用户库使用
+            NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+            [userDefaults setObject:responseObject[@"data"][@"token"] forKey:@"CNLiveAuthToken"];
+            [userDefaults setObject:responseObject[@"data"][@"uid"] forKey:@"CNLiveUserSid"];
+            [userDefaults synchronize];
+            
+            //登录成功,连接IM
+            [strongSelf connectionIM:responseObject[@"data"]];
+        }
+        else if ([responseObject isKindOfClass:[NSDictionary class]]) {
+            [QMUITips showError:responseObject[@"errorMessage"] inView:XWKeyWindow hideAfterDelay:1.5];
+        }
+        else{
+            [QMUITips showError:@"登录失败" inView:XWKeyWindow hideAfterDelay:1.5];
+        }
+        
+    }];
+    
+}
+- (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];
     if (self.delegate && [self.delegate respondsToSelector:@selector(bindingSuccess:type:)]) {
         [self.delegate bindingSuccess:self type:self.type];
     }
-//    [XWUserRequest thirdPartyLoginBindingWithUserName:_account.text verificationCode:_code.text countryCode:_countryCode model:User_Model fromId:nil success:^(id _Nonnull result) {
-//
-//    } failure:^(NSDictionary * _Nonnull errorDic) {
-//
-//    }];
-    
 }
-
 @end
@@ -89,7 +89,8 @@ static const NSInteger timeValue = 1.5;
     [next setTitle:@"下一步" forState:UIControlStateNormal];
     [next setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     next.titleLabel.font = [UIFont systemFontOfSize:15.0];
-    next.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+    UIColor *color = Business?[UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0]:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+    next.backgroundColor = color;
     next.layer.cornerRadius = 20;
     next.layer.masksToBounds = YES;
     next.adjustsImageWhenHighlighted = NO;
@@ -216,8 +217,9 @@ static const NSInteger timeValue = 1.5;
     [alertController addAction:cancel];
     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];
+    UIColor *color = Business?[UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0]:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+
+    titleAttributs[NSForegroundColorAttributeName] = color;
     NSMutableDictionary *cancelAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
     cancelAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
@@ -243,65 +245,85 @@ static const NSInteger timeValue = 1.5;
     }
     self.next.userInteractionEnabled = NO;
     [self.superview endEditing:YES];
-    [self modifyIcon];
+    [self modifyNickName];
 }
-// 修改头像
-- (void)modifyIcon {
+// 修改名字
+- (void)modifyNickName {
     [QMUITips showLoading:@"修改中" inView:self.superview];
-    [CNLiveUserSystemCenter uploadIconWithUid:CNUserShareModel.uid icon:_image success:^(id result) {
-        [QMUITips hideAllToastInView:self.superview animated:YES];
-        NSLog(@"result:%@",result);
-        NSString *deFaceUrl = result[@"data"][@"faceUrl"];
-        NSString *faceUrl = @"";
-        if ([deFaceUrl containsString:@"/mobile/images/mobilehead/default/"]) {
-            faceUrl = CNLiveNetAddDefaultHead;
+    __weak typeof(self) weakSelf = self;
+    [CNLiveUserSystemCenter modifyUserInfoType:UserInfoTypeNickName uid:CNUserShareModel.uid modifyInfo:_nickname.text success:^(id result) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        strongSelf.next.userInteractionEnabled = YES;
+        CNUserShareModel.nickname = strongSelf.nickname.text;
+        [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
+        
+        if (!strongSelf->_image) {
+            [strongSelf connectionIM:result];
+
         }else{
-            faceUrl = deFaceUrl;
+            [strongSelf modifyIcon];
         }
-        CNUserShareModel.faceUrl = faceUrl;
-        [self modifyNickName];
-
+        
     } failure:^(NSDictionary *errorDic) {
-        [QMUITips hideAllToastInView:self.superview animated:YES];
-        [QMUITips showError:errorDic[@"errorMessage"] inView:self.superview hideAfterDelay:timeValue];
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        strongSelf.next.userInteractionEnabled = YES;
+        [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
+        [QMUITips showError:[errorDic objectForKey:@"errorMessage"] inView:strongSelf.superview hideAfterDelay:timeValue];
     }];
 }
-// 修改名字
-- (void)modifyNickName {
+// 修改头像
+- (void)modifyIcon {
     [QMUITips showLoading:@"修改中" inView:self.superview];
     __weak typeof(self) weakSelf = self;
-    [CNLiveUserSystemCenter modifyUserInfoType:UserInfoTypeNickName uid:CNUserShareModel.uid modifyInfo:_nickname.text success:^(id result) {
+    [CNLiveUserSystemCenter uploadIconWithUid:CNUserShareModel.uid icon:_image success:^(id result) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
         strongSelf.next.userInteractionEnabled = YES;
-        CNUserShareModel.nickname = strongSelf.nickname.text;
         [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
-        if (strongSelf.delegate && [strongSelf.delegate respondsToSelector:@selector(loginSuccess:result:)]) {
-            [strongSelf.delegate loginSuccess:strongSelf result:result];
+        NSLog(@"result:%@",result);
+        NSString *deFaceUrl = result[@"data"][@"faceUrl"];
+        NSString *faceUrl = @"";
+        if ([deFaceUrl containsString:@"/mobile/images/mobilehead/default/"]) {
+            faceUrl = CNLiveNetAddDefaultHead;
+        }else{
+            faceUrl = deFaceUrl;
         }
-        
-        [strongSelf connectionIM];
-        
+        CNUserShareModel.faceUrl = faceUrl;
+        [strongSelf connectionIM:result];
+
     } failure:^(NSDictionary *errorDic) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
         strongSelf.next.userInteractionEnabled = YES;
         [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
-        [QMUITips showError:[errorDic objectForKey:@"errorMessage"] inView:strongSelf.superview hideAfterDelay:timeValue];
+        [QMUITips showError:errorDic[@"errorMessage"] inView:strongSelf.superview hideAfterDelay:timeValue];
     }];
 }
 // 连接IM
-- (void)connectionIM {
+- (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];
+    
     __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;
@@ -310,7 +332,7 @@ static const NSInteger timeValue = 1.5;
         [QMUITips showError:msg inView:strongSelf.superview hideAfterDelay:timeValue];
     }];
-    
+
 }
 /*
@@ -141,24 +141,19 @@ static const NSInteger timeValue = 1.5;
 - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField{
     if ([textField isEqual:_account] || [textField isEqual:_code]) {
         return YES;
-        
     }
     else {
         return YES;
-        
     }
 }
 - (void)textFieldDidChange:(UITextField *)textField {
     if (![_account.text isEqualToString:@""] && ![_code.text isEqualToString:@""]) {
         _login.enabled = YES;
-        
     }
     else {
         _login.enabled = NO;
-        
     }
-    
 }
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
@@ -234,12 +229,9 @@ static const NSInteger timeValue = 1.5;
 - (void)chooseCountryName:(NSString *)countryName countryCode:(NSString *)countryCode{
     [_account resignFirstResponder];
     [_code resignFirstResponder];
-
     if(![_countryCode isEqualToString:countryCode]){
         _countryCode = countryCode;
-
     }
-    
 }
 #pragma mark - CNLiveCountDownButton DataSource
 // 设置倒计时总秒数
@@ -305,7 +297,7 @@ static const NSInteger timeValue = 1.5;
     button.backgroundColor = [UIColor whiteColor];
     button.userInteractionEnabled = YES;
     [button setTitle:@"" forState:UIControlStateNormal];
-    UIImage *image2 = [self getImageWithImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image2 = [self getImageWithImageName:Business?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [button setImage:image2 forState:UIControlStateNormal];
 }
@@ -333,6 +325,7 @@ static const NSInteger timeValue = 1.5;
         btn.userInteractionEnabled = YES;
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
+        [QMUITips hideAllToastInView:XWKeyWindow animated:YES];
         // 连接IM
         [strongSelf connectionIM:result];
@@ -298,10 +298,12 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveLoginModule_Example/Pods-CNLiveLoginModule_Example-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveLoginModule/CNLiveLoginModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveLoginModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveUserAgreementManager.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -334,7 +336,6 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
 				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
@@ -369,7 +370,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
@@ -554,7 +554,7 @@
 				GCC_PREFIX_HEADER = "CNLiveLoginModule/CNLiveLoginModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveLoginModule/CNLiveLoginModule-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAddd.CNLiveLoginModule;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd;
 				PRODUCT_NAME = "登录模块";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
@@ -573,7 +573,7 @@
 				GCC_PREFIX_HEADER = "CNLiveLoginModule/CNLiveLoginModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveLoginModule/CNLiveLoginModule-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAddd.CNLiveLoginModule;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd;
 				PRODUCT_NAME = "登录模块";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
@@ -20,37 +20,13 @@
 {
     // Override point for customization after application launch.
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];//UIScreen mainScreen].bounds个人理解获取屏幕的硬件信息然后设置尺寸大小
-    
-    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
-    [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBusiness];
+    [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBusiness environmentType:CNLiveProductionAppStore];
     [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
      if ([CNUserShareManager isLogin]) {
          [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid];
      }
     [self networkParamAction];
-    [CNUserInfoManager saveUserinfoDic:@{
-        @"bigFaceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697.jpg",
-        @"countryCode":@"86",
-        @"email":@"",
-        @"extInfo":@"",
-        @"faceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697_small.jpg",
-        @"gender":@"m",
-        @"hUid":@"",
-        @"isNewUser":@"0",
-        @"location":@"北京市海淀区",
-        @"mobile":@"17600922519",
-        @"nickName":@"金帝",
-        @"platformId":@"769_jetj7bq525",
-        @"qqUid":@"",
-        @"renrenUid":@"",
-        @"sinaUid":@"",
-        @"token":@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj",
-        @"uid":@"10514405",
-        @"wxUid":@""
-    }];
-    [[NSUserDefaults standardUserDefaults] setObject:@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj" forKey:@"CNLiveAuthToken"];
-    
     CNLiveLoginController *vc = [[CNLiveLoginController alloc] init];
     vc.isShowClose = YES;
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
 use_frameworks!
 source 'https://github.com/CocoaPods/Specs.git'
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
-
+#com.cnlive.CNLiveNetAddd.CNLiveLoginModule
 platform :ios, '9.0'
 target 'CNLiveLoginModule_Example' do
@@ -9,13 +9,4 @@ target &#39;CNLiveLoginModule_Example&#39; do
   pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
   end
-  post_install do |installer|
-    installer.pods_project.targets.each do |target|
-      target.build_configurations.each do |config|
-        if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
-        end
-      end
-    end
-  end
 end