iOS Team / LiveVideoCloud · Commits

Commit aa09b669d0d26e7aeed36750d5bf844ff400dd0f

Authored by 王军波
2 parents 7ee04658 c3e40e02

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

Inline Side-by-side
Showing 4 changed files with 14 additions and 5 deletions
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
  View file @aa09b66
... ... @@ -146,6 +146,8 @@
146 146  
147 147 NSLog(@"未审核 去认证");
148 148 LVCVerifyViewController *vc = [[LVCVerifyViewController alloc] init];
  149 + vc.webUrl = [NSString stringWithFormat:@"%@?sid=%@&plat=i&appId=%@",applyAnchor,[UserInformationModel manager].uid,UserAppId];
  150 +
149 151 [self.navigationController pushViewController:vc animated:YES];
150 152  
151 153 } else {
... ...
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCVerifyViewController.h
  View file @aa09b66
... ... @@ -9,5 +9,6 @@
9 9 #import "BaseViewController.h"
10 10  
11 11 @interface LVCVerifyViewController : UIViewController
  12 +@property (nonatomic, copy)NSString *webUrl;
12 13  
13 14 @end
... ...
LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCVerifyViewController.m
  View file @aa09b66
... ... @@ -41,13 +41,16 @@
41 41 }];
42 42 webView.UIDelegate = self;
43 43 webView.navigationDelegate = self;
44   - [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp"]]];
45   -
  44 + self.webUrl = [NSString stringWithFormat:@"%@?sid=%@&plat=i&appId=%@",@"https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp",[UserInformationModel manager].uid,UserAppId];
  45 + NSString *sign = [self.webUrl containsString:@"?"] ? @"&" : @"?";
  46 + self.webUrl = [self.webUrl stringByAppendingFormat:@"%@appid=%@", sign, UserAppId];
  47 +
  48 + [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.webUrl]]];
46 49 }
47 50  
48 51 - (void)back {
49 52  
50   - [self.navigationController dismissViewControllerAnimated:YES completion:nil];
  53 + [self dismissViewControllerAnimated:YES completion:NULL];
51 54 }
52 55  
53 56 #pragma mark - WKNavigationDelegate
... ...
LiveVideoCloud/Classes/Sections/LiveSections/LVCVerifyLiveAuthService.m
  View file @aa09b66
... ... @@ -15,7 +15,7 @@
15 15  
16 16 NSInteger time = [[NSDate date] timeIntervalSince1970];
17 17 NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
18   -
  18 + //channelId
19 19 NSMutableDictionary *parameter = [@{@"appId":UserAppId,
20 20 @"channelId":[UserInformationModel manager].uid?[UserInformationModel manager].uid:@"",
21 21 @"timestamp":timeString,
... ... @@ -24,7 +24,10 @@
24 24 NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], UserAppKey];
25 25 NSString *signString = [[self sha1:string] uppercaseString];
26 26 [parameter setObject:signString forKey:@"sign"];
27   -
  27 +// [parameter setObject:[UserInformationModel manager].uid forKey:@"sid"];
  28 +// [parameter removeObjectForKey:@"channelId"];
  29 +
  30 +
28 31 NSMutableDictionary *params = parameter.mutableCopy;
29 32 completionHandler compleionHandler = ^(id data,NSError *error) {
30 33 handler(data,error);
... ...