Эх сурвалжийг харах

coding

Signed-off-by: marinofaggiana <marino@marinofaggiana.com>
marinofaggiana 3 жил өмнө
parent
commit
56e17eb1fe

+ 2 - 10
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -93,15 +93,7 @@ class NCPlayer: NSObject {
         
         timeObserver = appDelegate.player?.addPeriodicTimeObserver(forInterval: CMTimeMakeWithSeconds(1, preferredTimescale: 1), queue: .main, using: { (CMTime) in
             if self.appDelegate.player?.currentItem?.status == .readyToPlay {
-                if var currentTime = self.appDelegate.player?.currentTime(), let playerToolBar = self.playerToolBar {
-                    currentTime = currentTime.convertScale(1000, method: .default)
-                    playerToolBar.playbackSlider.value = Float(currentTime.value)
-                    MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentTime.seconds
-                    playerToolBar.playbackSlider.isEnabled = true
-                    playerToolBar.labelCurrentTime.text = NCUtility.shared.stringFromTime(currentTime)
-                    playerToolBar.labelOverallDuration.text = "-" + NCUtility.shared.stringFromTime(self.durationTime - currentTime)
-                    
-                }
+                self.playerToolBar?.updateToolBar()
             }
         })
         
@@ -262,7 +254,7 @@ class NCPlayer: NSObject {
     func videoSeek(time: CMTime) {
         
         appDelegate.player?.seek(to: time)
-        playerToolBar?.updateToolBar()
+        playerToolBar?.updateToolBar(timeSeek: time)
         self.saveTime(time)
     }
     

+ 11 - 7
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -140,11 +140,9 @@ class NCPlayerToolBar: UIView {
         updateToolBar(commandCenter: true)
     }
     
-    public func updateToolBar(commandCenter: Bool = false) {
+    public func updateToolBar(timeSeek: CMTime? = nil, commandCenter: Bool = false) {
         guard let metadata = self.metadata else { return }
-        
-        var currentTime = appDelegate.player?.currentTime() ?? .zero
-        currentTime = currentTime.convertScale(1000, method: .default)
+        var time: CMTime = .zero
         
         // COMMAND CENTER
         if commandCenter && CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
@@ -177,10 +175,16 @@ class NCPlayerToolBar: UIView {
         }
         
         // SLIDER TIME (START - END)
-        playbackSlider.value = Float(currentTime.value)
-        MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentTime.seconds
+        if timeSeek != nil {
+            time = timeSeek!
+        } else {
+            time = (appDelegate.player?.currentTime() ?? .zero).convertScale(1000, method: .default)
+            
+        }
+        playbackSlider.value = Float(time.value)
+        MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyElapsedPlaybackTime] = time.seconds
         playbackSlider.isEnabled = true
-        labelCurrentTime.text = NCUtility.shared.stringFromTime(currentTime)
+        labelCurrentTime.text = NCUtility.shared.stringFromTime(time)
         
         // BACK
         if #available(iOS 13.0, *) {