Commit c73d6d38c110ba5f7be9aa0057fe93d03f054b7e
1 parent
508d3027
主播状态返回按钮,切换播放背景色换成黑色
Showing
1 changed file
with
10 additions
and
4 deletions
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m
| @@ -168,7 +168,6 @@ | @@ -168,7 +168,6 @@ | ||
| 168 | // 停止后的视图,拿到自己的加载图来显示 | 168 | // 停止后的视图,拿到自己的加载图来显示 |
| 169 | [_viewSecond addSubview:_secondLoadView]; | 169 | [_viewSecond addSubview:_secondLoadView]; |
| 170 | 170 | ||
| 171 | - [_viewSecond removeGestureRecognizer:_pan]; | ||
| 172 | _viewOne.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT); | 171 | _viewOne.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT); |
| 173 | _tempView = _viewOne; | 172 | _tempView = _viewOne; |
| 174 | _viewOne = _viewSecond; | 173 | _viewOne = _viewSecond; |
| @@ -381,12 +380,19 @@ | @@ -381,12 +380,19 @@ | ||
| 381 | 380 | ||
| 382 | } | 381 | } |
| 383 | 382 | ||
| 383 | +#pragma mark - Button Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| 384 | +- (void)backToList { | ||
| 385 | + | ||
| 386 | + [self.navigationController popViewControllerAnimated:YES]; | ||
| 387 | +} | ||
| 388 | + | ||
| 384 | #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 389 | #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 385 | - (LVCUGCBackgroundView *)bgView { | 390 | - (LVCUGCBackgroundView *)bgView { |
| 386 | 391 | ||
| 387 | if (!_bgView) { | 392 | if (!_bgView) { |
| 388 | _bgView = [[LVCUGCBackgroundView alloc] initWithFrame:self.view.bounds]; | 393 | _bgView = [[LVCUGCBackgroundView alloc] initWithFrame:self.view.bounds]; |
| 389 | _bgView.hidden = YES; | 394 | _bgView.hidden = YES; |
| 395 | + [_bgView.backButton addTarget:self action:@selector(backToList) forControlEvents:UIControlEventTouchUpInside]; | ||
| 390 | } | 396 | } |
| 391 | return _bgView; | 397 | return _bgView; |
| 392 | } | 398 | } |
| @@ -394,7 +400,7 @@ | @@ -394,7 +400,7 @@ | ||
| 394 | - (UIView *)viewOne { | 400 | - (UIView *)viewOne { |
| 395 | if (!_viewOne) { | 401 | if (!_viewOne) { |
| 396 | _viewOne = [[UIView alloc] initWithFrame:CGRectMake(0, -SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)]; | 402 | _viewOne = [[UIView alloc] initWithFrame:CGRectMake(0, -SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)]; |
| 397 | - _viewOne.backgroundColor = [UIColor orangeColor]; | 403 | + _viewOne.backgroundColor = [UIColor blackColor]; |
| 398 | _firstLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds]; | 404 | _firstLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds]; |
| 399 | [_viewOne addSubview:_firstLoadView]; | 405 | [_viewOne addSubview:_firstLoadView]; |
| 400 | _oneY = -SCREEN_HEIGHT; | 406 | _oneY = -SCREEN_HEIGHT; |
| @@ -405,7 +411,7 @@ | @@ -405,7 +411,7 @@ | ||
| 405 | - (UIView *)viewSecond { | 411 | - (UIView *)viewSecond { |
| 406 | if (!_viewSecond) { | 412 | if (!_viewSecond) { |
| 407 | _viewSecond = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)]; | 413 | _viewSecond = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)]; |
| 408 | - _viewSecond.backgroundColor = [UIColor redColor]; | 414 | + _viewSecond.backgroundColor = [UIColor blackColor]; |
| 409 | _secondLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds]; | 415 | _secondLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds]; |
| 410 | [_viewSecond addSubview:_secondLoadView]; | 416 | [_viewSecond addSubview:_secondLoadView]; |
| 411 | _SecondY = 0; | 417 | _SecondY = 0; |
| @@ -416,7 +422,7 @@ | @@ -416,7 +422,7 @@ | ||
| 416 | - (UIView *)viewThird { | 422 | - (UIView *)viewThird { |
| 417 | if (!_viewThird) { | 423 | if (!_viewThird) { |
| 418 | _viewThird = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)]; | 424 | _viewThird = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)]; |
| 419 | - _viewThird.backgroundColor = [UIColor blueColor]; | 425 | + _viewThird.backgroundColor = [UIColor blackColor]; |
| 420 | _thirdLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds]; | 426 | _thirdLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds]; |
| 421 | [_viewThird addSubview:_thirdLoadView]; | 427 | [_viewThird addSubview:_thirdLoadView]; |
| 422 | _ThirdY = SCREEN_HEIGHT; | 428 | _ThirdY = SCREEN_HEIGHT; |