marinofaggiana 3 роки тому
батько
коміт
65d8857669

+ 3 - 1
iOSClient/Viewer/NCViewerVideo/NCViewerVideo.swift

@@ -131,7 +131,7 @@ class NCViewerVideo: NSObject {
             
             self.viewerVideoToolBar?.setToolBar()
             
-            if ((self.player?.rate) == 1) {
+            if self.player?.rate == 1 {
                 
                 if let time = NCManageDatabase.shared.getVideoTime(metadata: metadata) {
                     self.player?.seek(to: time)
@@ -145,6 +145,8 @@ class NCViewerVideo: NSObject {
                     let durationSeconds = Double(CMTimeGetSeconds(duration))
                     if timeSecond < durationSeconds {
                         NCManageDatabase.shared.addVideoTime(metadata: metadata, time: self.player?.currentTime())
+                    } else {
+                        NCManageDatabase.shared.deleteVideoTime(metadata: metadata)
                     }
                 }
             }

+ 0 - 14
iOSClient/Viewer/NCViewerVideo/NCViewerVideoToolBar.swift

@@ -43,7 +43,6 @@ class NCViewerVideoToolBar: UIView {
     var player: AVPlayer?
     private var playbackSliderEvent: sliderEventType = .ended
     private let seekDuration: Float64 = 15
-    private var timerAutoHide: Timer?
 
     // MARK: - View Life Cycle
 
@@ -106,9 +105,7 @@ class NCViewerVideoToolBar: UIView {
         setToolBar()
         
         // show
-        timerAutoHide?.invalidate()
         updateOutlet()
-        timerAutoHide = Timer.scheduledTimer(timeInterval: 5, target: self, selector: #selector(autoHideToolBar), userInfo: nil, repeats: true)
         self.isHidden = false
     }
     
@@ -121,17 +118,6 @@ class NCViewerVideoToolBar: UIView {
         self.isHidden = false
     }
     
-    @objc public func autoHideToolBar() {
-        if playbackSliderEvent == .began || playbackSliderEvent == .moved {
-            timerAutoHide?.invalidate()
-            timerAutoHide = Timer.scheduledTimer(timeInterval: 5, target: self, selector: #selector(autoHideToolBar), userInfo: nil, repeats: true)
-            return
-        }
-        if self.player?.rate == 1 {
-            self.isHidden = true
-        }
-    }
-    
     public func setToolBar() {
 
         if player?.rate == 1 {