Release 3.3.6

- 现在可以在ScrollView中添加播放器了 - 修复了小浮窗视图不能拖动的问题
changsanjiang · Jul 8, 2020 · 6fb5f51 · 6fb5f51
1 parent 072fe39
commit 6fb5f51
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 107 deletions.
diff --git a/SJBaseVideoPlayer.podspec b/SJBaseVideoPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'SJBaseVideoPlayer'
-  s.version      = '3.3.5'
+  s.version      = '3.3.6'
   s.summary      = 'video player.'
   s.description  = 'https://github.com/changsanjiang/SJBaseVideoPlayer/blob/master/README.md'
   s.homepage     = 'https://github.com/changsanjiang/SJBaseVideoPlayer'

diff --git a/SJBaseVideoPlayer/AVPlayer/Core/SJAVMediaPlayer.m b/SJBaseVideoPlayer/AVPlayer/Core/SJAVMediaPlayer.m
@@ -257,9 +257,7 @@ - (void)_postNotification:(NSNotificationName)name {
 }
 
 - (void)_willSeeking:(CMTime)time {
-    if ( self.seekingInfo.isSeeking ) {
-        [_avPlayer.currentItem cancelPendingSeeks];
-    }
+    [_avPlayer.currentItem cancelPendingSeeks];
 
     self.isPlaybackFinished = NO;
     _seekingInfo.time = time;

diff --git a/SJBaseVideoPlayer/Common/Implements/SJMediaPlaybackController.m b/SJBaseVideoPlayer/Common/Implements/SJMediaPlaybackController.m
@@ -338,7 +338,7 @@ - (SJAssetStatus)assetStatus {
 }
 
 - (NSTimeInterval)currentTime {
-    return _currentPlayer.currentTime;
+    return _currentPlayer.seekingInfo.isSeeking ? CMTimeGetSeconds(_currentPlayer.seekingInfo.time) : _currentPlayer.currentTime;
 }
 
 - (NSTimeInterval)duration {

diff --git a/SJBaseVideoPlayer/Common/Implements/SJPlayModel+SJPrivate.h b/SJBaseVideoPlayer/Common/Implements/SJPlayModel+SJPrivate.h
@@ -8,6 +8,12 @@
 #import "SJPlayModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
+@interface SJScrollViewPlayModel : SJPlayModel
+- (instancetype)initWithScrollView:(__weak UIScrollView *)scrollView;
+
+@property (nonatomic, weak, readonly, nullable) UIScrollView *scrollView;
+@end
+
 @interface SJTableViewCellPlayModel : SJPlayModel
 - (instancetype)initWithTableView:(__weak UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 

diff --git a/SJBaseVideoPlayer/Common/Implements/SJPlayModel.h b/SJBaseVideoPlayer/Common/Implements/SJPlayModel.h
@@ -28,6 +28,13 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - UIView
 
 - (instancetype)init;
+
+#pragma mark - UIScrollView
+
+/// - UIScrollView
+///     - PlayerSuperview<SJPlayModelPlayerSuperview>
+///         - player
++ (instancetype)playModelWithScrollView:(__weak UIScrollView *)scrollView;
 
 #pragma mark - UITableView
 
@@ -127,8 +134,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - 
 
-- (BOOL)isPlayInTableView;
-- (BOOL)isPlayInCollectionView;
+- (BOOL)isPlayInScrollView;
 - (nullable UIView *)playerSuperview;
 - (nullable __kindof UIScrollView *)inScrollView;
 - (nullable NSIndexPath *)indexPath;

diff --git a/SJBaseVideoPlayer/Common/Implements/SJPlayModel.m b/SJBaseVideoPlayer/Common/Implements/SJPlayModel.m
@@ -19,6 +19,10 @@ - (instancetype)init {
     return self;
 }
 
++ (instancetype)playModelWithScrollView:(__weak UIScrollView *)scrollView {
+    return [SJScrollViewPlayModel.alloc initWithScrollView:scrollView];
+}
+
 + (instancetype)playModelWithTableView:(__weak UITableView *)tableView indexPath:(NSIndexPath *)indexPath {
     return [SJTableViewCellPlayModel.alloc initWithTableView:tableView indexPath:indexPath];
 }
@@ -52,14 +56,36 @@ + (instancetype)playModelWithCollectionView:(UICollectionView *__weak)collection
 }
 
 
-- (BOOL)isPlayInTableView { return NO; }
-- (BOOL)isPlayInCollectionView { return NO; }
+- (BOOL)isPlayInScrollView { return NO; }
 - (nullable UIView *)playerSuperview { return nil; }
 - (nullable __kindof UIScrollView *)inScrollView { return nil; }
 - (nullable NSIndexPath *)indexPath { return nil; }
 @end
 
 
+@implementation SJScrollViewPlayModel
+- (instancetype)initWithScrollView:(__weak UIScrollView *)scrollView {
+    self = [super init];
+    if ( self ) {
+        _scrollView = scrollView;
+    }
+    return self;
+}
+
+- (BOOL)isPlayInScrollView {
+    return YES;
+}
+
+- (nullable UIView *)playerSuperview {
+    return [_scrollView viewWithProtocol:@protocol(SJPlayModelPlayerSuperview)];
+}
+
+- (nullable __kindof UIScrollView *)inScrollView {
+    return _scrollView;
+}
+@end
+
+
 @implementation SJTableViewCellPlayModel
 - (instancetype)initWithTableView:(__weak UITableView *)tableView indexPath:(NSIndexPath *)indexPath {
     self = [super init];
@@ -70,12 +96,9 @@ - (instancetype)initWithTableView:(__weak UITableView *)tableView indexPath:(NSI
     return self;
 }
 
-- (BOOL)isPlayInTableView {
+- (BOOL)isPlayInScrollView {
     return YES;
 }
-- (BOOL)isPlayInCollectionView {
-    return NO;
-}
 - (nullable UIView *)playerSuperview {
     return [_tableView viewWithProtocol:@protocol(SJPlayModelPlayerSuperview) atIndexPath:_indexPath];
 }
@@ -95,12 +118,9 @@ - (instancetype)initWithTableView:(UITableView *__weak)tableView tableHeaderView
     return self;
 }
 
-- (BOOL)isPlayInTableView {
+- (BOOL)isPlayInScrollView {
     return YES;
 }
-- (BOOL)isPlayInCollectionView {
-    return NO;
-}
 - (nullable UIView *)playerSuperview {
     return [_tableHeaderView viewWithProtocol:@protocol(SJPlayModelPlayerSuperview)];
 }
@@ -120,12 +140,9 @@ - (instancetype)initWithTableView:(UITableView *__weak)tableView tableFooterView
     return self;
 }
 
-- (BOOL)isPlayInTableView {
+- (BOOL)isPlayInScrollView {
     return YES;
 }
-- (BOOL)isPlayInCollectionView {
-    return NO;
-}
 - (nullable UIView *)playerSuperview {
     return [_tableFooterView viewWithProtocol:@protocol(SJPlayModelPlayerSuperview)];
 }
@@ -145,12 +162,9 @@ - (instancetype)initWithTableView:(__weak UITableView *)tableView inHeaderForSec
     return self;
 }
 
-- (BOOL)isPlayInTableView {
+- (BOOL)isPlayInScrollView {
     return YES;
 }
-- (BOOL)isPlayInCollectionView {
-    return NO;
-}
 - (nullable UIView *)playerSuperview {
     return [_tableView viewWithProtocol:@protocol(SJPlayModelPlayerSuperview) inHeaderForSection:_section];
 }
@@ -170,12 +184,9 @@ - (instancetype)initWithTableView:(__weak UITableView *)tableView inFooterForSec
     return self;
 }
 
-- (BOOL)isPlayInTableView {
+- (BOOL)isPlayInScrollView {
     return YES;
 }
-- (BOOL)isPlayInCollectionView {
-    return NO;
-}
 - (nullable UIView *)playerSuperview {
     return [_tableView viewWithProtocol:@protocol(SJPlayModelPlayerSuperview) inFooterForSection:_section];
 }
@@ -227,11 +238,7 @@ - (void)setNextPlayModel:(nullable __kindof SJPlayModel *)nextPlayModel {
     }
 }
 
-- (BOOL)isPlayInTableView {
-    return NO;
-}
-
-- (BOOL)isPlayInCollectionView {
+- (BOOL)isPlayInScrollView {
     return YES;
 }
 
@@ -275,11 +282,7 @@ - (instancetype)initWithCollectionView:(__weak UICollectionView *)collectionView
     return self;
 }
 
-- (BOOL)isPlayInTableView {
-    return NO;
-}
-
-- (BOOL)isPlayInCollectionView {
+- (BOOL)isPlayInScrollView {
     return YES;
 }
 
@@ -301,12 +304,8 @@ - (instancetype)initWithCollectionView:(__weak UICollectionView *)collectionView
     }
     return self;
 }
-
-- (BOOL)isPlayInTableView {
-    return NO;
-}
-
-- (BOOL)isPlayInCollectionView {
+
+- (BOOL)isPlayInScrollView {
     return YES;
 }
 
@@ -396,8 +395,7 @@ - (instancetype)initWithPlayerSuperviewTag:(NSInteger)playerSuperviewTag
     _tableView = tableView;
     return self;
 }
-- (BOOL)isPlayInTableView { return YES; }
-- (BOOL)isPlayInCollectionView { return NO; }
+- (BOOL)isPlayInScrollView { return YES; }
 - (nullable UIView *)playerSuperview {
     return [[self.tableView cellForRowAtIndexPath:self.indexPath] viewWithTag:self.playerSuperviewTag];
 }
@@ -428,8 +426,7 @@ - (instancetype)initWithPlayerSuperviewTag:(NSInteger)playerSuperviewTag
     _collectionView = collectionView;
     return self;
 }
-- (BOOL)isPlayInTableView { return NO; }
-- (BOOL)isPlayInCollectionView { return YES; }
+- (BOOL)isPlayInScrollView { return YES; }
 - (nullable UIView *)playerSuperview {
     return [[self.collectionView cellForItemAtIndexPath:self.indexPath] viewWithTag:self.playerSuperviewTag];
 }
@@ -452,8 +449,7 @@ - (instancetype)initWithPlayerSuperview:(UIView * _Nonnull __weak)playerSupervie
     return self;
 }
 
