iOS Team / ScioLive · Commits

Commit f679b6930943a6a44eeb88f499bec791a61ae548

Authored by zhangxiaowen
1 parent 36b81c56

no message

Inline Side-by-side
Showing 2 changed files with 32 additions and 30 deletions
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
  View file @f679b69
@@ -157,12 +157,12 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell"; @@ -157,12 +157,12 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell";
157 } 157 }
158 } 158 }
159 - (void)loadMoreData{ 159 - (void)loadMoreData{
160 -// if(!_isRefreshing){  
161 -// _isRefreshing = YES;  
162 -// [self loadData];  
163 -// }  
164 - [self.tableView.mj_footer endRefreshing];  
165 - [AlertViewTool showHUDViewText:@"查看往期发布会回放,请点击搜索按钮" block:nil duration:1.5]; 160 + if(!_isRefreshing){
  161 + _isRefreshing = YES;
  162 + [self loadData];
  163 + }
  164 +// [self.tableView.mj_footer endRefreshing];
  165 +// [AlertViewTool showHUDViewText:@"查看往期发布会回放,请点击搜索按钮" block:nil duration:1.5];
166 166
167 } 167 }
168 - (void)viewWillAppear:(BOOL)animated{ 168 - (void)viewWillAppear:(BOOL)animated{
@@ -434,14 +434,14 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell"; @@ -434,14 +434,14 @@ static NSString *indicatorTableViewCell = @"CNLiveIndicatorTableViewCell";
434 434
435 // 设置下拉刷新 435 // 设置下拉刷新
436 MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)]; 436 MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
437 -// [footer setTitle:CustomStr(@"RefreshBackFooterIdleText") forState:MJRefreshStateIdle];  
438 -// [footer setTitle:CustomStr(@"RefreshBackFooterPullingText") forState:MJRefreshStatePulling];  
439 -// [footer setTitle:CustomStr(@"RefreshBackFooterRefreshingText") forState:MJRefreshStateRefreshing];  
440 -// [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData];  
441 - [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateIdle];  
442 - [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStatePulling];  
443 - [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateRefreshing]; 437 + [footer setTitle:CustomStr(@"RefreshBackFooterIdleText") forState:MJRefreshStateIdle];
  438 + [footer setTitle:CustomStr(@"RefreshBackFooterPullingText") forState:MJRefreshStatePulling];
  439 + [footer setTitle:CustomStr(@"RefreshBackFooterRefreshingText") forState:MJRefreshStateRefreshing];
444 [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData]; 440 [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData];
  441 +// [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateIdle];
  442 +// [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStatePulling];
  443 +// [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateRefreshing];
  444 +// [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData];
445 _tableView.mj_footer = footer; 445 _tableView.mj_footer = footer;
446 446
447 } 447 }
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
  View file @f679b69
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 } 49 }
50 50
51 NSLog(@"movieUrl -> %@",movieUrl); 51 NSLog(@"movieUrl -> %@",movieUrl);
52 -// videoHeight = MainScreenWidth * (9.0 / 16.0); 52 + videoHeight = MainScreenWidth * (9.0 / 16.0);
53 53
54 } 54 }
55 return self; 55 return self;
@@ -229,22 +229,24 @@ @@ -229,22 +229,24 @@
229 - (void)viewWillAppear:(BOOL)animated { 229 - (void)viewWillAppear:(BOOL)animated {
230 [super viewWillAppear:animated]; 230 [super viewWillAppear:animated];
231 [[JGMusicManager shareMusicManager] playStop]; 231 [[JGMusicManager shareMusicManager] playStop];
232 - if ([_dictionary[@"videoFlag"] isEqualToString:@"0"]) {  
233 - self.navigationController.navigationBar.barTintColor = Color_Blue;  
234 - self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};  
235 - //左  
236 - UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 44)];  
237 - headerButton.layer.cornerRadius = 2.0;  
238 - headerButton.layer.masksToBounds = true;  
239 - [headerButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];  
240 - [headerButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];  
241 - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];  
242 - self.navigationItem.title = _dictionary[@"cmsColumnName"];  
243 -  
244 - }else{  
245 - [self.navigationController setNavigationBarHidden:YES]; 232 +// if ([_dictionary[@"videoFlag"] isEqualToString:@"0"]) {
  233 +// self.navigationController.navigationBar.barTintColor = Color_Blue;
  234 +// self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
  235 +// //左
  236 +// UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 44)];
  237 +// headerButton.layer.cornerRadius = 2.0;
  238 +// headerButton.layer.masksToBounds = true;
  239 +// [headerButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
  240 +// [headerButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
  241 +// self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];
  242 +// self.navigationItem.title = _dictionary[@"cmsColumnName"];
  243 +//
  244 +// }else{
  245 +// [self.navigationController setNavigationBarHidden:YES];
  246 +//
  247 +// }
  248 + [self.navigationController setNavigationBarHidden:YES];
246 249
247 - }  
248 250
249 NSError *error = nil; 251 NSError *error = nil;
250 [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error: &error]; 252 [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error: &error];
@@ -326,7 +328,7 @@ @@ -326,7 +328,7 @@
326 - (void)loadMovieView { 328 - (void)loadMovieView {
327 [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"]; 329 [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
328 imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)]; 330 imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
329 - [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]]; 331 + [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"img"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
330 [self.view addSubview:imageView]; 332 [self.view addSubview:imageView];
331 333
332 UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom]; 334 UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];