Add Mute. v2微调.

changsanjiang · Feb 6, 2018 · cb00f6f · cb00f6f
1 parent e36a145
commit cb00f6f
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 1 deletion.
diff --git a/SJVideoPlayer/SJVideoPlayer.m b/SJVideoPlayer/SJVideoPlayer.m
@@ -41,6 +41,7 @@ - (instancetype)initWithVideoPlayer:(SJVideoPlayer *)videoPlayer;
 - (void)considerDisplay;
 - (void)needDisplay;
 - (void)needHidden;
+- (void)clear;
 @end
 NS_ASSUME_NONNULL_END
 
@@ -1267,6 +1268,10 @@ - (void)needHidden {
     [self _callDelegateMethodWithStatus:NO];
 }
 
+- (void)clear {
+    [self.timerControl clear];
+}
+
 - (SJTimerControl *)timerControl {
     if ( _timerControl ) return _timerControl;
     _timerControl = [[SJTimerControl alloc] init];

diff --git a/SJVideoPlayer/SJVideoPlayerDefaultControlView.m b/SJVideoPlayer/SJVideoPlayerDefaultControlView.m
@@ -639,7 +639,7 @@ - (void)loadCompletion:(SJVideoPlayer *)videoPlayer {
 /// 控制层需要显示.
 - (void)controlLayerNeedAppear:(SJVideoPlayer *)videoPlayer {
     [UIView animateWithDuration:0.3 animations:^{
-        if ( videoPlayer.playOnCell ) {
+        if ( videoPlayer.playOnCell && !videoPlayer.isFullScreen ) {
             if ( videoPlayer.URLAsset.alwaysShowTitle ) [_topControlView appear];
             else [_topControlView disappear];
         }

diff --git a/SJVideoPlayerProject/.DS_Store b/SJVideoPlayerProject/.DS_Store
diff --git a/SJVideoPlayerProject/Pods/SJOrentationObserver/LICENSE.md b/SJVideoPlayerProject/Pods/SJOrentationObserver/LICENSE.md
diff --git a/SJVideoPlayerProject/Pods/SJOrentationObserver/README.md b/SJVideoPlayerProject/Pods/SJOrentationObserver/README.md
diff --git a/SJVideoPlayerProject/Pods/SJOrentationObserver/SJOrentationObserver/SJOrentationObserver.h b/SJVideoPlayerProject/Pods/SJOrentationObserver/SJOrentationObserver/SJOrentationObserver.h
diff --git a/SJVideoPlayerProject/Pods/SJOrentationObserver/SJOrentationObserver/SJOrentationObserver.m b/SJVideoPlayerProject/Pods/SJOrentationObserver/SJOrentationObserver/SJOrentationObserver.m
diff --git a/...layerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/...layerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate