Commit 6972a05292b02f6319ef1e19f4799e58fad16bc8

Authored by 张旭
2 parents 86dd58ad 04cc58d8

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

CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 // 7 //
8 #import "JSONKit.h" 8 #import "JSONKit.h"
9 #import "GraphicLiveViewController.h" 9 #import "GraphicLiveViewController.h"
10 -#import "OldVideoDetailViewController.h" 10 +//#import "OldVideoDetailViewController.h"
  11 +#import "VideoPlayBackViewController.h"
11 12
12 @interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate> 13 @interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate>
13 @end 14 @end
@@ -547,7 +548,7 @@ @@ -547,7 +548,7 @@
547 UIButton *btn = (UIButton *)sender; 548 UIButton *btn = (UIButton *)sender;
548 NSDictionary *dic = self.relatedArray[btn.tag - 1000]; 549 NSDictionary *dic = self.relatedArray[btn.tag - 1000];
549 NSLog(@"%@",dic); 550 NSLog(@"%@",dic);
550 - OldVideoDetailViewController *vc = [[OldVideoDetailViewController alloc] initWithDictionary:dic]; 551 + VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:dic];
551 vc.title = _dic[@"cmsColumnName"]; 552 vc.title = _dic[@"cmsColumnName"];
552 vc.hidesBottomBarWhenPushed = YES; 553 vc.hidesBottomBarWhenPushed = YES;
553 [self.navigationController pushViewController:vc animated:YES]; 554 [self.navigationController pushViewController:vc animated:YES];