Skip to content

Commit

Permalink
Release 4.1.0 🎉
Browse files Browse the repository at this point in the history
  • Loading branch information
renzifeng committed Sep 19, 2022
1 parent 1205864 commit 258ad5c
Show file tree
Hide file tree
Showing 19 changed files with 279 additions and 214 deletions.
20 changes: 10 additions & 10 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
PODS:
- FDFullscreenPopGesture (1.1)
- MJRefresh (3.4.3)
- ZFPlayer (4.0.3):
- ZFPlayer/AVPlayer (= 4.0.3)
- ZFPlayer/ControlView (= 4.0.3)
- ZFPlayer/Core (= 4.0.3)
- ZFPlayer/ijkplayer (= 4.0.3)
- ZFPlayer/AVPlayer (4.0.3):
- ZFPlayer (4.1.0):
- ZFPlayer/AVPlayer (= 4.1.0)
- ZFPlayer/ControlView (= 4.1.0)
- ZFPlayer/Core (= 4.1.0)
- ZFPlayer/ijkplayer (= 4.1.0)
- ZFPlayer/AVPlayer (4.1.0):
- ZFPlayer/Core
- ZFPlayer/ControlView (4.0.3):
- ZFPlayer/ControlView (4.1.0):
- ZFPlayer/Core
- ZFPlayer/Core (4.0.3)
- ZFPlayer/ijkplayer (4.0.3):
- ZFPlayer/Core (4.1.0)
- ZFPlayer/ijkplayer (4.1.0):
- ZFPlayer/Core

DEPENDENCIES:
Expand All @@ -31,7 +31,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
ZFPlayer: 78111592d94b14de13b43bd920d3471ba506a34c
ZFPlayer: 295225aed9a3c2e24477a0e00f86c2c2a2b3c474

PODFILE CHECKSUM: a3fcbbaf309343c1c9575737d409bf95b447eef9

Expand Down
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/ZFPlayer.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 13 additions & 11 deletions Example/ZFPlayer/Normal/ZFNormalViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,13 @@ - (void)setupPlayer {
// self.player.resumePlayRecord = YES;

@zf_weakify(self)

self.player.orientationDidChanged = ^(ZFPlayerController * _Nonnull player, BOOL isFullScreen) {
@zf_strongify(self)
[UIView animateWithDuration:0.0 animations:^{
[self setNeedsStatusBarAppearanceUpdate];

}];
};
/// 播放完成
self.player.playerDidToEnd = ^(id _Nonnull asset) {
@zf_strongify(self)
Expand Down Expand Up @@ -242,16 +248,12 @@ - (UIButton *)pipBtn {
[NSURL URLWithString:@"https://www.apple.com/105/media/cn/mac/family/2018/46c4b917_abfd_45a3_9b51_4e3054191797/films/bruce/mac-bruce-tpl-cn-2018_1280x720h.mp4"],
[NSURL URLWithString:@"https://www.apple.com/105/media/us/mac/family/2018/46c4b917_abfd_45a3_9b51_4e3054191797/films/peter/mac-peter-tpl-cc-us-2018_1280x720h.mp4"],
[NSURL URLWithString:@"https://www.apple.com/105/media/us/mac/family/2018/46c4b917_abfd_45a3_9b51_4e3054191797/films/grimes/mac-grimes-tpl-cc-us-2018_1280x720h.mp4"],
[NSURL URLWithString:@"http://flv3.bn.netease.com/tvmrepo/2018/6/H/9/EDJTRBEH9/SD/EDJTRBEH9-mobile.mp4"],
[NSURL URLWithString:@"http://flv3.bn.netease.com/tvmrepo/2018/6/9/R/EDJTRAD9R/SD/EDJTRAD9R-mobile.mp4"],
[NSURL URLWithString:@"http://www.flashls.org/playlists/test_001/stream_1000k_48k_640x360.m3u8"],
[NSURL URLWithString:@"http://tb-video.bdstatic.com/tieba-video/7_517c8948b166655ad5cfb563cc7fbd8e.mp4"],
[NSURL URLWithString:@"http://tb-video.bdstatic.com/tieba-smallvideo/68_20df3a646ab5357464cd819ea987763a.mp4"],
[NSURL URLWithString:@"http://tb-video.bdstatic.com/tieba-smallvideo/118_570ed13707b2ccee1057099185b115bf.mp4"],
[NSURL URLWithString:@"http://tb-video.bdstatic.com/tieba-smallvideo/15_ad895ac5fb21e5e7655556abee3775f8.mp4"],
[NSURL URLWithString:@"http://tb-video.bdstatic.com/tieba-smallvideo/12_cc75b3fb04b8a23546d62e3f56619e85.mp4"],
[NSURL URLWithString:@"http://tb-video.bdstatic.com/tieba-smallvideo/5_6d3243c354755b781f6cc80f60756ee5.mp4"],
[NSURL URLWithString:@"http://tb-video.bdstatic.com/tieba-movideo/11233547_ac127ce9e993877dce0eebceaa04d6c2_593d93a619b0.mp4"]];
[NSURL URLWithString:@"https://cdn.cnbj1.fds.api.mi-img.com/mi-mall/7194236f31b2e1e3da0fe06cfed4ba2b.mp4"],
[NSURL URLWithString:@"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"],
[NSURL URLWithString:@"http://vjs.zencdn.net/v/oceans.mp4"],
[NSURL URLWithString:@"https://media.w3.org/2010/05/sintel/trailer.mp4"],
[NSURL URLWithString:@"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4"],
[NSURL URLWithString:@"https://sample-videos.com/video123/mp4/480/big_buck_bunny_480p_2mb.mp4"]];
}
return _assetURLs;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,7 @@ - (void)viewDidLoad {
@zf_weakify(self)
self.player.playerDidToEnd = ^(id _Nonnull asset) {
@zf_strongify(self)
if (self.player.playingIndexPath.row < self.dataSource.count - 1) {
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:self.player.playingIndexPath.row+1 inSection:0];
[self playTheVideoAtIndexPath:indexPath scrollAnimated:YES];
} else {
[self.player stopCurrentPlayingCell];
}
[self.player stopCurrentPlayingCell];
};

/// 停止的时候找出最合适的播放
Expand Down
Loading

0 comments on commit 258ad5c

Please sign in to comment.