From 12adf3f5eca9c635aa1870bfe5b7bf3ec32559f9 Mon Sep 17 00:00:00 2001 From: AhnSangHoon Date: Wed, 24 Aug 2022 21:24:49 +0900 Subject: [PATCH] =?UTF-8?q?:recycle:=20=ED=83=80=EC=9D=B4=EB=A8=B8=20?= =?UTF-8?q?=EB=A7=8C=EB=A3=8C=20=EC=A4=91=EB=B3=B5=20biding=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0(#189)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/App/Sources/Common/SplashViewModel.swift | 10 +--------- .../Sources/Main/MainCollectionViewDataSource.swift | 5 +++-- Projects/App/Sources/Main/MainViewController.swift | 2 -- Projects/App/Sources/Main/MainViewModel.swift | 6 +----- Projects/App/Sources/Main/View/MainView.swift | 2 ++ 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/Projects/App/Sources/Common/SplashViewModel.swift b/Projects/App/Sources/Common/SplashViewModel.swift index 0228543b..fb8c2819 100644 --- a/Projects/App/Sources/Common/SplashViewModel.swift +++ b/Projects/App/Sources/Common/SplashViewModel.swift @@ -44,19 +44,11 @@ final class SplashViewModel: SplashViewModelProtocol { } private func changeRootViewController(deadlineData: Int) { - - var isDeadlineDataExist = true - - if deadlineData == 0 { - isDeadlineDataExist = false - } - let rootViewController = MainViewController( MainViewModel( network: Network(), repository: CategoryRepository(CategoryService(network: Network())), - OCRRepository: OCRRepository(OCRService(network: Network())), - deadlineDataExist: isDeadlineDataExist + OCRRepository: OCRRepository(OCRService(network: Network())) )) let navigationController = UINavigationController(rootViewController: rootViewController) diff --git a/Projects/App/Sources/Main/MainCollectionViewDataSource.swift b/Projects/App/Sources/Main/MainCollectionViewDataSource.swift index b166a07b..773c14e3 100644 --- a/Projects/App/Sources/Main/MainCollectionViewDataSource.swift +++ b/Projects/App/Sources/Main/MainCollectionViewDataSource.swift @@ -24,7 +24,7 @@ final class MainCollectionViewDataSource: NSObject, UICollectionViewDataSource { var didDeadLineCountdownTimeOver = PublishRelay() var selectedCategoryIndexPath: IndexPath? = nil - private let disposeBag = DisposeBag() + private var deadLineDisposeBag = DisposeBag() func numberOfSections(in collectionView: UICollectionView) -> Int { // TODO: 마감임박 데이터 없을 때의 경우 처리 필요 @@ -67,7 +67,7 @@ final class MainCollectionViewDataSource: NSObject, UICollectionViewDataSource { cell.gifticonApplyButtonDelegate = self cell.countdownTimeOver .bind(to: didDeadLineCountdownTimeOver) - .disposed(by: disposeBag) + .disposed(by: deadLineDisposeBag) return cell case .category: guard let cell = collectionView.dequeReusableCell(CategoryCollectionViewCell.self, @@ -112,6 +112,7 @@ final class MainCollectionViewDataSource: NSObject, UICollectionViewDataSource { extension MainCollectionViewDataSource { func updateDeadLineData(_ list: [GifticonCard]) { deadLineData = list + deadLineDisposeBag = DisposeBag() } func updateCategoryData(_ list: [Category]) { diff --git a/Projects/App/Sources/Main/MainViewController.swift b/Projects/App/Sources/Main/MainViewController.swift index a8b59c15..e26f8a22 100644 --- a/Projects/App/Sources/Main/MainViewController.swift +++ b/Projects/App/Sources/Main/MainViewController.swift @@ -144,8 +144,6 @@ final class MainViewController: BaseViewController { mainView.configureDataSource(viewModel.mainDataSource) mainView.configureDelegate(viewModel.mainDelegate) - mainView.isDeadlineDataExist.accept(viewModel.isDeadlineDataExist.value) - view.addSubview(mainView) mainView.snp.makeConstraints { $0.top.equalTo(navigationBar.snp.bottom) diff --git a/Projects/App/Sources/Main/MainViewModel.swift b/Projects/App/Sources/Main/MainViewModel.swift index ad0324b5..0d3d7ccf 100644 --- a/Projects/App/Sources/Main/MainViewModel.swift +++ b/Projects/App/Sources/Main/MainViewModel.swift @@ -96,17 +96,13 @@ final class MainViewModel: MainViewModelProtocol { init( network: Networking, repository: CategoryRepositoryLogic, - OCRRepository: OCRRepositoryLogic, - deadlineDataExist: Bool + OCRRepository: OCRRepositoryLogic ) { self.gifticonService = GifticonService(network: network) self.categoryRepository = repository self.OCRRepository = OCRRepository - self.isDeadlineDataExist.accept(deadlineDataExist) - deadlineInfo() category() - gifticonList() bind() } diff --git a/Projects/App/Sources/Main/View/MainView.swift b/Projects/App/Sources/Main/View/MainView.swift index bfd95b5c..821a1535 100644 --- a/Projects/App/Sources/Main/View/MainView.swift +++ b/Projects/App/Sources/Main/View/MainView.swift @@ -34,6 +34,8 @@ final class MainView: BaseView { backgroundColor = .clear isDeadlineDataExist + .skip(1) + .throttle(.milliseconds(500), scheduler: MainScheduler.instance) .subscribe(onNext: { [weak self] _ in self?.reloadCollectionViewSection(.deadLine) })