coding

iOSClient/Extensions/UIImage+Extensions.swift

@@ -165,4 +165,12 @@ extension UIImage {
         view.drawHierarchy(in: view.bounds, afterScreenUpdates: true)
         return UIGraphicsGetImageFromCurrentImageContext() ?? UIImage()
     }
+    
+    func image(alpha: CGFloat) -> UIImage? {
+        UIGraphicsBeginImageContextWithOptions(size, false, scale)
+        draw(at: .zero, blendMode: .normal, alpha: alpha)
+        let newImage = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        return newImage
+    }
 }

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -72,6 +72,9 @@ class NCPlayer: NSObject {
                             self.videoLayer = AVPlayerLayer(player: self.player)
                             self.videoLayer!.frame = imageVideoContainer.bounds
                             self.videoLayer!.videoGravity = .resizeAspect
+                            if !metadata.livePhoto {
+                                imageVideoContainer.image = imageVideoContainer.image?.image(alpha: 0)
+                            }
                             imageVideoContainer.layer.addSublayer(self.videoLayer!)
                             imageVideoContainer.playerLayer = self.videoLayer
                             imageVideoContainer.metadata = self.metadata

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -564,9 +564,6 @@ extension NCViewerMedia: NCViewerMediaZoomDelegate {
     func didAppearImageZoom(viewerMediaZoom: NCViewerMediaZoom, metadata: tableMetadata) {
          
         /*
-        navigationItem.title = metadata.fileNameView
-        currentMetadata = metadata
-        currentViewerMediaZoom = viewerMediaZoom
         
         if !NCOperationQueue.shared.downloadExists(metadata: metadata) {
             self.progressView.progress = 0

iOSClient/Viewer/NCViewerMedia/NCViewerMediaZoom.swift

@@ -84,16 +84,19 @@ class NCViewerMediaZoom: UIViewController {
                 playerToolBar.isHidden = false
             }
             imageVideoContainer.image = image
+            imageVideoContainer.imageOriginal = image
         } else if metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue {
             if image == nil {
                 image = UIImage.init(named: "noPreviewAudio")!.image(color: .gray, size: view.frame.width)
             }
             imageVideoContainer.image = image
+            imageVideoContainer.imageOriginal = image
         } else {
             if image == nil {
                 image = UIImage.init(named: "noPreview")!.image(color: .gray, size: view.frame.width)
             }
             imageVideoContainer.image = image
+            imageVideoContainer.imageOriginal = image
         }
         
         if NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) != nil {
@@ -114,14 +117,6 @@ class NCViewerMediaZoom: UIViewController {
         viewerMedia?.navigationItem.title = metadata.fileNameView
         viewerMedia?.currentViewerMediaZoom = self
         viewerMedia?.currentMetadata = metadata
-        
-        /*
-        if ncplayer == nil, (metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue),  let url = NCKTVHTTPCache.shared.getVideoURL(metadata: metadata) {
-            
-            self.ncplayer = NCPlayer.init(url: url)
-            self.viewerMedia?.ncplayer = self.ncplayer
-        }
-        */
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -131,7 +126,6 @@ class NCViewerMediaZoom: UIViewController {
             if let url = NCKTVHTTPCache.shared.getVideoURL(metadata: metadata) {
                 self.ncplayer = NCPlayer.init(url: url, imageVideoContainer: self.imageVideoContainer, playerToolBar: self.playerToolBar, metadata: self.metadata)
                 self.viewerMedia?.ncplayer = self.ncplayer
-                //self.player?.videoPlay()
             }
         }
     }
@@ -335,10 +329,8 @@ extension NCViewerMediaZoom: UIScrollViewDelegate {
 class imageVideoContainerView: UIImageView {
     var playerLayer: CALayer?
     var metadata: tableMetadata?
+    var imageOriginal: UIImage?
     override func layoutSublayers(of layer: CALayer) {
-        if metadata?.classFile == NCCommunicationCommon.typeClassFile.video.rawValue && metadata?.livePhoto == false {
-            self.image = nil
-        }
         super.layoutSublayers(of: layer)
         playerLayer?.frame = self.bounds
     }