Skip to content

Commit

Permalink
Release 2.5.1
Browse files Browse the repository at this point in the history 
- 完善 LoadingView 相关操作
  • Loading branch information
@changsanjiang
changsanjiang committed Mar 25, 2019
1 parent 67d67b4 commit 83741b0
Show file tree
Hide file tree
Showing 26 changed files with 1,929 additions and 1,911 deletions.
4 changes: 2 additions & 2 deletions SJVideoPlayer.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'SJVideoPlayer'
s.version = '2.5.0'
s.version = '2.5.1'
s.summary = 'video player.'
s.description = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
s.homepage = 'https://github.com/changsanjiang/SJVideoPlayer'
Expand All @@ -11,7 +11,7 @@ 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.1'
s.dependency 'SJBaseVideoPlayer', '>= 2.3.2'
s.dependency 'SJAttributesFactory'

s.source_files = 'SJVideoPlayer/*.{h,m}'
Expand Down
8 changes: 7 additions & 1 deletion SJVideoPlayer/SJEdgeControlLayer/SJEdgeControlLayer.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ - (void)restartControlLayer {
else {
[_videoPlayer controlLayerNeedDisappear];
}
[self _startOrStopLoadingView];
}

/// 控制层退场
Expand Down Expand Up @@ -700,7 +701,7 @@ - (SJNetworkLoadingView *)loadingView {
}

