Skip to content

Commit c78313a

Browse files
committed
“5.0.0”
1 parent b8e30d3 commit c78313a

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

PlayerDemo/ViewControllers/DetailViewController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ -(void)wmplayer:(WMPlayer *)wmplayer singleTaped:(UITapGestureRecognizer *)singl
8585
///双击播放器
8686
-(void)wmplayer:(WMPlayer *)wmplayer doubleTaped:(UITapGestureRecognizer *)doubleTap{
8787
NSLog(@"didDoubleTaped");
88+
if (wmplayer.isLockScreen) {
89+
return;
90+
}
91+
[wmplayer playOrPause:[wmplayer valueForKey:@"playOrPauseBtn"]];
8892
}
8993
///播放状态
9094
-(void)wmplayerFailedPlay:(WMPlayer *)wmplayer WMPlayerStatus:(WMPlayerState)state{

WMPlayer/WMPlayer.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,16 @@ typedef NS_ENUM(NSUInteger,WMControlType) {
168168
@return double的一个时间点
169169
*/
170170
- (double)currentTime;
171-
171+
/**
172+
获取视频长度
173+
174+
@return double的一个时间点
175+
*/
176+
- (double)duration;
177+
/**
178+
playOrPauseBtn点击事件
179+
*/
180+
- (void)playOrPause:(UIButton *)sender;
172181
/**
173182
重置播放器,然后切换下一个播放资源
174183
*/

WMPlayer/WMPlayer.m

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ -(void)initWMPlayer{
177177
//playOrPauseBtn
178178
self.playOrPauseBtn = [UIButton buttonWithType:UIButtonTypeCustom];
179179
self.playOrPauseBtn.showsTouchWhenHighlighted = YES;
180-
[self.playOrPauseBtn addTarget:self action:@selector(PlayOrPause:) forControlEvents:UIControlEventTouchUpInside];
180+
[self.playOrPauseBtn addTarget:self action:@selector(playOrPause:) forControlEvents:UIControlEventTouchUpInside];
181181
[self.playOrPauseBtn setImage:WMPlayerImage(@"player_ctrl_icon_pause") forState:UIControlStateNormal];
182182
[self.playOrPauseBtn setImage:WMPlayerImage(@"player_ctrl_icon_play") forState:UIControlStateSelected];
183183
[self.bottomView addSubview:self.playOrPauseBtn];
@@ -535,7 +535,7 @@ - (double)currentTime{
535535
}
536536
#pragma mark
537537
#pragma mark - PlayOrPause
538-
- (void)PlayOrPause:(UIButton *)sender{
538+
- (void)playOrPause:(UIButton *)sender{
539539
if (self.state==WMPlayerStateStopped||self.state==WMPlayerStateFailed) {
540540
[self play];
541541
self.rate = [self.rateBtn.currentTitle floatValue];
@@ -616,11 +616,6 @@ - (void)handleDoubleTap:(UITapGestureRecognizer *)doubleTap{
616616
if (self.delegate&&[self.delegate respondsToSelector:@selector(wmplayer:doubleTaped:)]) {
617617
[self.delegate wmplayer:self doubleTaped:doubleTap];
618618
}
619-
if (self.isLockScreen) {
620-
return;
621-
}
622-
[self PlayOrPause:self.playOrPauseBtn];
623-
[self showControlView];
624619
}
625620

626621
-(void)setCurrentItem:(AVPlayerItem *)playerItem{

0 commit comments

Comments
 (0)