Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@renzifeng
renzifeng committed Mar 3, 2016
1 parent efa70d6 commit a6d7f44
Show file tree
Hide file tree
Showing 5 changed files with 113 additions and 123 deletions.
21 changes: 21 additions & 0 deletions Player/Assets.xcassets/Management_Mask.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Management_Mask@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added Player/Assets.xcassets/Management_Mask.imageset/Management_Mask@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Player/MoviePlayerViewController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
#import <UIKit/UIKit.h>

@interface MoviePlayerViewController : UIViewController
/** 视频URL */
@property (nonatomic, copy) NSString *videoURL;
@end
214 changes: 91 additions & 123 deletions Player/MoviePlayerViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,35 +147,7 @@ - (void)createSlider
// _slider.maximumTrackTintColor = [UIColor blackColor];
}

#pragma mark - slider滑动事件
- (void)progressSlider:(UISlider *)slider
{
//拖动改变视频播放进度
if (_player.status == AVPlayerStatusReadyToPlay) {

//计算出拖动的当前秒数
CGFloat total = (CGFloat)_playerItem.duration.value / _playerItem.duration.timescale;

// NSLog(@"%f", total);

NSInteger dragedSeconds = floorf(total * slider.value);

// NSLog(@"dragedSeconds:%ld",dragedSeconds);

//转换成CMTime才能给player来控制播放进度

CMTime dragedCMTime = CMTimeMake(dragedSeconds, 1);

[_player pause];

[_player seekToTime:dragedCMTime completionHandler:^(BOOL finish){

[_player play];

}];

}
}

#pragma mark - 创建UIProgressView
- (void)createProgress
{
Expand All @@ -184,26 +156,7 @@ - (void)createProgress
self.progress.trackTintColor = [UIColor grayColor];
[_backView addSubview:_progress];
}
#pragma mark -
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context
{
if ([keyPath isEqualToString:@"loadedTimeRanges"]) {
NSTimeInterval timeInterval = [self availableDuration];// 计算缓冲进度
// NSLog(@"Time Interval:%f",timeInterval);
CMTime duration = self.playerItem.duration;
CGFloat totalDuration = CMTimeGetSeconds(duration);
[self.progress setProgress:timeInterval / totalDuration animated:NO];
}
}