- (void)_updateNetworkSpeedStrForLoadingView {
if ( !_loadingView.isAnimating )
if ( !_videoPlayer || !_loadingView.isAnimating )
return;

if ( _showNetworkSpeedToLoadingView && !_videoPlayer.assetURL.isFileURL ) {
Expand Down Expand Up @@ -899,6 +900,11 @@ - (void)videoPlayer:(__kindof SJBaseVideoPlayer *)videoPlayer bufferStatusDidCha
}

- (void)_startOrStopLoadingView {
if ( !_videoPlayer ) {
[_loadingView stop];
return;
}

SJPlayerBufferStatus bufferStatus = self.videoPlayer.playbackController.bufferStatus;
if ( [_videoPlayer playStatus_isPaused_ReasonSeeking] ||
[_videoPlayer playStatus_isPrepare] ) {
Expand Down
114 changes: 57 additions & 57 deletions SJVideoPlayerProject/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,65 @@ PODS:
- Masonry (1.1.0)
- Reachability (3.2)
- SJAttributesFactory (2.0.5)
- SJBaseVideoPlayer (2.3.1):
- SJBaseVideoPlayer (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header (= 2.3.1)
- SJBaseVideoPlayer/Model (= 2.3.1)
- SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.3.1)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.3.1)
- SJBaseVideoPlayer/SJPrompt (= 2.3.1)
- SJBaseVideoPlayer/SJRotationManager (= 2.3.1)
- SJBaseVideoPlayer/Tool (= 2.3.1)
- SJBaseVideoPlayer/Header (= 2.3.2)
- SJBaseVideoPlayer/Model (= 2.3.2)
- SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.3.2)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.3.2)
- SJBaseVideoPlayer/SJPrompt (= 2.3.2)
- SJBaseVideoPlayer/SJRotationManager (= 2.3.2)
- SJBaseVideoPlayer/Tool (= 2.3.2)
- SJObserverHelper
- SJBaseVideoPlayer/Header (2.3.1):
- SJBaseVideoPlayer/Header (2.3.2):
- Masonry
- Reachability
- SJObserverHelper
- SJBaseVideoPlayer/Model (2.3.1):
- SJBaseVideoPlayer/Model (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/SJAVMediaPlaybackController (2.3.1):
- SJBaseVideoPlayer/SJAVMediaPlaybackController (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.3.1)
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.3.2)
- SJBaseVideoPlayer/Tool
- SJObserverHelper
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.3.1):
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Tool
- SJObserverHelper
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.3.1):
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.3.1)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.3.1)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.3.2)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.3.2)
- SJObserverHelper
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.3.1):
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader
- SJObserverHelper
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.3.1):
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/SJPrompt (2.3.1):
- SJBaseVideoPlayer/SJPrompt (2.3.2):
- Masonry
- Reachability
- SJObserverHelper
- SJBaseVideoPlayer/SJRotationManager (2.3.1):
- SJBaseVideoPlayer/SJRotationManager (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/Tool (2.3.1):
- SJBaseVideoPlayer/Tool (2.3.2):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
Expand All @@ -76,48 +76,48 @@ PODS:
- SJRouter/Core (0.0.11)
- SJScrollEntriesView (1.1.0):
- Masonry
- SJVideoPlayer (2.4.8):
- SJVideoPlayer (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Adapters (= 2.4.8)
- SJVideoPlayer/Common (= 2.4.8)
- SJVideoPlayer/Settings (= 2.4.8)
- SJVideoPlayer/SJEdgeControlLayer (= 2.4.8)
- SJVideoPlayer/SJFilmEditingControlLayer (= 2.4.8)
- SJVideoPlayer/SJLoadFailedControlLayer (= 2.4.8)
- SJVideoPlayer/SJLoadingView (= 2.4.8)
- SJVideoPlayer/SJMoreSettingControlLayer (= 2.4.8)
- SJVideoPlayer/SJNotReachableControlLayer (= 2.4.8)
- SJVideoPlayer/SJProgressSlider (= 2.4.8)
- SJVideoPlayer/Switcher (= 2.4.8)
- SJVideoPlayer/Adapters (2.4.8):
- SJVideoPlayer/Adapters (= 2.5.0)
- SJVideoPlayer/Common (= 2.5.0)
- SJVideoPlayer/Settings (= 2.5.0)
- SJVideoPlayer/SJEdgeControlLayer (= 2.5.0)
- SJVideoPlayer/SJFilmEditingControlLayer (= 2.5.0)
- SJVideoPlayer/SJLoadFailedControlLayer (= 2.5.0)
- SJVideoPlayer/SJLoadingView (= 2.5.0)
- SJVideoPlayer/SJMoreSettingControlLayer (= 2.5.0)
- SJVideoPlayer/SJNotReachableControlLayer (= 2.5.0)
- SJVideoPlayer/SJProgressSlider (= 2.5.0)
- SJVideoPlayer/Switcher (= 2.5.0)
- SJVideoPlayer/Adapters (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Common
- SJVideoPlayer/Common (2.4.8):
- SJVideoPlayer/Common (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Settings (2.4.8):
- SJVideoPlayer/Settings (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader
- SJVideoPlayer/SJEdgeControlLayer (2.4.8):
- SJVideoPlayer/SJEdgeControlLayer (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/Common
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (= 2.4.8)
- SJVideoPlayer/SJEdgeControlLayer/View (= 2.4.8)
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (= 2.5.0)
- SJVideoPlayer/SJEdgeControlLayer/View (= 2.5.0)
- SJVideoPlayer/SJLoadingView
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (2.4.8):
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
Expand All @@ -126,7 +126,7 @@ PODS:
- SJVideoPlayer/SJLoadingView
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJEdgeControlLayer/View (2.4.8):
- SJVideoPlayer/SJEdgeControlLayer/View (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
Expand All @@ -136,60 +136,60 @@ PODS:
- SJVideoPlayer/SJLoadingView
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJFilmEditingControlLayer (2.4.8):
- SJVideoPlayer/SJFilmEditingControlLayer (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/SJFilmEditingControlLayer/Core (= 2.4.8)
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (= 2.4.8)
- SJVideoPlayer/SJFilmEditingControlLayer/Core (= 2.5.0)
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (= 2.5.0)
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJFilmEditingControlLayer/Core (2.4.8):
- SJVideoPlayer/SJFilmEditingControlLayer/Core (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (2.4.8):
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJLoadFailedControlLayer (2.4.8):
- SJVideoPlayer/SJLoadFailedControlLayer (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/SJNotReachableControlLayer
- SJVideoPlayer/SJLoadingView (2.4.8):
- SJVideoPlayer/SJLoadingView (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/SJMoreSettingControlLayer (2.4.8):
- SJVideoPlayer/SJMoreSettingControlLayer (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/SJEdgeControlLayer
- SJVideoPlayer/SJMoreSettingControlLayer/Core (= 2.4.8)
- SJVideoPlayer/SJMoreSettingControlLayer/Core (2.4.8):
- SJVideoPlayer/SJMoreSettingControlLayer/Core (= 2.5.0)
- SJVideoPlayer/SJMoreSettingControlLayer/Core (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/SJEdgeControlLayer
- SJVideoPlayer/SJNotReachableControlLayer (2.4.8):
- SJVideoPlayer/SJNotReachableControlLayer (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/SJEdgeControlLayer
- SJVideoPlayer/SJProgressSlider (2.4.8):
- SJVideoPlayer/SJProgressSlider (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
- SJVideoPlayer/Switcher (2.4.8):
- SJVideoPlayer/Switcher (2.5.0):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.3.1)
Expand Down Expand Up @@ -225,14 +225,14 @@ SPEC CHECKSUMS:
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SJAttributesFactory: d5b670fd0930928ac1c6fb0b06653f92fefd640c
SJBaseVideoPlayer: 1db340331b47242bad21c17d7c6f2370a301c603
SJBaseVideoPlayer: 88abb238bcba78573cd232e33c28a78c781906ed
SJFullscreenPopGesture: 94db6f970d864d53161d819916aed3f30b6a1442
SJObserverHelper: baf589280961aeda14acb812ac68f289b753027f
SJPlaybackListController: bb150965596f46cc5542b37c05d8401601db4022
SJRouter: 62dd20b18a199ca9d251817449b901f9228daad1
SJScrollEntriesView: 2388fec9dbb6ab639f8966de036394eeb753617d
SJVideoPlayer: 4b662c7af7b5639adb5857b2e06a9aafcfd13d7a
SJVideoPlayer: 3d9c4450e5294951a07437fe86d0be703bd50df3

PODFILE CHECKSUM: 343585d7cf4c7f6f736f85620d2d421ba897bbf8

COCOAPODS: 1.6.0
COCOAPODS: 1.7.0.beta.2
4 changes: 2 additions & 2 deletions SJVideoPlayerProject/Pods/Local Podspecs/SJBaseVideoPlayer.podspec.json
View file

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

4 changes: 2 additions & 2 deletions SJVideoPlayerProject/Pods/Local Podspecs/SJVideoPlayer.podspec.json
View file

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

Loading

0 comments on commit 83741b0

Please sign in to comment.