Skip to content
Permalink
Browse files

- 修复 `insertItem: rearItem:` 索引错误的问题 - 修复 未设置播放资源时, 剪辑按钮还会显示的问题

- 修复 `insertItem: rearItem:` 索引错误的问题
- 修复 未设置播放资源时, 剪辑按钮还会显示的问题
  • Loading branch information...
changsanjiang committed Nov 30, 2018
1 parent c120a7c commit 4fa1fb06c5584a600fbb3c0f65fadc4af149bc25
@@ -1,2 +1,4 @@

SJVideoPlayerProject/SJVideoPlayer.xcworkspace/xcuserdata/changsanjiang.xcuserdatad/UserInterfaceState.xcuserstate
SJVideoPlayerProject/SJVideoPlayer.xcodeproj/project.pbxproj
SJVideoPlayerProject/SJVideoPlayer.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'SJVideoPlayer'
s.version = '2.2.6'
s.version = '2.2.7'
s.summary = 'video player.'
s.description = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
s.homepage = 'https://github.com/changsanjiang/SJVideoPlayer'
@@ -273,7 +273,7 @@ - (void)insertItem:(SJEdgeControlButtonItem *)item frontItem:(SJEdgeControlButto
[self insertItem:item atIndex:[self indexOfItemForTag:tag]+1];
}
- (void)insertItem:(SJEdgeControlButtonItem *)item rearItem:(SJEdgeControlButtonItemTag)tag {
[self insertItem:item atIndex:[self indexOfItemForTag:tag]-1];
[self insertItem:item atIndex:[self indexOfItemForTag:tag]];
}
- (void)removeItemAtIndex:(NSInteger)index {
if ( index < 0 ) return;
@@ -93,7 +93,7 @@ - (void)dealloc {
}

+ (NSString *)version {
return @"v2.2.6";
return @"v2.2.7";
}

+ (instancetype)player {
@@ -109,7 +109,6 @@ - (instancetype)init {
[self.switcher switchControlLayerForIdentitfier:SJControlLayer_Edge];
/// 显示更多按钮
self.showMoreItemForTopControlLayer = YES;
[self playFailedObserver];
return self;
}

@@ -119,7 +118,6 @@ + (instancetype)lightweightPlayer {
[videoPlayer.switcher addControlLayer:videoPlayer.defaultEdgeLightweightCarrier];
/// 切换到添加的控制层
[videoPlayer.switcher switchControlLayerForIdentitfier:SJControlLayer_Edge];
[videoPlayer playFailedObserver];
return videoPlayer;
}

@@ -133,6 +131,7 @@ - (instancetype)_init {
[self _updateCommonProperties];
}];
[self _updateCommonProperties];
[self playFailedObserver];
return self;
}

@@ -147,7 +146,6 @@ - (SJControlLayerSwitcher *)switcher {
return _switcher = [[SJControlLayerSwitcher alloc] initWithPlayer:self];
}


#pragma mark -
@synthesize defaultEdgeCarrier = _defaultEdgeCarrier;
- (SJControlLayerCarrier *)defaultEdgeCarrier {
@@ -258,7 +256,6 @@ - (nullable SJMoreSettingControlLayer *)defaultMoreSettingControlLayer {
}
return nil;
}

