Marino Faggiana 1 жил өмнө
parent
commit
bbd62f9752

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

@@ -238,7 +238,7 @@ class NCViewerMedia: UIViewController {
 
     func loadImage() {
 
-        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId), metadata.isImage else { return }
+        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) else { return }
         self.metadata = metadata
 
         // Download image
@@ -283,12 +283,12 @@ class NCViewerMedia: UIViewController {
                 }
             }
 
-            if metadata.isVideo {
-                return UIImage(named: "noPreviewVideo")!.image(color: .gray, size: view.frame.width)
-            } else if metadata.isAudio {
+            if metadata.isAudio {
                 return UIImage(named: "noPreviewAudio")!.image(color: .gray, size: view.frame.width)
-            } else {
+            } else if metadata.isImage {
                 return UIImage(named: "noPreview")!.image(color: .gray, size: view.frame.width)
+            } else {
+                return nil
             }
         }
 

+ 8 - 3
iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift

@@ -69,7 +69,7 @@ class NCViewerMediaPage: UIViewController {
     var timerAutoHideSeconds: Double {
         get {
             if NCUtility.shared.isSimulator() {
-                return 20
+                return 4
             } else {
                 return 4
             }
@@ -118,8 +118,6 @@ class NCViewerMediaPage: UIViewController {
         progressView.trackTintColor = .clear
         progressView.progress = 0
 
-        startTimerAutoHide()
-
         NotificationCenter.default.addObserver(self, selector: #selector(deleteFile(_:)), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterDeleteFile), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(renameFile(_:)), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterRenameFile), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(moveFile(_:)), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterMoveFile), object: nil)
@@ -150,6 +148,12 @@ class NCViewerMediaPage: UIViewController {
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterApplicationDidBecomeActive), object: nil)
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        startTimerAutoHide()
+    }
+
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
 
@@ -157,6 +161,7 @@ class NCViewerMediaPage: UIViewController {
             ncplayer.playerPause()
         }
         clearCommandCenter()
+        timerAutoHide?.invalidate()
     }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {