苹果登录增加参数

yanglingyu
1 parent c2e34ed8
Showing 7 changed files with 33 additions and 9 deletions
.gitignore
CNLiveBLoginModule/Classes/Controller/CNLiveLoginController.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelController.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.m
CNLiveBLoginModule/Classes/ThreeLogin/CNLiveThreeLoginModel.h
CNLiveBLoginModule/Classes/View/CNLiveCompleteInfoView.m
CNLiveBLoginModule/Classes/View/CNLiveLoginView.m
+*~
+.DS_Store
+*.xcuserstate
+*.xcworkspace
+xcuserdata
+Products/ 
+*.lock
+Pods
+
@@ -26,10 +26,11 @@
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import <CNLiveBusinessTools/CNLiveBusinessTools.h>
 #import <CNLiveManager/CNLiveManager.h>
+static NSString *const CNLiveReleasePlusBusinessSecretKey = @"eyJraWQiOiI3NDJDV1FLSzgzIiwiYWxnIjoiRVMyNTYifQ.eyJpc3MiOiI5NFg0OUdHM1pXIiwiaWF0IjoxNjU2OTAzMDg1LCJleHAiOjE2NzI0NTUwODUsImF1ZCI6Imh0dHBzOi8vYXBwbGVpZC5hcHBsZS5jb20iLCJzdWIiOiJjb20uY25saXZlLkNOTGl2ZU5ldFBsdXNCdXNpbmVzcyJ9.6t9LSj6V4EJgoexh8h6k-TUQyJEk_N2a7__xw5zfy_F-lL6mdw2WEBSH_34FC5lEk1DGcqrxyCUODBm3PifAFw";
+static NSString *const CNLiveDebugPlusBusinessSecretKey = @"eyJraWQiOiJKMjc4TUxRQk43IiwiYWxnIjoiRVMyNTYifQ.eyJpc3MiOiI5NFg0OUdHM1pXIiwiaWF0IjoxNjU2OTAzMTIzLCJleHAiOjE2NzI0NTUxMjMsImF1ZCI6Imh0dHBzOi8vYXBwbGVpZC5hcHBsZS5jb20iLCJzdWIiOiJjb20uY25saXZlLkNOTGl2ZU5ldFBsdXNCdXNpbmVzcy5EZWJ1ZyJ9.foKFK8onQRTZZSWyWnO7QyWt4AWQd7vz7_6BfksOvzy_Gqa5uc8as_SpULTL-_jW488g5BBvDJF2GzWLsYq7vw";
-
-@interface CNLiveLoginController()<CNLiveLoginViewDelegate, CNLiveThreeLoginViewDelegate>
+@interface CNLiveLoginController()<CNLiveLoginViewDelegate, CNLiveThreeLoginViewDelegate,CNLiveShareManagerDelegate>
 @property (nonatomic, weak) CNLiveLoginView *loginView;
 @property (nonatomic, weak) CNLiveThreeLoginView *threeLoginView;
 @property (nonatomic, weak) YYLabel *protocol;
@@ -49,6 +50,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
+    [CNLiveShareManager shareDefaultsManager].delegate = self;
     // Do any additional setup after loading the view.
     self.automaticallyAdjustsScrollViewInsets = NO;
     self.view.backgroundColor = [UIColor whiteColor];
@@ -86,7 +88,7 @@
     text.yy_color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
     text.yy_font = [UIFont systemFontOfSize:14.0];
     __weak typeof(self) weakSelf = self;
-    UIColor *color = BusinessLive?[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];
+    UIColor *color = AppType == CNLiveAppTypeBLive?[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];
     [text yy_setTextHighlightRange:NSMakeRange(11, 4) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
         [weakSelf.view endEditing:YES];
         [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementUser];
@@ -124,6 +126,12 @@
     }
 }
