Commit 3f1c9f5bdf951730e02774575e5da3a5b2c7d48b
1 parent
85bd3554
no message
Showing
2 changed files
with
14 additions
and
4 deletions
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
| ... | ... | @@ -370,8 +370,19 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell"; |
| 370 | 370 | [self.navigationController pushViewController:vc animated:YES]; |
| 371 | 371 | return; |
| 372 | 372 | } |
| 373 | + | |
| 373 | 374 | CNLiveModel *model = self.data[indexPath.row]; |
| 374 | 375 | NSDictionary *dic = [model toDictionary]; |
| 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 | + } | |
| 385 | + | |
| 375 | 386 | VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:dic]; |
| 376 | 387 | vc.title = model.cmsColumnName; |
| 377 | 388 | vc.hidesBottomBarWhenPushed = YES; | ... | ... |
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
| ... | ... | @@ -35,17 +35,16 @@ |
| 35 | 35 | } |
| 36 | 36 | url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; |
| 37 | 37 | movieUrl = [NSURL URLWithString:url]; |
| 38 | - | |
| 38 | + | |
| 39 | 39 | } else { |
| 40 | 40 | isPlay = NO; |
| 41 | + | |
| 41 | 42 | } |
| 42 | 43 | |
| 43 | 44 | } else { |
| 44 | - isPlay = NO; | |
| 45 | + isPlay = YES; | |
| 45 | 46 | |
| 46 | 47 | } |
| 47 | - | |
| 48 | - NSLog(@"movieUrl -> %@",movieUrl); | |
| 49 | 48 | videoHeight = MainScreenWidth * (9.0 / 16.0); |
| 50 | 49 | |
| 51 | 50 | } | ... | ... |