coding

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -47,7 +47,7 @@ class NCPlayer: AVPlayer {
         NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: currentItem, queue: .main) { (notification) in
             if let item = notification.object as? AVPlayerItem, let currentItem = self.currentItem, item == currentItem {
                 self.seek(to: .zero)
-                self.playerToolBar?.showToolBar(metadata: metadata)
+                self.playerToolBar?.showToolBar(metadata: metadata, detailView: nil)
                 NCKTVHTTPCache.shared.saveCache(metadata: metadata)
             }
         }

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -123,10 +123,13 @@ class NCPlayerToolBar: UIView {
     }
     
     @discardableResult
-    @objc public func showToolBar(metadata: tableMetadata) -> Bool {
+    @objc public func showToolBar(metadata: tableMetadata, detailView: NCViewerMediaDetailView?) -> Bool {
         
         if !self.isHidden { return false}
         if metadata.livePhoto { return false}
+        if let detailView = detailView {
+            if detailView.isShow() { return false }
+        }
         if metadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || metadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue {
             
             updateToolBar()

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -441,13 +441,14 @@ extension NCViewerMedia: UIGestureRecognizerDelegate {
     }
     
     @objc func didSingleTapWith(gestureRecognizer: UITapGestureRecognizer) {
-             
-        if let playerToolBar = currentViewerMediaZoom?.playerToolBar {
-            if playerToolBar.showToolBar(metadata: currentMetadata) {
+
+        if let viewerMediaZoom = currentViewerMediaZoom, let playerToolBar = viewerMediaZoom.playerToolBar {
+            
+            if playerToolBar.showToolBar(metadata: currentMetadata, detailView: viewerMediaZoom.detailView) {
                 return
             }
         }
-
+        
         if currentMode == .full {
             
             navigationController?.setNavigationBarHidden(false, animated: false)

iOSClient/Viewer/NCViewerMedia/NCViewerMediaZoom.swift

@@ -276,7 +276,7 @@ extension NCViewerMediaZoom {
         
         scrollView.pinchGestureRecognizer?.isEnabled = true
         
-        playerToolBar.showToolBar(metadata: metadata)
+        playerToolBar.showToolBar(metadata: metadata, detailView: nil)
     }
 }