⚒增加滚动播放位置的API

Example/ZFPlayer/CollectionView/Controller/ZFCollectionViewController.m

@@ -149,7 +149,11 @@ - (void)requestData {
 
 /// play the video
 - (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
- [self.player playTheIndexPath:indexPath scrollToTop:scrollToTop];
+ if (scrollToTop) {
+ [self.player playTheIndexPath:indexPath scrollPosition:ZFPlayerScrollViewScrollPositionCenteredVertically animated:YES];
+ } else {
+ [self.player playTheIndexPath:indexPath];
+ }
  ZFTableData *data = self.dataSource[indexPath.row];
  [self.controlView showTitle:data.title
  coverURLString:data.thumbnail_url

Example/ZFPlayer/CollectionView/Controller/ZFDouyinCollectionViewController.m

@@ -77,7 +77,7 @@ - (void)viewDidLoad {
  /// 停止的时候找出最合适的播放
  self.player.zf_scrollViewDidEndScrollingCallback = ^(NSIndexPath * _Nonnull indexPath) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  };
 }
 
@@ -91,7 +91,7 @@ - (void)viewDidAppear:(BOOL)animated {
  @weakify(self)
  [self.collectionView zf_filterShouldPlayCellWhileScrolled:^(NSIndexPath *indexPath) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  }];
 }
 
@@ -140,7 +140,7 @@ - (void)playTheIndex:(NSInteger)index {
  [self.collectionView scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionNone animated:NO];
  [self.collectionView zf_filterShouldPlayCellWhileScrolled:^(NSIndexPath *indexPath) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  }];
  /// 如果是最后一行，去请求新数据
  if (index == self.dataSource.count-1) {
@@ -152,8 +152,8 @@ - (void)playTheIndex:(NSInteger)index {
 }
 
 /// play the video
-- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
- [self.player playTheIndexPath:indexPath scrollToTop:scrollToTop];
+- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
+ [self.player playTheIndexPath:indexPath];
  [self.controlView resetControlView];
  ZFTableData *data = self.dataSource[indexPath.row];
  UIViewContentMode imageMode;
@@ -204,7 +204,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
 }
 
 - (UICollectionView *)collectionView {

Example/ZFPlayer/CollectionView/Controller/ZFHorizontalCollectionViewController.m

@@ -69,7 +69,7 @@ - (void)viewDidLoad {
  /// 停止的时候找出最合适的播放
  self.player.zf_scrollViewDidEndScrollingCallback = ^(NSIndexPath * _Nonnull indexPath) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  };
 }
 
@@ -90,7 +90,7 @@ - (void)viewDidAppear:(BOOL)animated {
  @weakify(self)
  [self.collectionView zf_filterShouldPlayCellWhileScrolled:^(NSIndexPath *indexPath) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  }];
 }
 
@@ -136,8 +136,8 @@ - (void)requestData {
 }
 
 /// play the video
-- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
- [self.player playTheIndexPath:indexPath scrollToTop:scrollToTop];
+- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
+ [self.player playTheIndexPath:indexPath];
  ZFTableData *data = self.dataSource[indexPath.row];
  [self.controlView showTitle:data.title
  coverURLString:data.thumbnail_url
@@ -178,13 +178,13 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
  @weakify(self)
  cell.playBlock = ^(UIButton *sender) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  };
  return cell;
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
 }
 
 - (UICollectionView *)collectionView {

Example/ZFPlayer/FullScreenViewController/ZFFullScreenViewController.m

@@ -42,6 +42,10 @@ - (void)viewDidLoad {
  self.player.orientationObserver.supportInterfaceOrientation = ZFInterfaceOrientationMaskLandscape;
  [self.player enterFullScreen:YES animated:NO];
  playerManager.assetURL = [NSURL URLWithString:@"https://www.apple.com/105/media/us/iphone-x/2017/01df5b43-28e4-4848-bf20-490c34a926a7/films/feature/iphone-x-feature-tpl-cc-us-20170912_1280x720h.mp4"];
+
+ self.player.orientationWillChange = ^(ZFPlayerController * _Nonnull player, BOOL isFullScreen) {
+ kAPPDelegate.allowOrentitaionRotation = isFullScreen;
+ };
 }
 
 - (void)viewWillAppear:(BOOL)animated {

Example/ZFPlayer/TableView/Controller/ZFAutoPlayerViewController.m

@@ -235,7 +235,11 @@ - (void)zf_playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
 
 /// play the video
 - (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
- [self.player playTheIndexPath:indexPath scrollToTop:scrollToTop];
+ if (scrollToTop) {
+ [self.player playTheIndexPath:indexPath scrollPosition:ZFPlayerScrollViewScrollPositionCenteredVertically animated:YES];
+ } else {
+ [self.player playTheIndexPath:indexPath];
+ }
  ZFTableViewCellLayout *layout = self.dataSource[indexPath.row];
  [self.controlView showTitle:layout.data.title
  coverURLString:layout.data.thumbnail_url

Example/ZFPlayer/TableView/Controller/ZFDouYinViewController.m

@@ -84,7 +84,7 @@ - (void)viewDidLoad {
  self.player.assetURLs = self.urls;
  [self.tableView reloadData];
  }
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  };
 }
 
@@ -105,7 +105,7 @@ - (void)loadNewData {
  /// 找到可以播放的视频并播放
  [self.tableView zf_filterShouldPlayCellWhileScrolled:^(NSIndexPath *indexPath) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  }];
  });
 }
