coding

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -76,9 +76,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)
-                            }
+//                            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

@@ -170,13 +170,19 @@ class NCViewerMedia: UIViewController {
         
         if let userInfo = notification.userInfo as NSDictionary? {
             if let ocId = userInfo["ocId"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId), let errorCode = userInfo["errorCode"] as? Int {
-                if errorCode == 0  && metadata.ocId == currentViewController.metadata.ocId {
-                    if let image = getImageMetadata(metadatas[currentIndex]) {
-                        currentViewController.reload(image: image, metadata: metadata)
+                
+                if errorCode == 0 {
+                    for viewController in self.pageViewController.viewControllers! {
+                        let viewerMediaZoom = viewController as! NCViewerMediaZoom
+                        if viewerMediaZoom.metadata.ocId == ocId {
+                            if let image = getImageMetadata(metadata) {
+                                viewerMediaZoom.reload(image: image, metadata: metadata)
+                            }
+                        }
+                    }
+                    if self.metadatas.first(where: { $0.ocId == metadata.ocId }) != nil {
+                        progressView.progress = 0
                     }
-                }
-                if self.metadatas.first(where: { $0.ocId == metadata.ocId }) != nil {
-                    progressView.progress = 0
                 }
             }
         }
@@ -185,8 +191,14 @@ class NCViewerMedia: UIViewController {
     @objc func downloadedThumbnail(_ notification: NSNotification) {
         
         if let userInfo = notification.userInfo as NSDictionary?, let ocId = userInfo["ocId"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-            if let image = getImageMetadata(metadatas[currentIndex]) {
-                currentViewController.reload(image: image, metadata: metadata)
+            
+            for viewController in self.pageViewController.viewControllers! {
+                let viewerMediaZoom = viewController as! NCViewerMediaZoom
+                if viewerMediaZoom.metadata.ocId == ocId {
+                    if let image = getImageMetadata(metadata) {
+                        viewerMediaZoom.reload(image: image, metadata: metadata)
+                    }
+                }
             }
         }
     }

iOSClient/Viewer/NCViewerMedia/NCViewerMediaZoom.swift

@@ -152,6 +152,7 @@ class NCViewerMediaZoom: UIViewController {
     func reload(image: UIImage, metadata: tableMetadata) {
         
         imageVideoContainer.image = image
+        self.image = image
         self.metadata = metadata
     }