Skip to content

Commit

Permalink
renames
Browse files Browse the repository at this point in the history
  • Loading branch information
changsanjiang committed Jul 14, 2022
1 parent 41a0167 commit 4e7350e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
Binary file not shown.
2 changes: 1 addition & 1 deletion SJVideoPlayer.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'SJVideoPlayer'
s.version = '3.4.0'
s.version = '3.4.1'
s.summary = 'video player.'
s.description = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
s.homepage = 'https://github.com/changsanjiang/SJVideoPlayer'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
///
/// 是否禁止网络状态变化提示
///
@property (nonatomic, getter=isDisabledPromptWhenNetworkStatusChanges) BOOL disabledPromptWhenNetworkStatusChanges;
@property (nonatomic, getter=isDisabledPromptingWhenNetworkStatusChanges) BOOL disabledPromptingWhenNetworkStatusChanges;

///
/// 是否隐藏底部进度条
Expand All @@ -92,14 +92,14 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic) CGFloat bottomProgressIndicatorHeight;

///
/// 自定义状态栏, 当 shouldShowCustomStatusBar 返回YES, 将会显示该状态栏
/// 自定义状态栏, 当 shouldShowsCustomStatusBar 返回YES, 将会显示该状态栏
///
@property (nonatomic, strong, null_resettable) UIView<SJFullscreenModeStatusBar> *customStatusBar NS_AVAILABLE_IOS(11.0);

///
/// 是否应该显示自定义状态栏
///
@property (nonatomic, copy, null_resettable) BOOL(^shouldShowCustomStatusBar)(SJEdgeControlLayer *controlLayer) NS_AVAILABLE_IOS(11.0);
@property (nonatomic, copy, null_resettable) BOOL(^shouldShowsCustomStatusBar)(SJEdgeControlLayer *controlLayer) NS_AVAILABLE_IOS(11.0);

///
/// 是否自动选择`Rotation(旋转)`或`FitOnScreen(充满全屏)`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ - (void)videoPlayer:(SJBaseVideoPlayer *)videoPlayer reachabilityChanged:(SJNetw
if (@available(iOS 11.0, *)) {
[self _reloadCustomStatusBarIfNeeded];
}
if ( _disabledPromptWhenNetworkStatusChanges ) return;
if ( _disabledPromptingWhenNetworkStatusChanges ) return;
if ( [self.videoPlayer.assetURL isFileURL] ) return; // return when is local video.

switch ( status ) {
Expand Down Expand Up @@ -579,8 +579,8 @@ - (void)setCustomStatusBar:(UIView<SJFullscreenModeStatusBar> *)customStatusBar
}
}

- (void)setShouldShowCustomStatusBar:(BOOL (^)(SJEdgeControlLayer * _Nonnull))shouldShowCustomStatusBar NS_AVAILABLE_IOS(11.0) {
_shouldShowCustomStatusBar = shouldShowCustomStatusBar;
- (void)setShouldShowsCustomStatusBar:(BOOL (^)(SJEdgeControlLayer * _Nonnull))shouldShowsCustomStatusBar NS_AVAILABLE_IOS(11.0) {
_shouldShowsCustomStatusBar = shouldShowsCustomStatusBar;
[self _updateAppearStateForCustomStatusBar];
}

Expand Down Expand Up @@ -714,11 +714,11 @@ - (SJEdgeControlButtonItem *)pictureInPictureItem API_AVAILABLE(ios(14.0)) {
return _customStatusBar;
}

@synthesize shouldShowCustomStatusBar = _shouldShowCustomStatusBar;
- (BOOL (^)(SJEdgeControlLayer * _Nonnull))shouldShowCustomStatusBar {
if ( _shouldShowCustomStatusBar == nil ) {
@synthesize shouldShowsCustomStatusBar = _shouldShowsCustomStatusBar;
- (BOOL (^)(SJEdgeControlLayer * _Nonnull))shouldShowsCustomStatusBar {
if ( _shouldShowsCustomStatusBar == nil ) {
BOOL is_iPhoneXSeries = _screen.is_iPhoneXSeries;
[self setShouldShowCustomStatusBar:^BOOL(SJEdgeControlLayer * _Nonnull controlLayer) {
[self setShouldShowsCustomStatusBar:^BOOL(SJEdgeControlLayer * _Nonnull controlLayer) {
if ( UIUserInterfaceIdiomPad == UI_USER_INTERFACE_IDIOM() ) return NO;

if ( controlLayer.videoPlayer.isFitOnScreen ) return NO;
Expand Down Expand Up @@ -749,7 +749,7 @@ - (SJEdgeControlButtonItem *)pictureInPictureItem API_AVAILABLE(ios(14.0)) {
return shouldShow;
}];
}
return _shouldShowCustomStatusBar;
return _shouldShowsCustomStatusBar;
}

@synthesize dateTimerControl = _dateTimerControl;
Expand Down Expand Up @@ -982,7 +982,7 @@ - (void)_updateAppearStateForBottomProgressIndicatorIfNeeded {
}

- (void)_updateAppearStateForCustomStatusBar NS_AVAILABLE_IOS(11.0) {
BOOL shouldShow = self.shouldShowCustomStatusBar(self);
BOOL shouldShow = self.shouldShowsCustomStatusBar(self);
if ( shouldShow ) {
if ( self.customStatusBar.superview == nil ) {
static dispatch_once_t onceToken;
Expand Down
2 changes: 1 addition & 1 deletion SJVideoPlayer/SJVideoPlayer.m
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ - (void)dealloc {
}

+ (NSString *)version {
return @"v3.4.0";
return @"v3.4.1";
}

+ (instancetype)player {
Expand Down

0 comments on commit 4e7350e

Please sign in to comment.