-- (BOOL)isPlayInTableView { return YES; }
-- (BOOL)isPlayInCollectionView { return NO; }
+- (BOOL)isPlayInScrollView { return YES; }
 - (nullable __kindof UIScrollView *)inScrollView {
     return _tableView;
 }
@@ -485,9 +481,8 @@ - (instancetype)initWithPlayerSuperviewTag:(NSInteger)playerSuperviewTag
     _tableView = tableView;
     return self;
 }
-
-- (BOOL)isPlayInTableView { return NO; }
-- (BOOL)isPlayInCollectionView { return YES; }
+
+- (BOOL)isPlayInScrollView { return YES; }
 - (nullable UIView *)playerSuperview {
     return [[self.collectionView cellForItemAtIndexPath:self.indexPath] viewWithTag:self.playerSuperviewTag];
 }
@@ -525,9 +520,8 @@ - (instancetype)initWithPlayerSuperviewTag:(NSInteger)playerSuperviewTag
     _tableView = tableView;
     return self;
 }
-
-- (BOOL)isPlayInTableView { return NO; }
-- (BOOL)isPlayInCollectionView { return YES; }
+
+- (BOOL)isPlayInScrollView { return YES; }
 - (nullable UIView *)playerSuperview {
     return [[self.collectionView cellForItemAtIndexPath:self.indexPath] viewWithTag:self.playerSuperviewTag];
 }
