Release 2.5.5

- 重写了`SJAVMediaPlaybackController ` - 优化列表滑动时调用`pause`和`play`卡顿的问题 - 修复`resumePlaybackWhenScrollAppeared`未判断VC消失的问题 - 修复初始化后设置`videoGravity`无效的问题 - Added `canPerformPlayForVideoPlayer:` into `SJVideoPlayerControlLayerProtocol` - Added `canPerformPlayForVideoPlayer:` into `SJVideoPlayerControlLayerProtocol` - Added `canPerformPlayForVideoPlayer:` into `SJVideoPlayerControlLayerProtocol`
changsanjiang · Apr 11, 2019 · 5e20046 · 5e20046
1 parent 5bd6209
commit 5e20046
Show file tree

Hide file tree

Showing 82 changed files with 2,960 additions and 2,911 deletions.
diff --git a/SJVideoPlayer.podspec b/SJVideoPlayer.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
     s.name         = 'SJVideoPlayer'
-    s.version      = '2.5.4'
+    s.version      = '2.5.5'
     s.summary      = 'video player.'
     s.description  = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
     s.homepage     = 'https://github.com/changsanjiang/SJVideoPlayer'
@@ -11,8 +11,8 @@ Pod::Spec.new do |s|
     s.source       = { :git => 'https://github.com/changsanjiang/SJVideoPlayer.git', :tag => "v#{s.version}" }
     s.requires_arc = true
     s.dependency 'Masonry'
-    s.dependency 'SJBaseVideoPlayer', '>= 2.3.5'
-    s.dependency 'SJUIKit/AttributesFactory', '0.0.0.23'
+    s.dependency 'SJBaseVideoPlayer', '>= 2.4.0'
+    s.dependency 'SJUIKit/AttributesFactory'
 
     s.source_files = 'SJVideoPlayer/*.{h,m}'
 

diff --git a/SJVideoPlayer/SJEdgeControlLayer/SJEdgeControlLayer.m b/SJVideoPlayer/SJEdgeControlLayer/SJEdgeControlLayer.m
@@ -789,7 +789,7 @@ - (void)_draggingDidEnd:(__kindof SJBaseVideoPlayer *)videoPlayer {
     [videoPlayer seekToTime:_draggingProgressView.progressTime completionHandler:^(BOOL finished) {
         __strong typeof(_self) self = _self;
         if ( !self ) return;
-        if ( ![self.videoPlayer playStatus_isPlaying] )[self.videoPlayer play];
+        [self.videoPlayer play];
     }];
     sj_view_makeDisappear(_draggingProgressView, YES, ^{
         if ( sj_view_isDisappeared(self->_draggingProgressView) ) {

diff --git a/...yer/SJFilmEditingControlLayer/Core/ControlLayer/SJFilmEditingGenerateResultControlLayer.m b/...yer/SJFilmEditingControlLayer/Core/ControlLayer/SJFilmEditingGenerateResultControlLayer.m
@@ -579,6 +579,9 @@ - (BOOL)videoPlayer:(__kindof SJBaseVideoPlayer *)videoPlayer gestureRecognizerS
     return NO;
 }
 
+- (BOOL)canPerformPlayForVideoPlayer:(__kindof SJBaseVideoPlayer *)videoPlayer {
+    return NO;
+}
 - (void)controlLayerNeedAppear:(__kindof SJBaseVideoPlayer *)videoPlayer { }
 - (void)controlLayerNeedDisappear:(__kindof SJBaseVideoPlayer *)videoPlayer { }
 @end

diff --git a/SJVideoPlayer/SJVideoPlayer.m b/SJVideoPlayer/SJVideoPlayer.m
@@ -84,7 +84,7 @@ - (void)dealloc {
 #endif
 
 + (NSString *)version {
-    return @"v2.5.4";
+    return @"v2.5.5";
 }
 
 + (instancetype)player {

diff --git a/SJVideoPlayerProject/Podfile.lock b/SJVideoPlayerProject/Podfile.lock
@@ -1,75 +1,75 @@
 PODS:
   - Masonry (1.1.0)
   - Reachability (3.2)
-  - SJBaseVideoPlayer (2.3.5):
+  - SJBaseVideoPlayer (2.4.0):
     - Masonry
     - Reachability
-    - SJBaseVideoPlayer/Header (= 2.3.5)
-    - SJBaseVideoPlayer/Model (= 2.3.5)
-    - SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.3.5)
-    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.3.5)
-    - SJBaseVideoPlayer/SJPrompt (= 2.3.5)
-    - SJBaseVideoPlayer/SJRotationManager (= 2.3.5)
-    - SJBaseVideoPlayer/Tool (= 2.3.5)
+    - SJBaseVideoPlayer/Header (= 2.4.0)
+    - SJBaseVideoPlayer/Model (= 2.4.0)
+    - SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.4.0)
+    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.4.0)
+    - SJBaseVideoPlayer/SJPrompt (= 2.4.0)
+    - SJBaseVideoPlayer/SJRotationManager (= 2.4.0)
+    - SJBaseVideoPlayer/Tool (= 2.4.0)
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/Header (2.3.5):
+  - SJBaseVideoPlayer/Header (2.4.0):
     - Masonry
     - Reachability
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/Model (2.3.5):
+  - SJBaseVideoPlayer/Model (2.4.0):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/SJAVMediaPlaybackController (2.3.5):
+  - SJBaseVideoPlayer/SJAVMediaPlaybackController (2.4.0):
     - Masonry
     - Reachability
-    - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.3.5)
+    - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.4.0)
     - SJBaseVideoPlayer/Tool
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.3.5):
+  - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.4.0):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Tool
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.3.5):
+  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.4.0):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
-    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.3.5)
-    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.3.5)
+    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.4.0)
+    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.4.0)
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.3.5):
+  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.4.0):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.3.5):
+  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.4.0):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/SJPrompt (2.3.5):
+  - SJBaseVideoPlayer/SJPrompt (2.4.0):
     - Masonry
     - Reachability
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/SJRotationManager (2.3.5):
+  - SJBaseVideoPlayer/SJRotationManager (2.4.0):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJUIKit/ObserverHelper (>= 0.0.0.23)
     - SJUIKit/Queues (>= 0.0.0.23)
