marinofaggiana 3 years ago
parent
commit
79ded535f7

+ 2 - 1
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -37,7 +37,7 @@ class NCPlayer: NSObject {
     public var player: AVPlayer?
     public var videoLayer: AVPlayerLayer?
 
-    init(url: URL, imageVideoContainer: imageVideoContainerView?, playerToolBar: NCPlayerToolBar?, metadata: tableMetadata) {
+    init(url: URL, imageVideoContainer: imageVideoContainerView?, playerToolBar: NCPlayerToolBar?, metadata: tableMetadata, detailView: NCViewerMediaDetailView?) {
         super.init()
         
         print("Play URL: \(url)")
@@ -95,6 +95,7 @@ class NCPlayer: NSObject {
                         NCManageDatabase.shared.addVideoTime(metadata: metadata, time: nil, durationTime: durationTime)
                         self.playerToolBar?.setBarPlayer(ncplayer: self, timeSeek: timeSeek)
                         self.generatorImagePreview()
+                        self.playerToolBar?.showToolBar(metadata: metadata, detailView: detailView)
                     }
                     break
                 case .failed:

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

@@ -518,7 +518,7 @@ extension NCViewerMedia: UIGestureRecognizerDelegate {
                     AudioServicesPlaySystemSound(1519) // peek feedback
                     
                     if let url = NCKTVHTTPCache.shared.getVideoURL(metadata: metadata) {
-                        self.ncplayerLivePhoto = NCPlayer.init(url: url, imageVideoContainer: self.currentViewController.imageVideoContainer, playerToolBar: nil, metadata: metadata)
+                        self.ncplayerLivePhoto = NCPlayer.init(url: url, imageVideoContainer: self.currentViewController.imageVideoContainer, playerToolBar: nil, metadata: metadata, detailView: nil)
                         self.ncplayerLivePhoto?.videoPlay()
                     }
                     
@@ -547,7 +547,7 @@ extension NCViewerMedia: UIGestureRecognizerDelegate {
                                 AudioServicesPlaySystemSound(1519) // peek feedback
                                 
                                 if let url = NCKTVHTTPCache.shared.getVideoURL(metadata: metadata) {
-                                    self.ncplayerLivePhoto = NCPlayer.init(url: url, imageVideoContainer: self.currentViewController.imageVideoContainer, playerToolBar: nil, metadata: metadata)
+                                    self.ncplayerLivePhoto = NCPlayer.init(url: url, imageVideoContainer: self.currentViewController.imageVideoContainer, playerToolBar: nil, metadata: metadata, detailView: nil)
                                     self.ncplayerLivePhoto?.videoPlay()
                                 }
                             }

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

@@ -73,8 +73,6 @@ class NCViewerMediaZoom: UIViewController {
             if image == nil {
                 image = UIImage.init(named: "noPreviewVideo")!.image(color: .gray, size: view.frame.width)
             }
-            // Show Video Toolbar
-            playerToolBar.showToolBar(metadata: metadata, detailView: detailView)
             imageVideoContainer.image = image
             imageVideoContainer.sourceImage = image
             
@@ -82,8 +80,6 @@ class NCViewerMediaZoom: UIViewController {
             if image == nil {
                 image = UIImage.init(named: "noPreviewAudio")!.image(color: .gray, size: view.frame.width)
             }
-            // Show Video Toolbar
-            playerToolBar.showToolBar(metadata: metadata, detailView: detailView)
             imageVideoContainer.image = image
             imageVideoContainer.sourceImage = image
 
@@ -151,7 +147,7 @@ class NCViewerMediaZoom: UIViewController {
         
         if (metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue) {
             if let url = NCKTVHTTPCache.shared.getVideoURL(metadata: metadata) {
-                self.ncplayer = NCPlayer.init(url: url, imageVideoContainer: self.imageVideoContainer, playerToolBar: self.playerToolBar, metadata: self.metadata)
+                self.ncplayer = NCPlayer.init(url: url, imageVideoContainer: self.imageVideoContainer, playerToolBar: self.playerToolBar, metadata: self.metadata, detailView: self.detailView)
             }
         }