@@ -134,7 +134,7 @@ - (void)playTheIndex:(NSInteger)index {
  [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionNone animated:NO];
  [self.tableView zf_filterShouldPlayCellWhileScrolled:^(NSIndexPath *indexPath) {
  @strongify(self)
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  }];
  /// 如果是最后一行，去请求新数据
  if (index == self.dataSource.count-1) {
@@ -197,13 +197,13 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
 }
 
 #pragma mark - ZFTableViewCellDelegate
 
 - (void)zf_playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
 }
 
 #pragma mark - private method
@@ -213,8 +213,8 @@ - (void)backClick:(UIButton *)sender {
 }
 
 /// play the video
-- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
- [self.player playTheIndexPath:indexPath scrollToTop:scrollToTop];
+- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
+ [self.player playTheIndexPath:indexPath];
  [self.controlView resetControlView];
  ZFTableData *data = self.dataSource[indexPath.row];
  UIViewContentMode imageMode;

Example/ZFPlayer/TableView/Controller/ZFLightTableViewController.m

@@ -250,10 +250,7 @@ - (void)zf_playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
 /// play the video
 - (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
  if (scrollToTop) {
- /// 自定义滑动动画时间
- [self.tableView zf_scrollToRowAtIndexPath:indexPath animateWithDuration:0.8 completionHandler:^{
- [self.player playTheIndexPath:indexPath];
- }];
+ [self.player playTheIndexPath:indexPath scrollPosition:ZFPlayerScrollViewScrollPositionTop animated:YES];
  } else {
  [self.player playTheIndexPath:indexPath];
  }

Example/ZFPlayer/TableView/Controller/ZFMixViewController.m

@@ -234,7 +234,11 @@ - (void)zf_playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
 - (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
  NSInteger index = (indexPath.row-1)/3;
  ZFTableViewCellLayout *layout = self.dataSource[index];
- [self.player playTheIndexPath:indexPath assetURL:[NSURL URLWithString:layout.data.video_url] scrollToTop:scrollToTop];
+ if (scrollToTop) {
+ [self.player playTheIndexPath:indexPath assetURL:[NSURL URLWithString:layout.data.video_url] scrollPosition:ZFPlayerScrollViewScrollPositionTop animated:YES];
+ } else {
+ [self.player playTheIndexPath:indexPath assetURL:[NSURL URLWithString:layout.data.video_url]];
+ }
  [self.controlView showTitle:layout.data.title
  coverURLString:layout.data.thumbnail_url
  fullScreenMode:layout.isVerticalVideo?ZFFullScreenModePortrait:ZFFullScreenModeLandscape];

Example/ZFPlayer/TableView/Controller/ZFNotAutoPlayViewController.m

@@ -163,7 +163,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
  }
  /// 如果没有播放，则点击进详情页会自动播放
  if (!self.player.currentPlayerManager.isPlaying) {
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
  }
  /// 到详情页
  ZFPlayerDetailViewController *detailVC = [ZFPlayerDetailViewController new];
@@ -194,14 +194,14 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 #pragma mark - ZFTableViewCellDelegate
 
 - (void)zf_playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
- [self playTheVideoAtIndexPath:indexPath scrollToTop:NO];
+ [self playTheVideoAtIndexPath:indexPath];
 }
 
 #pragma mark - private method
 
 /// play the video
-- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
- [self.player playTheIndexPath:indexPath scrollToTop:scrollToTop];
+- (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
+ [self.player playTheIndexPath:indexPath];
  ZFTableViewCellLayout *layout = self.dataSource[indexPath.row];
  [self.controlView showTitle:layout.data.title
  coverURLString:layout.data.thumbnail_url

Example/ZFPlayer/TableView/Controller/ZFSmallPlayViewController.m

@@ -262,7 +262,11 @@ - (void)zf_playTheVideoAtIndexPath:(NSIndexPath *)indexPath {
 
 /// play the video
 - (void)playTheVideoAtIndexPath:(NSIndexPath *)indexPath scrollToTop:(BOOL)scrollToTop {
- [self.player playTheIndexPath:indexPath scrollToTop:scrollToTop];
+ if (scrollToTop) {
+ [self.player playTheIndexPath:indexPath scrollPosition:ZFPlayerScrollViewScrollPositionCenteredVertically animated:YES];
+ } else {
+ [self.player playTheIndexPath:indexPath];
+ }
  ZFTableViewCellLayout *layout = self.dataSource[indexPath.row];
  [self.controlView showTitle:layout.data.title
  coverURLString:layout.data.thumbnail_url

ZFPlayer/Classes/ControlView/UIImageView+ZFCache.m

@@ -98,7 +98,7 @@ + (NSString *)zf_keyForRequest:(NSURLRequest *)request;
 
 @implementation NSString (md5)
 
-+ (NSString *)zf_keyForRequest:(NSURLRequest *)request{
++ (NSString *)zf_keyForRequest:(NSURLRequest *)request {
  return request.URL.absoluteString;
 }
 
@@ -159,8 +159,7 @@ - (void)zf_clearDiskCaches {
  if ([[NSFileManager defaultManager] fileExistsAtPath:directoryPath isDirectory:nil]) {
  dispatch_queue_t ioQueue = dispatch_queue_create("com.hackemist.SDWebImageCache", DISPATCH_QUEUE_SERIAL);
  dispatch_async(ioQueue, ^{
- NSError *error = nil;
- [[NSFileManager defaultManager] removeItemAtPath:directoryPath error:&error];
+ [[NSFileManager defaultManager] removeItemAtPath:directoryPath error:nil];
  [[NSFileManager defaultManager] createDirectoryAtPath:directoryPath
  withIntermediateDirectories:YES
  attributes:nil
@@ -227,47 +226,39 @@ @implementation UIImageView (ZFCache)
 
 #pragma mark - getter
 
-- (ZFImageBlock)completion
-{
+- (ZFImageBlock)completion {
  return objc_getAssociatedObject(self, _cmd);
 }
 
-- (ZFImageDownloader *)imageDownloader
-{
+- (ZFImageDownloader *)imageDownloader {
  return objc_getAssociatedObject(self, _cmd);
 }
 
-- (NSUInteger)attemptToReloadTimesForFailedURL
-{
+- (NSUInteger)attemptToReloadTimesForFailedURL {
  NSUInteger count = [objc_getAssociatedObject(self, _cmd) integerValue];
  if (count == 0) { count = 2; }
  return count;
 }
 
-- (BOOL)shouldAutoClipImageToViewSize
-{
+- (BOOL)shouldAutoClipImageToViewSize {
  return [objc_getAssociatedObject(self, _cmd) boolValue];
 }
 
 #pragma mark - setter
 
-- (void)setCompletion:(ZFImageBlock)completion
-{
+- (void)setCompletion:(ZFImageBlock)completion {
  objc_setAssociatedObject(self, @selector(completion), completion, OBJC_ASSOCIATION_COPY_NONATOMIC);
 }
 
-- (void)setImageDownloader:(ZFImageDownloader *)imageDownloader
-{
+- (void)setImageDownloader:(ZFImageDownloader *)imageDownloader {
  objc_setAssociatedObject(self, @selector(imageDownloader), imageDownloader, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
-- (void)setAttemptToReloadTimesForFailedURL:(NSUInteger)attemptToReloadTimesForFailedURL
-{
+- (void)setAttemptToReloadTimesForFailedURL:(NSUInteger)attemptToReloadTimesForFailedURL {
  objc_setAssociatedObject(self, @selector(attemptToReloadTimesForFailedURL), @(attemptToReloadTimesForFailedURL), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
-- (void)setShouldAutoClipImageToViewSize:(BOOL)shouldAutoClipImageToViewSize
-{
+- (void)setShouldAutoClipImageToViewSize:(BOOL)shouldAutoClipImageToViewSize {
  objc_setAssociatedObject(self, @selector(shouldAutoClipImageToViewSize), @(shouldAutoClipImageToViewSize), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }