Skip to content

Commit

Permalink
Release 2.4.5
Browse files Browse the repository at this point in the history 
- Added `cancelDragging` method into `SJProgressSlider`
- 兼容基类的 `canSeekToTime`
  • Loading branch information
@changsanjiang
changsanjiang committed Mar 12, 2019
1 parent 17bec2e commit bc4c8f8
Show file tree
Hide file tree
Showing 12 changed files with 262 additions and 200 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.4.4'
s.version = '2.4.5'
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.2.0'
s.dependency 'SJBaseVideoPlayer', '>= 2.2.1'
s.dependency 'SJAttributesFactory'

s.source_files = 'SJVideoPlayer/*.{h,m}'
Expand Down
10 changes: 7 additions & 3 deletions SJVideoPlayer/SJEdgeControlLayer/SJEdgeControlLayer.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,13 @@ - (void)clickedFullItem:(SJEdgeControlButtonItem *)item {
}

- (void)sliderWillBeginDragging:(SJProgressSlider *)slider {
if ( _SJSlowPath(!_videoPlayer.canSeekToTime) )
return;
if ( _videoPlayer.canSeekToTime ) {
if ( !_videoPlayer.canSeekToTime(_videoPlayer) ) {
[slider cancelDragging];
return;
}
}

[self _draggingDidStart:_videoPlayer];
}

Expand Down Expand Up @@ -1151,7 +1156,6 @@ - (void)_bottom_updateProgressItem:(SJEdgeControlButtonItem *)progressItem {
slider.bufferProgressColor = setting.progress_bufferColor;
slider.trackHeight = setting.progress_traceHeight;
slider.loadingColor = setting.loadingLineColor;
slider.pan.enabled = _videoPlayer.canSeekToTime;

if ( setting.progress_thumbImage ) {
slider.thumbImageView.image = setting.progress_thumbImage;
Expand Down
3 changes: 3 additions & 0 deletions SJVideoPlayer/SJProgressSlider/SJProgressSlider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ NS_ASSUME_NONNULL_BEGIN
* 是否在拖拽.
*/
@property (nonatomic, assign, readonly) BOOL isDragging;
- (void)cancelDragging; // 取消拖拽

/// 是否加载中
/// - 如果是YES, 将会在拇指上显示菊花圈圈(前提是设置了拇指thumb)
Expand Down Expand Up @@ -188,5 +189,7 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)sliderDidEndDragging:(SJProgressSlider *)slider;


- (void)sliderValueDidChange:(SJProgressSlider *)slider;
@end
NS_ASSUME_NONNULL_END
13 changes: 12 additions & 1 deletion SJVideoPlayer/SJProgressSlider/SJProgressSlider.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ @interface SJProgressSlider ()
@implementation SJProgressSlider {
UILabel *_promptLabel;
NSLayoutConstraint *_promptLabelBottomConstraint;
BOOL _isCancelled;
}

- (instancetype)initWithFrame:(CGRect)frame {
Expand Down Expand Up @@ -106,10 +107,11 @@ - (void)handlePanGR:(UIPanGestureRecognizer *)pan {
case UIGestureRecognizerStateEnded:
case UIGestureRecognizerStateFailed:
case UIGestureRecognizerStateCancelled: {
if ( [self.delegate respondsToSelector:@selector(sliderDidEndDragging:)] ) {
if ( !_isCancelled && [self.delegate respondsToSelector:@selector(sliderDidEndDragging:)] ) {
[self.delegate sliderDidEndDragging:self];
}
_isDragging = NO;
_isCancelled = NO;
}
break;
default:
Expand All @@ -125,6 +127,11 @@ - (void)handleTapGR:(UITapGestureRecognizer *)tap {
else [self setValue:value animated:YES];
}

- (void)cancelDragging {
_isCancelled = YES;
[_pan setValue:@(UIGestureRecognizerStateCancelled) forKey:@"state"];
}

#pragma mark -

- (void)setRound:(BOOL)round {
Expand Down Expand Up @@ -181,6 +188,10 @@ - (void)setValue:(CGFloat)value_new animated:(BOOL)animated {
else {
[self _needUpdateTraceLayout];
}

if ( [self.delegate respondsToSelector:@selector(sliderValueDidChange:)] ) {
[self.delegate sliderValueDidChange:self];
}
}

/// add 此次增加的值
Expand Down
2 changes: 1 addition & 1 deletion SJVideoPlayer/SJVideoPlayer.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ - (void)dealloc {
#endif

+ (NSString *)version {
return @"v2.4.4";
return @"v2.4.5";
}

+ (instancetype)player {
Expand Down
146 changes: 73 additions & 73 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.2.0):
- SJBaseVideoPlayer (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header (= 2.2.0)
- SJBaseVideoPlayer/Model (= 2.2.0)
- SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.2.0)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.2.0)
- SJBaseVideoPlayer/SJPrompt (= 2.2.0)
- SJBaseVideoPlayer/SJRotationManager (= 2.2.0)
- SJBaseVideoPlayer/Tool (= 2.2.0)
- SJBaseVideoPlayer/Header (= 2.2.1)
- SJBaseVideoPlayer/Model (= 2.2.1)
- SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.2.1)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.2.1)
- SJBaseVideoPlayer/SJPrompt (= 2.2.1)
- SJBaseVideoPlayer/SJRotationManager (= 2.2.1)
- SJBaseVideoPlayer/Tool (= 2.2.1)
- SJObserverHelper
- SJBaseVideoPlayer/Header (2.2.0):
- SJBaseVideoPlayer/Header (2.2.1):
- Masonry
- Reachability
- SJObserverHelper
- SJBaseVideoPlayer/Model (2.2.0):
- SJBaseVideoPlayer/Model (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/SJAVMediaPlaybackController (2.2.0):
- SJBaseVideoPlayer/SJAVMediaPlaybackController (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.2.0)
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.2.1)
- SJBaseVideoPlayer/Tool
- SJObserverHelper
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.2.0):
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Tool
- SJObserverHelper
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.2.0):
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.2.0)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.2.0)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.2.1)
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.2.1)
- SJObserverHelper
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.2.0):
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader
- SJObserverHelper
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.2.0):
- SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/SJPrompt (2.2.0):
- SJBaseVideoPlayer/SJPrompt (2.2.1):
- Masonry
- Reachability
- SJObserverHelper
- SJBaseVideoPlayer/SJRotationManager (2.2.0):
- SJBaseVideoPlayer/SJRotationManager (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/Tool (2.2.0):
- SJBaseVideoPlayer/Tool (2.2.1):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
Expand All @@ -76,123 +76,123 @@ PODS:
- SJRouter/Core (0.0.10)
- SJScrollEntriesView (1.1.0):
- Masonry
- SJVideoPlayer (2.4.4):
- SJVideoPlayer (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJVideoPlayer/Adapters (= 2.4.4)
- SJVideoPlayer/Common (= 2.4.4)
- SJVideoPlayer/Settings (= 2.4.4)
- SJVideoPlayer/SJEdgeControlLayer (= 2.4.4)
- SJVideoPlayer/SJFilmEditingControlLayer (= 2.4.4)
- SJVideoPlayer/SJLoadFailedControlLayer (= 2.4.4)
- SJVideoPlayer/SJLoadingView (= 2.4.4)
- SJVideoPlayer/SJMoreSettingControlLayer (= 2.4.4)
- SJVideoPlayer/SJNotReachableControlLayer (= 2.4.4)
- SJVideoPlayer/SJProgressSlider (= 2.4.4)
- SJVideoPlayer/Switcher (= 2.4.4)
- SJVideoPlayer/Adapters (2.4.4):
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Adapters (= 2.4.5)
- SJVideoPlayer/Common (= 2.4.5)
- SJVideoPlayer/Settings (= 2.4.5)
- SJVideoPlayer/SJEdgeControlLayer (= 2.4.5)
- SJVideoPlayer/SJFilmEditingControlLayer (= 2.4.5)
- SJVideoPlayer/SJLoadFailedControlLayer (= 2.4.5)
- SJVideoPlayer/SJLoadingView (= 2.4.5)
- SJVideoPlayer/SJMoreSettingControlLayer (= 2.4.5)
- SJVideoPlayer/SJNotReachableControlLayer (= 2.4.5)
- SJVideoPlayer/SJProgressSlider (= 2.4.5)
- SJVideoPlayer/Switcher (= 2.4.5)
- SJVideoPlayer/Adapters (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Common
- SJVideoPlayer/Common (2.4.4):
- SJVideoPlayer/Common (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJVideoPlayer/Settings (2.4.4):
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Settings (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader
- SJVideoPlayer/SJEdgeControlLayer (2.4.4):
- SJVideoPlayer/SJEdgeControlLayer (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/Common
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (= 2.4.4)
- SJVideoPlayer/SJEdgeControlLayer/View (= 2.4.4)
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (= 2.4.5)
- SJVideoPlayer/SJEdgeControlLayer/View (= 2.4.5)
- SJVideoPlayer/SJLoadingView
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (2.4.4):
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/Common
- SJVideoPlayer/SJLoadingView
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJEdgeControlLayer/View (2.4.4):
- SJVideoPlayer/SJEdgeControlLayer/View (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/Common
- SJVideoPlayer/SJEdgeControlLayer/ResourceLoader
- SJVideoPlayer/SJLoadingView
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJFilmEditingControlLayer (2.4.4):
- SJVideoPlayer/SJFilmEditingControlLayer (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/SJFilmEditingControlLayer/Core (= 2.4.4)
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (= 2.4.4)
- SJVideoPlayer/SJFilmEditingControlLayer/Core (= 2.4.5)
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (= 2.4.5)
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJFilmEditingControlLayer/Core (2.4.4):
- SJVideoPlayer/SJFilmEditingControlLayer/Core (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (2.4.4):
- SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Adapters
- SJVideoPlayer/SJProgressSlider
- SJVideoPlayer/Switcher
- SJVideoPlayer/SJLoadFailedControlLayer (2.4.4):
- SJVideoPlayer/SJLoadFailedControlLayer (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/SJNotReachableControlLayer
- SJVideoPlayer/SJLoadingView (2.4.4):
- SJVideoPlayer/SJLoadingView (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJVideoPlayer/SJMoreSettingControlLayer (2.4.4):
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/SJMoreSettingControlLayer (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/SJEdgeControlLayer
- SJVideoPlayer/SJMoreSettingControlLayer/Core (= 2.4.4)
- SJVideoPlayer/SJMoreSettingControlLayer/Core (2.4.4):
- SJVideoPlayer/SJMoreSettingControlLayer/Core (= 2.4.5)
- SJVideoPlayer/SJMoreSettingControlLayer/Core (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/SJEdgeControlLayer
- SJVideoPlayer/SJNotReachableControlLayer (2.4.4):
- SJVideoPlayer/SJNotReachableControlLayer (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/SJEdgeControlLayer
- SJVideoPlayer/SJProgressSlider (2.4.4):
- SJVideoPlayer/SJProgressSlider (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJVideoPlayer/Switcher (2.4.4):
- SJBaseVideoPlayer (>= 2.2.1)
- SJVideoPlayer/Switcher (2.4.5):
- Masonry
- SJAttributesFactory
- SJBaseVideoPlayer (>= 2.2.0)
- SJBaseVideoPlayer (>= 2.2.1)
- YYText (1.0.7)

DEPENDENCIES:
Expand Down Expand Up @@ -228,13 +228,13 @@ SPEC CHECKSUMS:
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SJAttributesFactory: d5b670fd0930928ac1c6fb0b06653f92fefd640c
SJBaseVideoPlayer: 253b1abb43822928d5abe2f04fa70b57c3c0572b
SJBaseVideoPlayer: d278e3ff6f5956f8dab9c5291d77c10f3b7684ff
SJFullscreenPopGesture: 94db6f970d864d53161d819916aed3f30b6a1442
SJObserverHelper: baf589280961aeda14acb812ac68f289b753027f
SJPlaybackListController: bb150965596f46cc5542b37c05d8401601db4022
SJRouter: e9a0246c2f1aaf6511cf15b2a67788246c08100c
SJScrollEntriesView: 2388fec9dbb6ab639f8966de036394eeb753617d
SJVideoPlayer: c81b7074edd0e073ccfedd069eb67ac1121ebe53
SJVideoPlayer: 2d618a0517e16cd2f7aac1ebadb4686833896604
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849

PODFILE CHECKSUM: 749a590b7694ec430a2273354db28d292a8d8a95
Expand Down
Loading

0 comments on commit bc4c8f8

Please sign in to comment.