소스 검색

fix image view

Signed-off-by: marinofaggiana <marino@marinofaggiana.com>
marinofaggiana 3 년 전
부모
커밋
ba0d320184
2개의 변경된 파일21개의 추가작업 그리고 7개의 파일을 삭제
  1. 17 6
      iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
  2. 4 1
      iOSClient/Viewer/NCViewerMedia/NCViewerMediaZoom.swift

+ 17 - 6
iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

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

+ 4 - 1
iOSClient/Viewer/NCViewerMedia/NCViewerMediaZoom.swift

@@ -172,6 +172,9 @@ class NCViewerMediaZoom: UIViewController {
             
         } else if metadata.classFile == NCCommunicationCommon.typeClassFile.image.rawValue {
             
+            if let image = viewerMedia?.getImageMetadata(metadata) {
+                reload(image: image)
+            }
             viewerMedia?.clearCommandCenter()
         }
         
@@ -197,7 +200,7 @@ class NCViewerMediaZoom: UIViewController {
         }) { (_) in }
     }
     
-    func reload(image: UIImage, metadata: tableMetadata) {
+    func reload(image: UIImage) {
         
         self.image = image
         imageVideoContainer.image = image