- (NSTimeInterval)availableDuration {
NSArray *loadedTimeRanges = [[_player currentItem] loadedTimeRanges];
CMTimeRange timeRange = [loadedTimeRanges.firstObject CMTimeRangeValue];// 获取缓冲区域
float startSeconds = CMTimeGetSeconds(timeRange.start);
float durationSeconds = CMTimeGetSeconds(timeRange.duration);
NSTimeInterval result = startSeconds + durationSeconds;// 计算缓冲总进度
return result;
}
- (void)customVideoSlider {
UIGraphicsBeginImageContextWithOptions((CGSize){ .7, .7 }, NO, 0.0f);
UIImage *transparentImage = UIGraphicsGetImageFromCurrentImageContext();
Expand All @@ -213,6 +166,29 @@ - (void)customVideoSlider {
[self.slider setMaximumTrackImage:transparentImage forState:UIControlStateNormal];
}

#pragma mark - 播放和下一首按钮

- (void)createButton
{
UIButton *startButton = [UIButton buttonWithType:UIButtonTypeCustom];
startButton.frame = CGRectMake(15, _height-38, 30, 30);
[self.backView addSubview:startButton];
if (_player.rate == 1.0) {
[startButton setImage:[UIImage imageNamed:@"kr-video-player-pause"] forState:UIControlStateNormal];
} else {
[startButton setImage:[UIImage imageNamed:@"kr-video-player-play"] forState:UIControlStateNormal];

}
[startButton addTarget:self action:@selector(startAction:) forControlEvents:UIControlEventTouchUpInside];

UIButton *nextButton = [UIButton buttonWithType:UIButtonTypeCustom];
nextButton.frame = CGRectMake(60, _height-35, 25, 25);
[self.backView addSubview:nextButton];
[nextButton setImage:[UIImage imageNamed:@"nextPlayer.png"] forState:UIControlStateNormal];


}

#pragma mark - 创建播放时间
- (void)createCurrentTimeLabel
{
Expand All @@ -222,8 +198,22 @@ - (void)createCurrentTimeLabel
_currentTimeLabel.font = [UIFont systemFontOfSize:12];
_currentTimeLabel.text = @"00:00/00:00";


}
#pragma mark - KVO

- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context
{
if ([keyPath isEqualToString:@"loadedTimeRanges"]) {
NSTimeInterval timeInterval = [self availableDuration];// 计算缓冲进度
// NSLog(@"Time Interval:%f",timeInterval);
CMTime duration = self.playerItem.duration;
CGFloat totalDuration = CMTimeGetSeconds(duration);
[self.progress setProgress:timeInterval / totalDuration animated:NO];
}
}


#pragma mark - 计时器事件
- (void)Stack
{
Expand Down Expand Up @@ -255,27 +245,16 @@ - (void)Stack
}

}
#pragma mark - 播放和下一首按钮
- (void)createButton
{
UIButton *startButton = [UIButton buttonWithType:UIButtonTypeCustom];
startButton.frame = CGRectMake(15, _height-38, 30, 30);
[self.backView addSubview:startButton];
if (_player.rate == 1.0) {
[startButton setImage:[UIImage imageNamed:@"kr-video-player-pause"] forState:UIControlStateNormal];
} else {
[startButton setImage:[UIImage imageNamed:@"kr-video-player-play"] forState:UIControlStateNormal];

}
[startButton addTarget:self action:@selector(startAction:) forControlEvents:UIControlEventTouchUpInside];

UIButton *nextButton = [UIButton buttonWithType:UIButtonTypeCustom];
nextButton.frame = CGRectMake(60, _height-35, 25, 25);
[self.backView addSubview:nextButton];
[nextButton setImage:[UIImage imageNamed:@"nextPlayer.png"] forState:UIControlStateNormal];


- (NSTimeInterval)availableDuration {
NSArray *loadedTimeRanges = [[_player currentItem] loadedTimeRanges];
CMTimeRange timeRange = [loadedTimeRanges.firstObject CMTimeRangeValue];// 获取缓冲区域
float startSeconds = CMTimeGetSeconds(timeRange.start);
float durationSeconds = CMTimeGetSeconds(timeRange.duration);
NSTimeInterval result = startSeconds + durationSeconds;// 计算缓冲总进度
return result;
}

#pragma mark - 播放暂停按钮方法
- (void)startAction:(UIButton *)button
{
Expand Down Expand Up @@ -313,14 +292,16 @@ - (void)createHorizontal {
// 水平滑动显示的进度label
self.horizontalLabel = [[UILabel alloc]initWithFrame:CGRectMake(_width/2-80, _height / 2 + 20, 160, 40)];
self.horizontalLabel.textColor = [UIColor whiteColor];
self.horizontalLabel.backgroundColor = [UIColor blackColor];
self.horizontalLabel.alpha = 0.6;
self.horizontalLabel.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"Management_Mask"]];
self.horizontalLabel.textAlignment = NSTextAlignmentCenter;
self.horizontalLabel.text = @">> 00:00 / --:--";
// 一上来先隐藏
self.horizontalLabel.hidden = YES;
[self.backView addSubview:_horizontalLabel];

}


