Merge branch 'iOS/release' into iOS/task/RecordingFlag-Fix

boostcampwm2023 · Dec 11, 2023 · 9ab43ef · 9ab43ef
2 parents bfe1aa7 + f503e88
commit 9ab43ef
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewController.swift b/iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewController.swift
@@ -146,6 +146,7 @@ public final class MapViewController: UIViewController {
         viewModel.state.visibleJourneys
             .receive(on: DispatchQueue.main)
             .sink { [weak self] journeys in
+                self?.clearAnnotations()
                 self?.addAnnotations(with: journeys)
                 self?.drawPolyLinesToMap(with: journeys)
             }

diff --git a/iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/MSProgressView.swift b/iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/MSProgressView.swift
@@ -58,7 +58,7 @@ public final class MSProgressView: UIProgressView {
     // MARK: - Functions: change progress
 
     private func syncProgress(percentage: Float) {
-        self.progress = percentage
+        DispatchQueue.main.async { self.progress = percentage }
     }
 
     // MARK: - Timer

diff --git a/iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/MSProgressViewModel.swift b/iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/MSProgressViewModel.swift
@@ -30,8 +30,9 @@ final class MSProgressViewModel {
     // MARK: - Functions: Timers
 
     internal func startTimer() {
-        self.timer = Timer.publish(every: self.timerTimeInterval, on: .main, in: .common)
+        self.timer = Timer.publish(every: self.timerTimeInterval, on: .current, in: .common)
             .autoconnect()
+            .receive(on: DispatchQueue.global(qos: .background))
             .sink { [weak self] _ in
                 guard let remainingTime = self?.remainingTime,
                       let timerDuration = self?.timerDuration,

diff --git a/...atures/RewindJourney/Sources/RewindJourney/Presentation/RewindJourneyViewController.swift b/...atures/RewindJourney/Sources/RewindJourney/Presentation/RewindJourneyViewController.swift
@@ -49,7 +49,10 @@ public final class RewindJourneyViewController: UIViewController {
 
     private var cancellables: Set<AnyCancellable> = []
     private var presentingImageIndex: Int? {
-        didSet { self.changeProgressViews() }
+        didSet {
+            DispatchQueue.main.async { self.changeProgressViews() }
+            self.restartTimer()
+        }
     }
 
     // MARK: - Properties: Timer
@@ -87,9 +90,9 @@ public final class RewindJourneyViewController: UIViewController {
 
     public override func viewDidLoad() {
         super.viewDidLoad()
+        self.progressViewBinding()
         self.timerBinding()
         self.configure()
-        self.bind()
         self.viewModel.trigger(.viewNeedsLoaded)
     }
 
@@ -103,7 +106,7 @@ public final class RewindJourneyViewController: UIViewController {
 
     // MARK: - Combine Binding
 
-    private func bind() {
+    private func progressViewBinding() {
         self.viewModel.state.photoURLs
             .sink { [weak self] urls in
                 self?.configureProgressViewsLayout(urls: urls)
@@ -122,8 +125,8 @@ public final class RewindJourneyViewController: UIViewController {
     }
 
     private func restartTimer() {
-        self.viewModel.trigger(.startAutoPlay)
         self.viewModel.trigger(.stopAutoPlay)
+        self.viewModel.trigger(.startAutoPlay)
     }
 
     // MARK: - Configuration
@@ -183,6 +186,7 @@ public final class RewindJourneyViewController: UIViewController {
         urls.forEach { _ in
             let progressView = MSProgressView()
             self.progressStackView.addArrangedSubview(progressView)
+            if self.progressViews == nil { self.progressViews = [] }
             self.progressViews?.append(progressView)
         }
     }
@@ -276,7 +280,6 @@ public final class RewindJourneyViewController: UIViewController {
             self.progressViews?[index].isLeftOfCurrentHighlighting = index < presentingIndex ? true : false
             self.progressViews?[index].isHighlighted = index <= presentingIndex ? true : false
         }
-        self.restartTimer()
     }
 
     // MARK: - Actions

diff --git a/iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/RewindJourneyViewModel.swift b/iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/RewindJourneyViewModel.swift
@@ -85,6 +85,7 @@ private extension RewindJourneyViewModel {
     func startTimer() {
         self.timer = Timer.publish(every: self.timerTimeInterval, on: .main, in: .common)
             .autoconnect()
+            .receive(on: DispatchQueue.global(qos: .background))
             .sink { [weak self] _ in
                 self?.state.timerPublisher.send()
             }