Bladeren bron

fix video

marinofaggiana 4 jaren geleden
bovenliggende
commit
84e66216d3

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

@@ -125,11 +125,8 @@ class NCViewerImage: UIViewController {
         navigationController?.popViewController(animated: true)
     }
     
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-    }
-    
     @objc func openMenuMore() {
+        
         NCViewer.shared.toggleMoreMenu(viewController: self, metadata: currentMetadata)
     }
     
@@ -676,7 +673,9 @@ extension NCViewerImage: NCViewerImageZoomDelegate {
     }
     
     func didAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
-                    
+        
+        videoStop()
+
         if (currentMetadata.typeFile == k_metadataTypeFile_video || currentMetadata.typeFile == k_metadataTypeFile_audio) {
             if pictureInPictureOcId != metadata.ocId {
                 videoPlay(metadata: metadata)
@@ -710,10 +709,6 @@ extension NCViewerImage: NCViewerImageZoomDelegate {
             }
         }
     }
-    
-    func disappearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
-        videoStop()
-    }
 }
 
 //MARK: - NCViewerVideoDelegate

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

@@ -25,7 +25,6 @@ import UIKit
 protocol NCViewerImageZoomDelegate {
     func willAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata)
     func didAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata)
-    func disappearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata)
 }
 
 class NCViewerImageZoom: UIViewController {
@@ -93,12 +92,6 @@ class NCViewerImageZoom: UIViewController {
         delegate?.didAppearImageZoom(viewerImageZoom: self, metadata: metadata)
     }
     
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        delegate?.disappearImageZoom(viewerImageZoom: self, metadata: metadata)
-    }
-    
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()