-  - SJBaseVideoPlayer/Tool (2.3.5):
+  - SJBaseVideoPlayer/Tool (2.4.0):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
@@ -233,7 +233,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  SJBaseVideoPlayer: 71bbc075b6d3be3b84212c6e82ce98cf0cdf76b4
+  SJBaseVideoPlayer: bcaac05761383c55deeca9fc1c4b3acfc0e45afa
   SJFullscreenPopGesture: 94db6f970d864d53161d819916aed3f30b6a1442
   SJPlaybackListController: bb150965596f46cc5542b37c05d8401601db4022
   SJRouter: 62dd20b18a199ca9d251817449b901f9228daad1

diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/AVAsset+SJAVMediaExport.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/AVAsset+SJAVMediaExport.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaDefinitionLoader.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaDefinitionLoader.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaMainPresenter.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaMainPresenter.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaModelProtocol.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaModelProtocol.h
diff --git a/...ods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAsset+SJAVMediaPlaybackControllerAdd.h b/...ods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAsset+SJAVMediaPlaybackControllerAdd.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAsset.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAsset.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAssetLoader.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAssetLoader.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAssetProtocol.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayAssetProtocol.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlaybackDefines.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlaybackDefines.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayer.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayer.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayerLoader.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayerLoader.h
diff --git a/...eoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJMediaPlaybackControllerDefines.h b/...eoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJMediaPlaybackControllerDefines.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJMediaPlaybackProtocol.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJMediaPlaybackProtocol.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayStatusObserver.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayStatusObserver.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoPlayerPreviewInfo.h b/SJVideoPlayerProject/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoPlayerPreviewInfo.h
diff --git a/...oject/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoPlayerURLAsset+SJAVMediaPlaybackAdd.h b/...oject/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoPlayerURLAsset+SJAVMediaPlaybackAdd.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/AVAsset+SJAVMediaExport.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/AVAsset+SJAVMediaExport.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaDefinitionLoader.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaDefinitionLoader.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaMainPresenter.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaMainPresenter.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaModelProtocol.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaModelProtocol.h
diff --git a/...Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAsset+SJAVMediaPlaybackControllerAdd.h b/...Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAsset+SJAVMediaPlaybackControllerAdd.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAsset.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAsset.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAssetLoader.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAssetLoader.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAssetProtocol.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayAssetProtocol.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlaybackDefines.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlaybackDefines.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayer.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayer.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayerLoader.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJAVMediaPlayerLoader.h
diff --git a/...deoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJMediaPlaybackControllerDefines.h b/...deoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJMediaPlaybackControllerDefines.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJMediaPlaybackProtocol.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJMediaPlaybackProtocol.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJPlayStatusObserver.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJPlayStatusObserver.h
diff --git a/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoPlayerPreviewInfo.h b/SJVideoPlayerProject/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoPlayerPreviewInfo.h
diff --git a/...roject/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoPlayerURLAsset+SJAVMediaPlaybackAdd.h b/...roject/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoPlayerURLAsset+SJAVMediaPlaybackAdd.h
diff --git a/SJVideoPlayerProject/Pods/Local Podspecs/SJBaseVideoPlayer.podspec.json b/SJVideoPlayerProject/Pods/Local Podspecs/SJBaseVideoPlayer.podspec.json
diff --git a/SJVideoPlayerProject/Pods/Manifest.lock b/SJVideoPlayerProject/Pods/Manifest.lock