Merge pull request #178 from MangoMade/master

fix bug of control view dismissing when played to the end
BrikerMan · Nov 7, 2017 · 1555a1b · 1555a1b
2 parents c5bf08b + ff80fc3
commit 1555a1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Source/BMPlayerControlView.swift b/Source/BMPlayerControlView.swift
@@ -155,7 +155,6 @@ open class BMPlayerControlView: UIView {
             playButton.isSelected = false
             showPlayToTheEndView()
             controlViewAnimation(isShow: true)
-            cancelAutoFadeOutAnimation()
 
         default:
             break
@@ -208,7 +207,9 @@ open class BMPlayerControlView: UIView {
     open func autoFadeOutControlViewWithAnimation() {
         cancelAutoFadeOutAnimation()
         delayItem = DispatchWorkItem { [weak self] in
-            self?.controlViewAnimation(isShow: false)
+            if self?.playerLastState != .playedToTheEnd {
+                self?.controlViewAnimation(isShow: false)
+            }
         }
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + BMPlayerConf.animateDelayTimeInterval,
                                       execute: delayItem!)

diff --git a/Source/BMPlayerLayerView.swift b/Source/BMPlayerLayerView.swift
@@ -103,7 +103,7 @@ open class BMPlayerLayerView: UIView {
     fileprivate var playerLayer: AVPlayerLayer?
     /// 音量滑杆
     fileprivate var volumeViewSlider: UISlider!
-    /// 播发器的几种状态
+    /// 播放器的几种状态
     fileprivate var state = BMPlayerState.notSetURL {
         didSet {
             if state != oldValue {

diff --git a/Source/CacheSupport/BMPlayerManager.swift b/Source/CacheSupport/BMPlayerManager.swift
@@ -44,6 +44,7 @@ open class BMPlayerManager {
     open var enableBrightnessGestures = true
     open var enableVolumeGestures = true
     open var enablePlaytimeGestures = true
+    open var enableChooseDefinition = true
 
     open var cacheManeger = VIResourceLoaderManager()