diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 96518c81..a55a5e0b 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -54,7 +54,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; ///qq @property (nonatomic, strong) UIButton *lineButtonView; -@property (nonatomic, strong) UIButton *appleButton; + ///谷歌登录配置 @property (nonatomic,strong) GIDConfiguration *configuration; @@ -101,9 +101,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; [self.view addSubview:self.authBubbleView]; [self.authBubbleView addSubview:self.authBubbleLabel]; - if (@available(iOS 13.0, *)) { - [self.stackView addArrangedSubview:self.appleButton]; - } + [self.stackView addArrangedSubview:self.googleButtonView]; [self.stackView addArrangedSubview:self.fbButtonView]; [self.stackView addArrangedSubview:self.lineButtonView]; @@ -157,10 +155,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; make.bottom.mas_equalTo(self.authBubbleView).mas_offset(-6); }]; - [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(295)); - make.height.mas_equalTo(kGetScaleWidth(46)); - }]; + [self.googleButtonView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(295)); make.height.mas_equalTo(kGetScaleWidth(46)); @@ -180,9 +175,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; [self.nextView addSubview:self.nextLabel]; UIButton *typeButton ; - if([type intValue] == 5){ - typeButton = self.appleButton; - }else if([type intValue] == 8){ + if([type intValue] == 8){ typeButton = self.googleButtonView; }else if([type intValue] == 10){ typeButton = self.fbButtonView; @@ -440,22 +433,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; } return _lineButtonView; } -- (UIButton *)appleButton { - if (!_appleButton) { - _appleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_appleButton setImage: [UIImage imageNamed:@"login_apple"] forState:UIControlStateNormal]; - [_appleButton setTitle:YMLocalizedString(@"XPLoginViewController12") forState:UIControlStateNormal]; - _appleButton.titleLabel.font = kFontMedium(16); - [_appleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_appleButton setImageEdgeInsets:UIEdgeInsetsMake(0, kGetScaleWidth(28), 0, kGetScaleWidth(200))]; - _appleButton.backgroundColor = UIColorFromRGB(0x141414); - _appleButton.layer.cornerRadius = kGetScaleWidth(46)/2; - _appleButton.layer.masksToBounds = YES; - _appleButton.tag = 1000 + ThirdLoginType_Apple; - [_appleButton addTarget:self action:@selector(loginDidClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _appleButton; -} + - (GIDConfiguration *)configuration{