修复新版控制层切换器在切换具有相同标识的控制层时无法切换的问题

changsanjiang · Apr 3, 2019 · 5bd6209 · 5bd6209
1 parent ec47acb
commit 5bd6209
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/SJVideoPlayer/Switcher/SJControlLayerSwitcher.m b/SJVideoPlayer/Switcher/SJControlLayerSwitcher.m
@@ -72,7 +72,7 @@ - (instancetype)initWithPlayer:(__weak SJBaseVideoPlayer *)videoPlayer {
 }
 
 - (void)switchControlLayerForIdentitfier:(SJControlLayerIdentifier)identifier {
-    id<SJControlLayer> _Nullable oldValue = [self controlLayerForIdentifier:self.currentIdentifier];
+    id<SJControlLayer> _Nullable oldValue = (id)self.videoPlayer.controlLayerDataSource;
     id<SJControlLayer> _Nullable newValue = [self controlLayerForIdentifier:identifier];
     if ( !newValue && _resolveControlLayer ) {
         newValue = _resolveControlLayer(identifier);

diff --git a/...JVideoPlayer.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/...JVideoPlayer.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...PlayerProject/SJVideoPlayer/Demo/自定义控制层 (CustomYourControlLayer)/CustomControlLayerView.m b/...PlayerProject/SJVideoPlayer/Demo/自定义控制层 (CustomYourControlLayer)/CustomControlLayerView.m
@@ -24,6 +24,7 @@ - (void)restartControlLayer {
     sj_view_makeAppear(self.controlView, YES);
     sj_view_makeAppear(_topContainerView, YES);
     sj_view_makeAppear(_bottomContainerView, YES);
+    [_player controlLayerNeedAppear];
 }
 
 - (void)exitControlLayer {