marinofaggiana 3 年之前
父节点
当前提交
99b45508f3

+ 4 - 0
iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -519,6 +519,10 @@ extension NCViewerImage: UIGestureRecognizerDelegate {
             
             UIView.animate(withDuration: 0.2) {
                 self.currentViewerImageZoom?.centreConstraints()
+                // VideoToolBar
+                if self.currentMetadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue || self.currentMetadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue {
+                    self.viewerVideo?.viewerVideoToolBar?.isHidden = false
+                }
             }
             return
         }

+ 6 - 0
iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -165,6 +165,9 @@ class NCViewerImageZoom: UIViewController {
         
         if detailView.isShow() { return }
         
+        // NO ZOOM for Audio / Video
+        if metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue { return }
+        
         let pointInView = gestureRecognizer.location(in: imageView)
         var newZoomScale = scrollView.maximumZoomScale
         
@@ -186,6 +189,9 @@ class NCViewerImageZoom: UIViewController {
     
     @objc func didPanWith(gestureRecognizer: UIPanGestureRecognizer) {
         
+        // NO INFO for Audio / Video
+        if viewerImage?.viewerVideo?.player?.rate == 1 { return }
+        
         let currentLocation = gestureRecognizer.translation(in: self.view)
         
         switch gestureRecognizer.state {

+ 7 - 3
iOSClient/Viewer/NCViewerVideo/NCViewerVideoToolBar.swift

@@ -148,10 +148,11 @@ class NCViewerVideoToolBar: UIView {
             let newTime = playerCurrentTime + seekDuration
             if newTime < CMTimeGetSeconds(duration) {
                 let selectedTime: CMTime = CMTimeMake(value: Int64(newTime * 1000 as Float64), timescale: 1000)
+                
                 player.seek(to: selectedTime)
+                player.pause()
+                player.play()
             }
-            player.pause()
-            player.play()
         }
     }
     
@@ -161,14 +162,17 @@ class NCViewerVideoToolBar: UIView {
         let playerCurrenTime = CMTimeGetSeconds(player.currentTime())
         var newTime = playerCurrenTime - seekDuration
         if newTime < 0 { newTime = 0 }
-        player.pause()
         let selectedTime: CMTime = CMTimeMake(value: Int64(newTime * 1000 as Float64), timescale: 1000)
+        
         player.seek(to: selectedTime)
+        player.pause()
         player.play()
     }
     
     //MARK: - Algorithms
     
+    
+    
     func stringFromTimeInterval(interval: TimeInterval) -> String {
     
         let interval = Int(interval)