iOS Team / ScioLive · Commits

Commit 7e8a544ca4ef7ae84370b27c6496195fd0b8d52f

Authored by yanglingyu
1 parent 69559651

专题直播回放图文播报不显示

Inline Side-by-side
Showing 2 changed files with 14 additions and 5 deletions
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
  View file @7e8a544
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 8
9 #import "SCIOSpecialViewController.h" 9 #import "SCIOSpecialViewController.h"
10 #import "OldVideoDetailViewController.h" 10 #import "OldVideoDetailViewController.h"
  11 +#import "VideoPlayBackViewController.h"
11 #import "OldArticleDetailViewController.h" 12 #import "OldArticleDetailViewController.h"
12 #import "MoreSpecialViewController.h" 13 #import "MoreSpecialViewController.h"
13 14
@@ -599,10 +600,18 @@ @@ -599,10 +600,18 @@
599 } 600 }
600 - (void)pushViewTo:(NSDictionary *)_dic { 601 - (void)pushViewTo:(NSDictionary *)_dic {
601 if ([@"program" isEqualToString:_dic[@"type"]]) { 602 if ([@"program" isEqualToString:_dic[@"type"]]) {
602 - OldVideoDetailViewController *vc = [[OldVideoDetailViewController alloc] initWithDictionary:_dic];  
603 - vc.title = _dic[@"cmsColumnName"];  
604 - vc.hidesBottomBarWhenPushed = YES;  
605 - [self.navigationController pushViewController:vc animated:YES]; 603 + if (_dic[@"gxbArticleId"]&&![_dic[@"gxbArticleId"] isEqualToString:@""]) {
  604 + VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:_dic];
  605 + vc.title = _dic[@"cmsColumnName"];
  606 + vc.hidesBottomBarWhenPushed = YES;
  607 + [self.navigationController pushViewController:vc animated:YES];
  608 + }else{
  609 + OldVideoDetailViewController *vc = [[OldVideoDetailViewController alloc] initWithDictionary:_dic];
  610 + vc.title = _dic[@"cmsColumnName"];
  611 + vc.hidesBottomBarWhenPushed = YES;
  612 + [self.navigationController pushViewController:vc animated:YES];
  613 + }
  614 +
606 } else if ([@"article" isEqualToString:_dic[@"type"]]) { 615 } else if ([@"article" isEqualToString:_dic[@"type"]]) {
607 OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:_dic]; 616 OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:_dic];
608 vc.title = _dic[@"cmsColumnName"]; 617 vc.title = _dic[@"cmsColumnName"];
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
  View file @7e8a544
@@ -82,7 +82,6 @@ @@ -82,7 +82,6 @@
82 - (id)initWithDictionary:(NSDictionary *)dictionary { 82 - (id)initWithDictionary:(NSDictionary *)dictionary {
83 if (self = [super init]) { 83 if (self = [super init]) {
84 _dictionary = [NSDictionary dictionaryWithDictionary:dictionary]; 84 _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
85 - [self getData];  
86 } 85 }
87 return self; 86 return self;
88 } 87 }
@@ -166,6 +165,7 @@ @@ -166,6 +165,7 @@
166 165
167 - (void)viewDidLoad { 166 - (void)viewDidLoad {
168 [super viewDidLoad]; 167 [super viewDidLoad];
  168 + [self getData];
169 self.view.backgroundColor = [UIColor whiteColor]; 169 self.view.backgroundColor = [UIColor whiteColor];
170 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pausePlayer) name:@"PausePlayerNotification" object:nil]; 170 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pausePlayer) name:@"PausePlayerNotification" object:nil];
171 fontIndex = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"]; 171 fontIndex = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"];