no message

iOS-Xiaowen
1 parent e6662811
Showing 2 changed files with 32 additions and 48 deletions
CNLiveScioLive/Pages/Login/Controller/CNLiveLoginViewController.m
CNLiveScioLive/Pages/Login/View/CNLiveThirdLoginView.m
@@ -285,8 +285,6 @@
                 [self networkParamAction];
                 [self signInWithApple];
             }
-//            type = SSDKPlatformTypeSinaWeibo;
-//            plat = @"5";
             return;
             break;
         default:
@@ -299,25 +297,7 @@
                 // 准备登录参数
                 [CNLiveUserSystemCenter thirdPartyLoginWithThirdPartyPlatType:plat thirdPartyId:user.uid nickName:user.nickname gender:nil location:nil faceUrl:user.icon frmId:nil success:^(NSDictionary *result) {
                     if ([result[@"errorCode"] integerValue] == 0) {
-                                                
-                        ZXWUserInformation *share = [ZXWUserInformation shareZXWUserInformation];
-                        share.model = [[ZXWUserModel alloc] initWithDictionary:result[@"data"]];
-                        
-                        [[ZXWUserInformation shareZXWUserInformation] saveToken:result[@"data"][@"token"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_id:@""];
-                        [[ZXWUserInformation shareZXWUserInformation] setIsLoginSuccess:YES];
-                        
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_name:result[@"data"][@"nickName"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_pwd:self->_pwd.textField.text];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_phone:result[@"data"][@"mobile"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_email:result[@"data"][@"email"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_headimgUrlString:result[@"data"][@"faceUrl"]];
-                        [[NSNotificationCenter defaultCenter] postNotificationName:LoginSuccessful object:nil];
-
-                        [AlertViewTool showHUDViewText:CustomStr(@"LoginSuccess") block:^{
-                            [self goBack];
-
-                        }];
+                        [self saveUserInfo:result];
  
                     } else {
                         [AlertViewTool showHUDViewText:CustomStr(@"LoginFailure")];
@@ -348,6 +328,26 @@
         }
     }];
 }
+- (void)saveUserInfo:(NSDictionary *)result{
+    ZXWUserInformation *share = [ZXWUserInformation shareZXWUserInformation];
+     share.model = [[ZXWUserModel alloc] initWithDictionary:result[@"data"]];
+     
+     [[ZXWUserInformation shareZXWUserInformation] saveToken:result[@"data"][@"token"]];
+     [[ZXWUserInformation shareZXWUserInformation] saveUser_id:@""];
+     [[ZXWUserInformation shareZXWUserInformation] setIsLoginSuccess:YES];
+     
+     [[ZXWUserInformation shareZXWUserInformation] saveUser_name:result[@"data"][@"nickName"]];
+     [[ZXWUserInformation shareZXWUserInformation] saveUser_pwd:self->_pwd.textField.text];
+     [[ZXWUserInformation shareZXWUserInformation] saveUser_phone:result[@"data"][@"mobile"]];
+     [[ZXWUserInformation shareZXWUserInformation] saveUser_email:result[@"data"][@"email"]];
+     [[ZXWUserInformation shareZXWUserInformation] saveUser_headimgUrlString:result[@"data"][@"faceUrl"]];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:LoginSuccessful object:nil];
+
+    [AlertViewTool showHUDViewText:CustomStr(@"LoginSuccess") block:^{
+        [self goBack];
+    }];
+}
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
     [self allResignFirstResponder];
  
@@ -377,13 +377,13 @@
         NSString *identityToken = [[NSString alloc] initWithData:credential.identityToken encoding:NSUTF8StringEncoding]; // access token
         ASUserDetectionStatus realUserStatus = credential.realUserStatus;
  
-        NSLog(@"state: %@", state);
-        NSLog(@"userID: %@", userID);
-        NSLog(@"fullName: %@", fullName);
-        NSLog(@"email: %@", email);
-        NSLog(@"authorizationCode: %@", authorizationCode);
-        NSLog(@"identityToken: %@", identityToken);
-        NSLog(@"realUserStatus: %@", @(realUserStatus));
+//        NSLog(@"state: %@", state);
+//        NSLog(@"userID: %@", userID);
+//        NSLog(@"fullName: %@", fullName);
+//        NSLog(@"email: %@", email);
+//        NSLog(@"authorizationCode: %@", authorizationCode);
+//        NSLog(@"identityToken: %@", identityToken);
+//        NSLog(@"realUserStatus: %@", @(realUserStatus));
         NSArray * subKeys = [NSArray arrayWithObjects:@"code",@"token",@"userId", @"appId", nil];
         NSArray * subValues = [NSArray arrayWithObjects:authorizationCode, identityToken, userID, CNLiveAppId, nil];
         NSDictionary * dic = [[NSDictionary alloc] initWithObjects:subValues forKeys:subKeys];
@@ -407,24 +407,8 @@
                     __strong typeof(weakSelf) strongSelf = weakSelf;
                     if(!strongSelf) return;
                     if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-                        ZXWUserInformation *share = [ZXWUserInformation shareZXWUserInformation];
-                        share.model = [[ZXWUserModel alloc] initWithDictionary:responseObject[@"data"]];
-                        
-                        [[ZXWUserInformation shareZXWUserInformation] saveToken:responseObject[@"data"][@"token"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_id:responseObject[@"data"][@"uid"]];
-                        [[ZXWUserInformation shareZXWUserInformation] setIsLoginSuccess:YES];
-                        
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_name:responseObject[@"data"][@"nickName"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_pwd:self->_pwd.textField.text];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_phone:responseObject[@"data"][@"mobile"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_email:responseObject[@"data"][@"email"]];
-                        [[ZXWUserInformation shareZXWUserInformation] saveUser_headimgUrlString:responseObject[@"data"][@"faceUrl"]];
-                        [[NSNotificationCenter defaultCenter] postNotificationName:LoginSuccessful object:nil];
-
-                        [AlertViewTool showHUDViewText:CustomStr(@"LoginSuccess") block:^{
-                            [self goBack];
+                        [self saveUserInfo:responseObject];
  
-                        }];
                     } else {
                         [AlertViewTool showHUDViewText:CustomStr(@"LoginFailure") block:^{}];
                     }
@@ -41,13 +41,13 @@
         [self addSubview:btn];
     }
     if (@available(iOS 13, *)) {
-        ASAuthorizationAppleIDButton *btn = [ASAuthorizationAppleIDButton buttonWithType:ASAuthorizationAppleIDButtonTypeDefault style:ASAuthorizationAppleIDButtonStyleWhite];
+        ASAuthorizationAppleIDButton *btn = [ASAuthorizationAppleIDButton buttonWithType:ASAuthorizationAppleIDButtonTypeDefault style:ASAuthorizationAppleIDButtonStyleBlack];
         btn.tag = 1000+(count-1);
         btn.layer.masksToBounds = YES;
-        btn.layer.cornerRadius = 21.0;
+        btn.layer.cornerRadius = 22.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((count-1)*width+20, 48, 42, 42);
+        btn.frame = CGRectMake((count-1)*width+20, 48, 44, 44);
         [btn addTarget:self action:@selector(clickedLoginBtn:)  forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:btn];
      }