#pragma mark - 创建手势
- (void)createGesture
{
Expand All @@ -337,24 +318,49 @@ - (void)createGesture
}
}
}
#pragma mark - 轻拍方法
- (void)tapAction
#pragma mark - slider滑动事件
- (void)progressSlider:(UISlider *)slider
{
if (_backView.alpha == 1) {
[UIView animateWithDuration:0.5 animations:^{
//拖动改变视频播放进度
if (_player.status == AVPlayerStatusReadyToPlay) {

//计算出拖动的当前秒数
CGFloat total = (CGFloat)_playerItem.duration.value / _playerItem.duration.timescale;

// NSLog(@"%f", total);

NSInteger dragedSeconds = floorf(total * slider.value);

// NSLog(@"dragedSeconds:%ld",dragedSeconds);

//转换成CMTime才能给player来控制播放进度

CMTime dragedCMTime = CMTimeMake(dragedSeconds, 1);

[_player pause];

[_player seekToTime:dragedCMTime completionHandler:^(BOOL finish){

[_player play];

_backView.alpha = 0;
[[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationFade];
}];
} else if (_backView.alpha == 0){

}
}

#pragma mark - 轻拍方法

- (void)tapAction
{
if (_backView.alpha == 0){
[UIView animateWithDuration:0.5 animations:^{

_backView.alpha = 1;
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
}];
}
if (_backView.alpha == 1) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{

[UIView animateWithDuration:0.5 animations:^{

Expand All @@ -366,48 +372,6 @@ - (void)tapAction

}
}
#pragma mark - 滑动调整音量大小
//- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
//{
// if(event.allTouches.count == 1){
// //保存当前触摸的位置
// CGPoint point = [[touches anyObject] locationInView:self.view];
// _startPoint = point;
// }
//}
//-(void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event{
//
// if(event.allTouches.count == 1){
// //计算位移
// CGPoint point = [[touches anyObject] locationInView:self.view];
// // float dx = point.x - startPoint.x;
// float dy = point.y - _startPoint.y;
// int index = (int)dy;
// if(index>0){
// if(index%5==0){//每10个像素声音减一格
// NSLog(@"%.2f",_systemVolume);
// if(_systemVolume>0.1){
// _systemVolume = _systemVolume-0.05;
// [_volumeViewSlider setValue:_systemVolume animated:YES];
// [_volumeViewSlider sendActionsForControlEvents:UIControlEventTouchUpInside];
// }
// }
// }else{
// if(index%5==0){//每10个像素声音增加一格
// NSLog(@"+x ==%d",index);
// NSLog(@"%.2f",_systemVolume);
// if(_systemVolume>=0 && _systemVolume<1){
// _systemVolume = _systemVolume+0.05;
// [_volumeViewSlider setValue:_systemVolume animated:YES];
// [_volumeViewSlider sendActionsForControlEvents:UIControlEventTouchUpInside];
// }
// }
// }
// //亮度调节
// // [UIScreen mainScreen].brightness = (float) dx/self.view.bounds.size.width;
// }
//}


- (void)moviePlayDidEnd:(id)sender
{
Expand All @@ -420,7 +384,6 @@ - (void)backButtonAction
[self dismissViewControllerAnimated:YES completion:^{}];
}


#pragma mark - 平移手势方法
- (void)panDirection:(UIPanGestureRecognizer *)pan
{
Expand Down Expand Up @@ -475,8 +438,11 @@ - (void)panDirection:(UIPanGestureRecognizer *)pan
// 比如水平移动结束时，要快进到指定位置，如果这里没有判断，当我们调节音量完之后，会出现屏幕跳动的bug
switch (panDirection) {
case PanDirectionHorizontalMoved:{
// 隐藏视图
self.horizontalLabel.hidden = YES;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{

// 隐藏视图
self.horizontalLabel.hidden = YES;
});

//转换成CMTime才能给player来控制播放进度

Expand Down Expand Up @@ -514,6 +480,8 @@ - (void)verticalMoved:(CGFloat)value
{
// 更改系统的音量
self.volumeViewSlider.value -= value / 10000; // 越小幅度越小
//亮度
//[UIScreen mainScreen].brightness = 10;
}

#pragma mark - pan水平移动的方法
Expand Down
Binary file modified screen.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a6d7f44

Please sign in to comment.