no message

zhangxiaowen
1 parent d9415ff5
Showing 5 changed files with 99 additions and 81 deletions
CNLiveSettingModule.podspec
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelController.m
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.h
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.m
Example/CNLiveSettingModule.xcodeproj/project.pbxproj
@@ -111,6 +111,7 @@ TODO: 网家家-设置模块.
   # s.dependency 'AFNetworking', '~> 2.3'
   # pod
+  s.dependency 'CNLiveSDKs/CNLiveUserSystemSDK', '~> 0.3.1.3' #GitHub所以指定版本号
   s.dependency 'CNLiveTripartiteManagement/QMUIKit'
   s.dependency 'CNLiveTripartiteManagement/SDWebImage'
   s.dependency 'CNLiveTripartiteManagement/Masonry'
@@ -146,4 +147,6 @@ TODO: 网家家-设置模块.
   s.dependency 'CNLiveCommonClass'
+  s.static_framework = true
+
 end
@@ -12,6 +12,7 @@
 #import <Masonry/Masonry.h>
 #import "QMUIKit.h"
+#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 #import "CNUserInfoManager.h"
 #import "NSString+CNLiveExtension.h"
@@ -20,13 +21,13 @@
 //@interface CNLiveUpdateTelController ()<UITextFieldDelegate,SelectCountriesDelegate>{
-@interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveSettingNavigationBarDelegate>{
+@interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveSettingNavigationBarDelegate, CNLiveUpdateTelViewDelegate>{
     NSString * _code;
 }
 @property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveUpdateTelView *updateTelView;//背景
-@property (nonatomic, strong) UIButton *changeBtn;//改变按钮
+@property (nonatomic, strong) UIButton *binding;//改变按钮
 @property (nonatomic, strong) YYLabel *connectionLab;
 @end
@@ -83,7 +84,7 @@
 - (void)createSubViews{
     [self.view addSubview:self.navigationBar];
     [self.view addSubview:self.updateTelView];
-    [self.view addSubview:self.changeBtn];
+    [self.view addSubview:self.binding];
     [self.view addSubview:self.connectionLab];
 }
@@ -93,7 +94,7 @@
         make.top.equalTo(self.view).offset(NavigationContentTop+1);
         make.height.mas_equalTo(150+10);
     }];
-    [self.changeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.binding mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.updateTelView.mas_bottom).offset(16);
         make.left.equalTo(self.view).offset(60);
         make.right.equalTo(self.view).offset(-60);
@@ -112,23 +113,22 @@
 }
 #pragma mark - Action
