coding

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -101,14 +101,6 @@ class NCViewerImageZoom: UIViewController {
         detailView.hide()
     }
     
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-            
-        if isShowDetail {
-            openDetail()
-        }
-    }
-    
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
@@ -137,9 +129,7 @@ class NCViewerImageZoom: UIViewController {
         imageView.image = image
         self.metadata = metadata
     }
-    
-    //MARK: - NotificationCenter
-    
+        
     //MARK: - Gesture
 
     @objc func didDoubleTapWith(gestureRecognizer: UITapGestureRecognizer) {
@@ -262,7 +252,9 @@ extension NCViewerImageZoom {
         
         scrollView.pinchGestureRecognizer?.isEnabled = true
         
-        videoToolBar.showToolBar()
+        if !metadata.livePhoto {
+            videoToolBar.showToolBar()
+        }
     }
 }
 

iOSClient/Viewer/NCViewerVideo/NCViewerVideoToolBar.swift

@@ -41,7 +41,7 @@ class NCViewerVideoToolBar: UIView {
     }
     
     var player: AVPlayer?
-    var metadata: tableMetadata!
+    var metadata: tableMetadata?
     
     private var wasInPlay: Bool = false
     private var playbackSliderEvent: sliderEventType = .ended
@@ -187,7 +187,9 @@ class NCViewerVideoToolBar: UIView {
                 playbackSliderEvent = .moved
             case .ended:
                 self.player?.seek(to: targetTime)
-                NCManageDatabase.shared.addVideoTime(metadata: self.metadata, time: targetTime)
+                if let metadata = self.metadata {
+                    NCManageDatabase.shared.addVideoTime(metadata: metadata, time: targetTime)
+                }
                 if wasInPlay {
                     self.player?.play()
                 }
@@ -229,6 +231,7 @@ class NCViewerVideoToolBar: UIView {
     @IBAction func forwardButtonSec(_ sender: Any) {
         guard let player = self.player else { return }
         guard let duration = player.currentItem?.duration else { return }
+        guard let metadata = self.metadata else { return }
         
         let playerCurrentTime = CMTimeGetSeconds(player.currentTime())
         let newTime = playerCurrentTime + seekDuration
@@ -237,12 +240,13 @@ class NCViewerVideoToolBar: UIView {
             let targetTime: CMTime = CMTimeMake(value: Int64(newTime * 1000 as Float64), timescale: 1000)
             
             self.player?.seek(to: targetTime)
-            NCManageDatabase.shared.addVideoTime(metadata: self.metadata, time: targetTime)
+            NCManageDatabase.shared.addVideoTime(metadata: metadata, time: targetTime)
         }
     }
     
     @IBAction func backButtonSec(_ sender: Any) {
         guard let player = self.player else { return }
+        guard let metadata = self.metadata else { return }
 
         let playerCurrenTime = CMTimeGetSeconds(player.currentTime())
         var newTime = playerCurrenTime - seekDuration
@@ -251,6 +255,6 @@ class NCViewerVideoToolBar: UIView {
         let targetTime: CMTime = CMTimeMake(value: Int64(newTime * 1000 as Float64), timescale: 1000)
         
         self.player?.seek(to: targetTime)
-        NCManageDatabase.shared.addVideoTime(metadata: self.metadata, time: targetTime)
+        NCManageDatabase.shared.addVideoTime(metadata: metadata, time: targetTime)
     }
 }