@@ -560,9 +554,8 @@ - (instancetype)initWithPlayerSuperviewTag:(NSInteger)playerSuperviewTag
     _rootCollectionView = rootCollectionView;
     return self;
 }
-
-- (BOOL)isPlayInTableView { return NO; }
-- (BOOL)isPlayInCollectionView { return YES; }
+
+- (BOOL)isPlayInScrollView { return YES; }
 - (nullable UIView *)playerSuperview {
     return [[[self collectionView] cellForItemAtIndexPath:self.indexPath] viewWithTag:self.playerSuperviewTag];
 }
@@ -593,8 +586,7 @@ - (instancetype)initWithPlayerSuperviewTag:(NSInteger)playerSuperviewTag
     return self;
 }
 
-- (BOOL)isPlayInTableView { return YES; }
-- (BOOL)isPlayInCollectionView { return NO; }
+- (BOOL)isPlayInScrollView { return YES; }
 - (UIView *_Nullable)playerSuperview {
     return _isHeader?[[[self tableView] headerViewForSection:_inSection] viewWithTag:_playerSuperviewTag]:
     [[[self tableView] footerViewForSection:_inSection] viewWithTag:_playerSuperviewTag];

diff --git a/SJBaseVideoPlayer/Common/Implements/SJPlayModelPropertiesObserver.h b/SJBaseVideoPlayer/Common/Implements/SJPlayModelPropertiesObserver.h
@@ -27,10 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak, nullable) id <SJPlayModelPropertiesObserverDelegate> delegate;
 
 @property (nonatomic, readonly) BOOL isAppeared;
-@property (nonatomic, readonly) BOOL isTouchedTableView;
-@property (nonatomic, readonly) BOOL isTouchedCollectionView;
-@property (nonatomic, readonly) BOOL isPlayInTableView;
-@property (nonatomic, readonly) BOOL isPlayInCollectionView;
+@property (nonatomic, readonly) BOOL isTouched;
+@property (nonatomic, readonly) BOOL isPlayInScrollView;
 @property (nonatomic, readonly) BOOL isScrolling;
 
 - (void)refreshAppearState;