-- (void)compleBtnAction:(UIButton *)sender {
+- (void)bindingDidClicked:(UIButton *)sender {
     if (self.updateTelView.gotVerificationCode) {
         if (self.updateTelView.codeTF.text.length == 6) {
             [QMUITips showLoadingInView:self.view];
-//            [CNLiveUserSystemCenter updateMobileWithUid:CNUserShareModel.uid mobile:self.phoneNum countryCode:_codeStr verificationCode:self.codeTF.text success:^(id result) {
-//                CNUserShareModel.mobile = self.phoneNum;
-//                [CNUserInfoModel setLocalUserInfo:_countryName.text withKey:@"countryname"];
-//                [CNUserInfoModel setLocalUserInfo:_countryCode.text withKey:@"countrycode"];
-//                [QMUITips hideAllToastInView:self.view animated:YES];
-//                [[AppDelegate sharedAppDelegate] popViewController];
-//
-//            } failure:^(NSDictionary *errorDic) {
-//
-//                [QMUITips hideAllToastInView:self.view animated:YES];
-//                [QMUITips showError:errorDic[@"errorMessage"] inView:self.view hideAfterDelay:1.5];
-//
-//            }];
+            [CNLiveUserSystemCenter updateMobileWithUid:CNUserShareModel.uid mobile:self.updateTelView.phoneNum countryCode:_code verificationCode:self.updateTelView.codeTF.text success:^(id result) {
+                CNUserShareModel.mobile = self.updateTelView.phoneNum;
+                [CNUserInfoModel setLocalUserInfo:self.updateTelView.countryName.text withKey:@"countryname"];
+                [CNUserInfoModel setLocalUserInfo:self.updateTelView.countryCode.text withKey:@"countrycode"];
+                [QMUITips hideAllToastInView:self.view animated:YES];
+                [self.navigationController popViewControllerAnimated:YES];
+
+            } failure:^(NSDictionary *errorDic) {
+                [QMUITips hideAllToastInView:self.view animated:YES];
+                [QMUITips showError:errorDic[@"errorMessage"] inView:self.view hideAfterDelay:1.5];
+
+            }];
         } else {
             QMUIAlertAction *sure = [QMUIAlertAction actionWithTitle:@"我知道了" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
@@ -179,6 +179,13 @@
 //
 //}
+- (void)selectCountry:(CNLiveUpdateTelView *)view{
+    //    CNSelectCountriesViewController *vc = [[CNSelectCountriesViewController alloc]init];
+    //    vc.delegate = self;
+    //    vc.hidesBottomBarWhenPushed = YES;
+    //    [self presentViewController:vc animated:YES completion:nil];
+}
+
 #pragma mark - Lazy Loading
 - (CNLiveSettingNavigationBar *)navigationBar {
     if (!_navigationBar) {
@@ -195,30 +202,24 @@
     if (!_updateTelView) {
         _updateTelView = [[CNLiveUpdateTelView alloc] init];
         _updateTelView.backgroundColor = [UIColor whiteColor];
+        _updateTelView.delegate = self;
+        _updateTelView.code = _code;
     }
     return _updateTelView;
 }
-- (void)countryTap:(UITapGestureRecognizer *)tap{
-//    CNSelectCountriesViewController *vc = [[CNSelectCountriesViewController alloc]init];
-//    vc.delegate = self;
-//    vc.hidesBottomBarWhenPushed = YES;
-//    [self presentViewController:vc animated:YES completion:nil];
-    
-}
-
-- (UIButton *)changeBtn{
-    if (!_changeBtn) {
-        _changeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_changeBtn setTitle:@"验证后绑定新手机号" forState:UIControlStateNormal];
-        [_changeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        _changeBtn.titleLabel.font = [UIFont systemFontOfSize:15];
-        _changeBtn.backgroundColor = [UIColor colorWithRed:0/255.0 green:194/255.0 blue:0/255.0 alpha:1.0];
-        _changeBtn.layer.cornerRadius = 45/2.0;
-        _changeBtn.layer.masksToBounds = YES;
-        [_changeBtn addTarget:self action:@selector(compleBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+- (UIButton *)binding{
+    if (!_binding) {
+        _binding = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_binding setTitle:@"验证后绑定新手机号" forState:UIControlStateNormal];
+        [_binding setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        _binding.titleLabel.font = [UIFont systemFontOfSize:15];
+        _binding.backgroundColor = [UIColor colorWithRed:0/255.0 green:194/255.0 blue:0/255.0 alpha:1.0];
+        _binding.layer.cornerRadius = 45/2.0;
+        _binding.layer.masksToBounds = YES;
+        [_binding addTarget:self action:@selector(bindingDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     }
-    return _changeBtn;
+    return _binding;
 }
 - (YYLabel *)connectionLab {
@@ -11,17 +11,21 @@
 NS_ASSUME_NONNULL_BEGIN
 @class CNLiveUpdateTelView;
 @protocol CNLiveUpdateTelViewDelegate <NSObject>
-- (void)clickedCancellation:(CNLiveUpdateTelView *)view;
+- (void)selectCountry:(CNLiveUpdateTelView *)view;
 @end
 @interface CNLiveUpdateTelView : UIView
 @property (nonatomic, weak) id<CNLiveUpdateTelViewDelegate> delegate;
-@property (nonatomic, strong) UITextField *numberTF;//手机号tf
-@property (nonatomic, strong) UITextField *codeTF;//验证码tf
+
+@property (nonatomic, strong) UILabel *countryName;
+@property (nonatomic, strong) UILabel *countryCode;
+@property (nonatomic, strong) UITextField *numberTF;
+@property (nonatomic, strong) UITextField *codeTF;
 @property (nonatomic, assign) BOOL gotVerificationCode;
 @property (nonatomic, assign) BOOL gotVerificationCodeIng;
 @property (nonatomic, copy) NSString *phoneNum;
+@property (nonatomic, copy) NSString *code;
 @end
@@ -11,22 +11,18 @@
 #import <Masonry/Masonry.h>
 #import "QMUIKit.h"
+#import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 #import "NSString+CNLiveExtension.h"
 #import "CNUserInfoManager.h"
 #define TIMECOUNT 60;
 @interface CNLiveUpdateTelView()<UITextFieldDelegate>
-@property (nonatomic, strong) UILabel *countryName;//国家
-@property (nonatomic, strong) UILabel *countryCode;
+
 @property (nonatomic, strong) UILabel *interval;
 @property (nonatomic, strong) UIImageView *countryImg;
-
 @property (nonatomic, strong) UILabel *numberLabel;//手机号
-//@property (nonatomic, strong) UITextField *numberTF;//手机号tf
-
 @property (nonatomic, strong) UILabel *codeLabel;//验证码
-//@property (nonatomic, strong) UITextField *codeTF;//验证码tf
 @property (nonatomic, strong) UIButton *verificationCodeBtn;//验证码按钮
 @end
@@ -203,12 +199,11 @@ static const NSInteger margin = 15;
     }
     return _countryCode;
 }
+
 - (void)countryTap:(UITapGestureRecognizer *)tap{
-//    CNSelectCountriesViewController *vc = [[CNSelectCountriesViewController alloc]init];
-//    vc.delegate = self;
-//    vc.hidesBottomBarWhenPushed = YES;
-//    [self presentViewController:vc animated:YES completion:nil];
-    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(selectCountry:)]) {
+        [self.delegate selectCountry:self];
+    }
 }
 - (UILabel *)numberLabel {
@@ -290,14 +285,12 @@ static const NSInteger margin = 15;
     return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
 }
-
+- (void)setCode:(NSString *)code{
+    _code = code;
+}
 #pragma mark - Action
 - (void)verificationCodeBtnAction:(UIButton *)sender {
     if ([NSString isEmpty:self.numberTF.text] || [self.numberTF.text isWhitespaceAndNewlines]) {
-//        UIAlertController *con = [UIAlertController alertControllerWithTitle:@"提示" message:@"请输入正确的手机号码" preferredStyle:1];
-//        UIAlertAction *action = [UIAlertAction actionWithTitle:@"我知道了" style:1 handler:nil];
-//        [con addAction:action];
-//        [self presentViewController:con animated:YES completion:nil];
         QMUIAlertAction *sure = [QMUIAlertAction actionWithTitle:@"我知道了" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
         }];
         QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"请输入正确的手机号码" message:@"" preferredStyle:QMUIAlertControllerStyleAlert];
@@ -320,29 +313,29 @@ static const NSInteger margin = 15;
         [self.verificationCodeBtn setTitleColor:[UIColor colorWithRed:195/255.0 green:195/255.0 blue:195/255.0 alpha:1.0] forState:UIControlStateNormal];
         self.gotVerificationCodeIng = YES;
-//        [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeRegister mobile:self.numberTF.text countryCode:_codeStr success:^(id result) {
-//
-//            [QMUITips showWithText:@"短信发送成功" inView:self.view hideAfterDelay:1.5];
-//            self.gotVerificationCode = YES;
-//            [self countDown];
-//
-//        } failure:^(NSDictionary *errorDic) {
-//
-//            NSString *errMsg;
-//            if ([[NSString stringWithFormat:@"%@",errorDic[@"errorCode"]] isEqualToString:@"408"]) {
-//                errMsg = @"请填写正确的手机号";
-//            } else {
-//                errMsg = errorDic[@"errorMessage"];
-//            }
-//            [QMUITips showWithText:errMsg inView:self.view hideAfterDelay:1.5];
-//            self.phoneNum = nil;
-//            self.gotVerificationCode = NO;
-//            self.verificationCodeBtn.userInteractionEnabled = YES;
-//            self.verificationCodeBtn.backgroundColor = KGreen194Color;
-//            [self.verificationCodeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-//            self.gotVerificationCodeIng = NO;
-//
-//        }];
+        [CNLiveUserSystemCenter verificationCodeType:VerificationCodeTypeRegister mobile:self.numberTF.text countryCode:_code success:^(id result) {
+
+            [QMUITips showWithText:@"短信发送成功" inView:self hideAfterDelay:1.5];
+            self.gotVerificationCode = YES;
+            [self countDown];
+
+        } failure:^(NSDictionary *errorDic) {
+
+            NSString *errMsg;
+            if ([[NSString stringWithFormat:@"%@",errorDic[@"errorCode"]] isEqualToString:@"408"]) {
+                errMsg = @"请填写正确的手机号";
+            } else {
+                errMsg = errorDic[@"errorMessage"];
+            }
+            [QMUITips showWithText:errMsg inView:self hideAfterDelay:1.5];
+            self.phoneNum = nil;
+            self.gotVerificationCode = NO;
+            self.verificationCodeBtn.userInteractionEnabled = YES;
+            self.verificationCodeBtn.backgroundColor = [UIColor colorWithRed:0/255.0 green:194/255.0 blue:0/255.0 alpha:1.0];
+            [self.verificationCodeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+            self.gotVerificationCodeIng = NO;
+
+        }];
     }
 }
@@ -208,6 +208,7 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				6A7F75A7B7E637A2752F7EE5 /* [CP] Embed Pods Frameworks */,
+				17743842CB67A72F2519D76B /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -298,6 +299,24 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
+		17743842CB67A72F2519D76B /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveSettingModule/CNLiveSettingModule.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveSettingModule.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveSettingModule_Example/Pods-CNLiveSettingModule_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		653FED99FAD33AD7306D3799 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -338,7 +357,6 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveSettingModule/CNLiveSettingModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
@@ -365,7 +383,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveSettingModule.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",