VLC

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -31,33 +31,26 @@ class NCPlayer: NSObject {
 
     internal let appDelegate = UIApplication.shared.delegate as! AppDelegate
     internal var url: URL?
-    internal weak var playerToolBar: NCPlayerToolBar?
-    internal weak var viewController: UIViewController?
-
-    private weak var imageVideoContainer: imageVideoContainerView?
-    private weak var detailView: NCViewerMediaDetailView?
-    private weak var viewerMediaPage: NCViewerMediaPage?
-
-    var player: VLCMediaPlayer?
-    var thumbnailer: VLCMediaThumbnailer?
-    var metadata: tableMetadata
-    var singleTapGestureRecognizer: UITapGestureRecognizer!
+    internal var player: VLCMediaPlayer?
+    internal var thumbnailer: VLCMediaThumbnailer?
+    internal var metadata: tableMetadata
+    internal var singleTapGestureRecognizer: UITapGestureRecognizer!
+    internal var width: Int64?
+    internal var height: Int64?
+    internal let fileNamePreviewLocalPath: String
+    internal let fileNameIconLocalPath: String
 
-    var width: Int64?
-    var height: Int64?
-
-    let fileNamePreviewLocalPath: String
-    let fileNameIconLocalPath: String
+    internal weak var playerToolBar: NCPlayerToolBar?
+    internal weak var imageVideoContainer: imageVideoContainerView?
+    internal weak var viewerMediaPage: NCViewerMediaPage?
 
     // MARK: - View Life Cycle
 
-    init(imageVideoContainer: imageVideoContainerView, playerToolBar: NCPlayerToolBar?, metadata: tableMetadata, detailView: NCViewerMediaDetailView?, viewController: UIViewController, viewerMediaPage: NCViewerMediaPage?) {
+    init(imageVideoContainer: imageVideoContainerView, playerToolBar: NCPlayerToolBar?, metadata: tableMetadata, viewerMediaPage: NCViewerMediaPage?) {
 
         self.imageVideoContainer = imageVideoContainer
         self.playerToolBar = playerToolBar
         self.metadata = metadata
-        self.detailView = detailView
-        self.viewController = viewController
         self.viewerMediaPage = viewerMediaPage
 
         fileNamePreviewLocalPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
@@ -211,9 +204,7 @@ extension NCPlayer: VLCMediaPlayerDelegate {
         case .stopped:
             if let url = self.url {
                 NCManageDatabase.shared.addVideo(metadata: metadata, position: 0)
-                if !(self.detailView?.isShow() ?? false) {
-                    NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterShowPlayerToolBar, userInfo: ["ocId": self.metadata.ocId, "enableTimerAutoHide": false])
-                }
+                NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterShowPlayerToolBar, userInfo: ["ocId": self.metadata.ocId, "enableTimerAutoHide": false])
                 self.thumbnailer?.fetchThumbnail()
                 self.openAVPlayer(url: url)
             }

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -101,7 +101,7 @@ class NCViewerMedia: UIViewController {
                 playerToolBar.viewerMediaPage = viewerMediaPage
             }
 
-            self.ncplayer = NCPlayer.init(imageVideoContainer: self.imageVideoContainer, playerToolBar: self.playerToolBar, metadata: self.metadata, detailView: self.detailView, viewController: self, viewerMediaPage: self.viewerMediaPage)
+            self.ncplayer = NCPlayer(imageVideoContainer: self.imageVideoContainer, playerToolBar: self.playerToolBar, metadata: self.metadata, viewerMediaPage: self.viewerMediaPage)
         }
 
         // TIP
@@ -382,6 +382,8 @@ class NCViewerMedia: UIViewController {
 
     @objc func didPanWith(gestureRecognizer: UIPanGestureRecognizer) {
 
+        guard metadata.classFile == NKCommon.TypeClassFile.image.rawValue else { return }
+
         let currentLocation = gestureRecognizer.translation(in: self.view)
 
         switch gestureRecognizer.state {
@@ -507,9 +509,6 @@ extension NCViewerMedia {
         }
 
         scrollView.pinchGestureRecognizer?.isEnabled = true
-        if metadata.classFile == NKCommon.TypeClassFile.video.rawValue && !metadata.livePhoto && !(ncplayer?.isPlay() ?? false) {
-            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterShowPlayerToolBar, userInfo: ["ocId": metadata.ocId, "enableTimerAutoHide": false])
-        }
     }
 
     func reloadDetail() {