From 287593c559bc39939384ff69a10ec8afa0ee3820 Mon Sep 17 00:00:00 2001 From: HJ <81843677+HJ39@users.noreply.github.com> Date: Sat, 17 Feb 2024 01:33:59 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=82=A0=EC=A7=9C=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=ED=95=A0=EB=95=8C=20=EC=8B=9C=EA=B0=84=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Base/ViewModel/HomeViewModel.swift | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/On_off_iOS/On_off_iOS/Home/Base/ViewModel/HomeViewModel.swift b/On_off_iOS/On_off_iOS/Home/Base/ViewModel/HomeViewModel.swift index a4ca44e..96a69bd 100644 --- a/On_off_iOS/On_off_iOS/Home/Base/ViewModel/HomeViewModel.swift +++ b/On_off_iOS/On_off_iOS/Home/Base/ViewModel/HomeViewModel.swift @@ -244,10 +244,10 @@ final class HomeViewModel { /// Format Date To String /// - Parameter date: Date /// - Returns: String Type Date - private func formatDateToString(date: Date, seperate: String, idNeedDay: Bool) -> String { + private func formatDateToString(date: Date, seperate: String, isNeedDay: Bool) -> String { let dateFormatter = DateFormatter() dateFormatter.dateFormat = "yyyy\(seperate)MM\(seperate)dd" - if idNeedDay { + if isNeedDay { dateFormatter.dateFormat = "yyyy\(seperate)MM\(seperate)dd\(seperate)EEE" } @@ -268,7 +268,7 @@ final class HomeViewModel { /// Format To Day Info private func formatToDayInfo(date: String) -> DayInfo { - let formatDate = formatDateToString(date: formatStringToDate(date: date),seperate: " ", idNeedDay: true).split(separator: " ") + let formatDate = formatDateToString(date: formatStringToDate(date: date),seperate: " ", isNeedDay: true).split(separator: " ") return DayInfo(totalDate: date, date: "\(formatDate[2])", day: "\(formatDate[3])") } @@ -282,7 +282,8 @@ final class HomeViewModel { /// 미래인지 확인 private func checkFutureDay(indexPath: IndexPath, output: Output) { - let result = Date().dateCompare(fromDate: formatStringToDate(date: output.dayListRelay.value[indexPath.row].totalDate ?? "")) + let today = formatStringToDate(date: formatDateToString(date: Date(), seperate: "-", isNeedDay: false)) + let result = today.dateCompare(fromDate: formatStringToDate(date: output.dayListRelay.value[indexPath.row].totalDate ?? "")) if result == "Future" { output.futureRelay.accept(true) return @@ -329,7 +330,7 @@ final class HomeViewModel { guard let self = self else { return } print(#function) for index in 0..