iOS Team / ScioLive · Commits

Commit f5713e9db56c667e25aac3588c127d6f41d7e4f6

Authored by zhangxiaowen
1 parent 58776f7c

no message

Inline Side-by-side
Showing 2 changed files with 12 additions and 11 deletions
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
  View file @f5713e9
@@ -374,14 +374,14 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell"; @@ -374,14 +374,14 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell";
374 CNLiveModel *model = self.data[indexPath.row]; 374 CNLiveModel *model = self.data[indexPath.row];
375 NSDictionary *dic = [model toDictionary]; 375 NSDictionary *dic = [model toDictionary];
376 376
377 - if ([model.videoFlag isEqualToString:@"0"]){  
378 - //查看发布会预告  
379 - OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:dic];  
380 - vc.title = dic[@"cmsColumnName"];  
381 - vc.hidesBottomBarWhenPushed = YES;  
382 - [self.navigationController pushViewController:vc animated:YES];  
383 - return;  
384 - } 377 +// if ([model.videoFlag isEqualToString:@"0"]){
  378 +// //查看发布会预告
  379 +// OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:dic];
  380 +// vc.title = dic[@"cmsColumnName"];
  381 +// vc.hidesBottomBarWhenPushed = YES;
  382 +// [self.navigationController pushViewController:vc animated:YES];
  383 +// return;
  384 +// }
385 385
386 VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:dic]; 386 VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:dic];
387 vc.title = model.cmsColumnName; 387 vc.title = model.cmsColumnName;
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
  View file @f5713e9
@@ -35,16 +35,17 @@ @@ -35,16 +35,17 @@
35 } 35 }
36 url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; 36 url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
37 movieUrl = [NSURL URLWithString:url]; 37 movieUrl = [NSURL URLWithString:url];
38 - 38 +
39 } else { 39 } else {
40 isPlay = NO; 40 isPlay = NO;
41 -  
42 } 41 }
43 42
44 } else { 43 } else {
45 - isPlay = YES; 44 + isPlay = NO;
46 45
47 } 46 }
  47 +
  48 + NSLog(@"movieUrl -> %@",movieUrl);
48 videoHeight = MainScreenWidth * (9.0 / 16.0); 49 videoHeight = MainScreenWidth * (9.0 / 16.0);
49 50
50 } 51 }