+#pragma mark - CNLiveShareManagerDelegate
+/// 获取对应的client_secret
+-(NSString *)shareAppleLoginClientSecret
+{
+    return [[[NSBundle mainBundle]bundleIdentifier] isEqualToString:@"com.cnlive.CNLiveNetPlusBusiness.debug"]? CNLiveDebugPlusBusinessSecretKey:CNLiveReleasePlusBusinessSecretKey;
+}
 #pragma mark - CNLiveThreeLoginViewDelegate
 - (void)clickedButton:(CNLiveThreeLoginView *)view type:(CNLiveSendAuthResp)type{
@@ -158,6 +166,8 @@
         model.location = userInfo.location;
         model.faceUrl = userInfo.faceUrl;
         model.thirdPartyId = userInfo.thirdPartyId;
+        model.access_token = userInfo.access_token;
+        model.refresh_token = userInfo.refresh_token;
         model.countryName = self.loginView.countryName;
         model.countryCode = self.loginView.countryCode;
@@ -203,6 +213,8 @@
                              @"location":model.location?model.location:@"",
                              @"faceUrl":model.faceUrl?model.faceUrl:@"",
                              @"uuid":[CNLiveBusinessTools getUidForStat:[NSDate date]],
+                             @"accessToken":[model.access_token isNotBlank]?model.access_token:@"",
+                             @"refreshToken":[model.refresh_token isNotBlank]?model.refresh_token:@"",
                              @"appId":AppId};
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking setupShowDataResult:NO];
@@ -102,7 +102,7 @@
         text.yy_color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
         text.yy_font = [UIFont systemFontOfSize:14.0];
         __weak typeof(self) weakSelf = self;
-        UIColor *color = BusinessLive?[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];
+        UIColor *color = AppType == CNLiveAppTypeBLive?[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];
         [text yy_setTextHighlightRange:NSMakeRange(7, 12) color:color backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
             __strong typeof(weakSelf) strongSelf = weakSelf;
             if(!strongSelf) return;
@@ -244,7 +244,7 @@ static const NSInteger timeValue = 1.5;
     [binding setTitle:@"确认手机绑定并同意协议" forState:UIControlStateNormal];
     [binding setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     binding.titleLabel.font = [UIFont systemFontOfSize:15.0];
-    UIColor *color = BusinessLive?[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];
+    UIColor *color = AppType == CNLiveAppTypeBLive?[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];
     binding.backgroundColor = color;
     binding.layer.cornerRadius = 20;
     binding.layer.masksToBounds = YES;
@@ -40,6 +40,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *location;
 @property (nonatomic, copy) NSString *faceUrl;
+@property (nonatomic, copy) NSString *access_token;
+@property (nonatomic, copy) NSString *refresh_token;
+
 @property (nonatomic, assign) CNLiveSendAuthResp type;
 @end
@@ -84,7 +84,7 @@ static const NSInteger timeValue = 1.5;
     [next setTitle:@"下一步" forState:UIControlStateNormal];
     [next setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     next.titleLabel.font = [UIFont systemFontOfSize:15.0];
-    UIColor *color = BusinessLive?[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];
+    UIColor *color = AppType == CNLiveAppTypeBLive?[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;
@@ -213,7 +213,7 @@ static const NSInteger timeValue = 1.5;
     [alertController addAction:cancel];
     NSMutableDictionary *titleAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
-    UIColor *color = BusinessLive?[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];
+    UIColor *color = AppType == CNLiveAppTypeBLive?[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;
@@ -123,7 +123,7 @@ static const NSInteger timeValue = 1.5;
     [login setTitle:@"手机号登录" forState:UIControlStateNormal];
     [login setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     login.titleLabel.font = [UIFont systemFontOfSize:15.0];
-    UIColor *color = BusinessLive?[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];
+    UIColor *color = AppType == CNLiveAppTypeBLive?[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];
     login.backgroundColor = color;
     login.layer.cornerRadius = 20;
     login.layer.masksToBounds = YES;
@@ -294,7 +294,7 @@ static const NSInteger timeValue = 1.5;
     button.backgroundColor = [UIColor whiteColor];
     button.userInteractionEnabled = YES;
     [button setTitle:@"" forState:UIControlStateNormal];
-    UIImage *image2 = [self getImageWithImageName:BusinessLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
+    UIImage *image2 = [self getImageWithImageName:AppType == CNLiveAppTypeBLive?@"login_get_code_b":@"login_get_code" bundleName:@"CNLiveBLoginModule" targetClass:[self class]];
     [button setImage:image2 forState:UIControlStateNormal];
 }