marinofaggiana 4 년 전
부모
커밋
18b9322392
2개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 5 5
      iOSClient/Viewer/NCViewerImage/NCViewerImage.swift
  2. 3 3
      iOSClient/Viewer/NCViewerVideoAudio/NCViewerVideoAudio.swift

+ 5 - 5
iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -390,16 +390,16 @@ class NCViewerImage: UIViewController, UIGestureRecognizerDelegate {
         toolBar.isHidden = true
         
         videoStop()
-        
+    }
+    
+    func viewDidAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
+                
         if (currentMetadata.typeFile == k_metadataTypeFile_video || currentMetadata.typeFile == k_metadataTypeFile_audio) {
 
             toolBar.isHidden = false
             videoPlayWith(metadata: metadata)
         }
-    }
-    
-    func viewDidAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
-                
+        
         if !NCOperationQueue.shared.downloadExists(metadata: metadata) {
             self.progressView.progress = 0
         }

+ 3 - 3
iOSClient/Viewer/NCViewerVideoAudio/NCViewerVideoAudio.swift

@@ -63,12 +63,12 @@ class NCViewerVideoAudio: AVPlayerViewController {
         }
     }
     
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
         
         player?.pause()
         
-        player?.removeObserver(self, forKeyPath: "rate", context: nil)
+        player?.removeObserver(self, forKeyPath: "rate")
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: nil)
         
         NCKTVHTTPCache.shared.stopProxy()