#pragma mark -
@synthesize playFailedObserver = _playFailedObserver;
- (_SJPlayerPlayFailedObserver *)playFailedObserver {
@@ -515,7 +512,7 @@ - (_SJEdgeControlButtonItemDelegate *)filmEditingItemDelegate {
delegate.updatePropertiesIfNeeded = ^(SJEdgeControlButtonItem * _Nonnull item, __kindof SJBaseVideoPlayer * _Nonnull player) {
// 小屏或者 M3U8的时候 自动隐藏
// M3u8 暂时无法剪辑
item.hidden = !player.isFullScreen || player.URLAsset.isM3u8;
item.hidden = (!player.isFullScreen || player.URLAsset.isM3u8) || !player.URLAsset;
item.image = SJVideoPlayerSettings.commonSettings.filmEditingBtnImage;
};

@@ -3,60 +3,60 @@ PODS:
- MJRefresh (3.1.15.7)
- Reachability (3.2)
- SJAttributesFactory (2.0.4)
- SJBaseVideoPlayer (1.7.1):
- SJBaseVideoPlayer (1.7.3):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header (= 1.7.1)
- SJBaseVideoPlayer/Model (= 1.7.1)
- SJBaseVideoPlayer/SJAVMediaPlaybackController (= 1.7.1)
- SJBaseVideoPlayer/SJPrompt (= 1.7.1)
- SJBaseVideoPlayer/SJRotationManager (= 1.7.1)
- SJBaseVideoPlayer/SJVolBrigControl (= 1.7.1)
- SJBaseVideoPlayer/Tool (= 1.7.1)
- SJBaseVideoPlayer/Header (= 1.7.3)
- SJBaseVideoPlayer/Model (= 1.7.3)
- SJBaseVideoPlayer/SJAVMediaPlaybackController (= 1.7.3)
- SJBaseVideoPlayer/SJPrompt (= 1.7.3)
- SJBaseVideoPlayer/SJRotationManager (= 1.7.3)
- SJBaseVideoPlayer/SJVolBrigControl (= 1.7.3)
- SJBaseVideoPlayer/Tool (= 1.7.3)
- SJObserverHelper
- SJBaseVideoPlayer/Header (1.7.1):
- SJBaseVideoPlayer/Header (1.7.3):
- Masonry
- Reachability
- SJObserverHelper
- SJBaseVideoPlayer/Model (1.7.1):
- SJBaseVideoPlayer/Model (1.7.3):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/SJAVMediaPlaybackController (1.7.1):
- SJBaseVideoPlayer/SJAVMediaPlaybackController (1.7.3):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJBaseVideoPlayer/Model
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 1.7.1)
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 1.7.3)
- SJBaseVideoPlayer/Tool
- SJObserverHelper
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (1.7.1):
- SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (1.7.3):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJBaseVideoPlayer/Model
- SJBaseVideoPlayer/Tool
- SJObserverHelper
- SJBaseVideoPlayer/SJPrompt (1.7.1):
- SJBaseVideoPlayer/SJPrompt (1.7.3):
- Masonry
- Reachability
- SJObserverHelper
- SJBaseVideoPlayer/SJRotationManager (1.7.1):
- SJBaseVideoPlayer/SJRotationManager (1.7.3):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
- SJObserverHelper
- SJBaseVideoPlayer/SJVolBrigControl (1.7.1):
- SJBaseVideoPlayer/SJVolBrigControl (1.7.3):
- Masonry
- Reachability
- SJBaseVideoPlayer/SJVolBrigControl/Resource (= 1.7.1)
- SJBaseVideoPlayer/SJVolBrigControl/Resource (= 1.7.3)
- SJObserverHelper
- SJBaseVideoPlayer/SJVolBrigControl/Resource (1.7.1):
- SJBaseVideoPlayer/SJVolBrigControl/Resource (1.7.3):
- Masonry
- Reachability
- SJObserverHelper
- SJBaseVideoPlayer/Tool (1.7.1):
- SJBaseVideoPlayer/Tool (1.7.3):
- Masonry
- Reachability
- SJObserverHelper
@@ -106,7 +106,7 @@ SPEC CHECKSUMS:
MJRefresh: 697f8ec75ebdbe9207767bb682cf0f51b0d8a41f
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SJAttributesFactory: 844e18f8a1a8f974ad32e7d93b5bf3bc064f1bd7
SJBaseVideoPlayer: 851776b03ceb06e6a2fdd635d66fac8964a6f85b
SJBaseVideoPlayer: 8cc1a38cb3f4212a4d5db94214c8bc8583a336b6
SJFullscreenPopGesture: 94db6f970d864d53161d819916aed3f30b6a1442
SJObserverHelper: b8dcf2653dca2538bb601f558bde72c229e08737
SJRouter: 83d99661639b4be9e937e6167c830f9f8283f93f

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

0 comments on commit 4fa1fb0

Please sign in to comment.
You can’t perform that action at this time.