From 52defbe4b348153fbc83cb3da650b10bd7fd16e1 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 10 May 2022 02:02:34 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[Del]=20#603=20-=20impact=20feedback=20gene?= =?UTF-8?q?rator=20=EC=A4=91=EB=B3=B5=20=EC=BD=94=EB=93=9C=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - bind 메서드에서 작동하고 있다. --- .../Source/ViewControllers/HabitRoom/SendSparkVC.swift | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift index 25b30dd7..bdf3f4ef 100644 --- a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift +++ b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift @@ -475,13 +475,7 @@ extension SendSparkVC: UICollectionViewDataSource { // MARK: - UICollectionViewDelegate -extension SendSparkVC: UICollectionViewDelegate { - func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - impactFeedbackGenerator = UIImpactFeedbackGenerator(style: .light) - impactFeedbackGenerator?.impactOccurred() - impactFeedbackGenerator = nil - } -} +extension SendSparkVC: UICollectionViewDelegate { } // MARK: Network From 637353bfff55f2a366b9598f0d6fc3e81ae3ee0d Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 10 May 2022 02:03:06 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[Feat]=20#603=20-=20=EC=9D=B4=EB=AF=B8=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=ED=95=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=EC=97=90=EA=B2=8C=20=EC=8A=A4=ED=8C=8C=ED=81=AC=EB=B3=B4?= =?UTF-8?q?=EB=82=B4=EA=B8=B0=EB=A5=BC=20=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?440=20=EC=97=90=EB=9F=AC=EC=BD=94=EB=93=9C=EB=A5=BC=20=EB=84=98?= =?UTF-8?q?=EA=B2=A8=EC=A4=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Source/NetworkServices/Room/RoomAPI.swift | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Spark-iOS/Spark-iOS/Source/NetworkServices/Room/RoomAPI.swift b/Spark-iOS/Spark-iOS/Source/NetworkServices/Room/RoomAPI.swift index 147dfe13..d03ddb90 100644 --- a/Spark-iOS/Spark-iOS/Source/NetworkServices/Room/RoomAPI.swift +++ b/Spark-iOS/Spark-iOS/Source/NetworkServices/Room/RoomAPI.swift @@ -216,7 +216,7 @@ public class RoomAPI { case .success(let response): let statusCode = response.statusCode let data = response.data - let networkResult = self.judgeStatus(by: statusCode, data) + let networkResult = self.judgeSendSparkStatus(by: statusCode, data) completion(networkResult) case .failure(let err): @@ -225,6 +225,22 @@ public class RoomAPI { } } + private func judgeSendSparkStatus(by statusCode: Int, _ data: Data) -> NetworkResult { + let decoder = JSONDecoder() + guard let decodedData = try? decoder.decode(GenericResponse.self, from: data) + else { return .pathErr } + switch statusCode { + case 200: + return .success(decodedData.message) + case 400..<500: + return .requestErr(decodedData.status) + case 500: + return .serverErr + default: + return .networkFail + } + } + func setConsiderRest(roomID: Int, statusType: String, completion: @escaping(NetworkResult) -> Void) { roomProvider.request(.setConsiderRest(roomID: roomID, statusType: statusType)) { result in switch result { From ebff8333eaa1618bc9078ef2f7e65c65f9ca0bf4 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 10 May 2022 02:03:26 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[Feat]=20#603=20-=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=ED=95=9C=20=EC=9C=A0=EC=A0=80=EC=97=90=EA=B2=8C=20=EC=8A=A4?= =?UTF-8?q?=ED=8C=8C=ED=81=AC=20=EB=B3=B4=EB=82=B4=EA=B8=B0=ED=96=88?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/HabitRoom/SendSparkVC.swift | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift index bdf3f4ef..6856f435 100644 --- a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift +++ b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift @@ -488,8 +488,18 @@ extension SendSparkVC { self.dismiss(animated: true) { presentVC?.showSparkToast(x: 20, y: 44, message: "\(self.userName ?? "")에게 스파크를 보냈어요!") } - case .requestErr(let message): - print("sendSparkWithAPI - requestErr: \(message)") + case .requestErr(let status): + if status as? Int == 440 { + let presentVC = self.presentingViewController + self.dismiss(animated: true) { + NotificationCenter.default.post(name: .updateHabitRoom, object: nil) + DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { + presentVC?.showSparkToast(x: 20, y: 44, message: "\(self.userName ?? "")에게 스파크를 보냈어요!") + } + } + } + + print("sendSparkWithAPI - requestErr: \(status)") case .pathErr: print("sendSparkWithAPI - pathErr") case .serverErr: From 2a8923db923d22b73070b559c484394b56c9b2a0 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 10 May 2022 12:39:00 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[Feat]=20#603=20-=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EC=9E=91=EC=84=B1=20=ED=9B=84=20=EB=B3=B4=EB=82=B4?= =?UTF-8?q?=EA=B8=B0=EB=B2=84=ED=8A=BC=20=EC=8B=9C=20=ED=96=85=ED=8B=B1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift index 6856f435..17d735a2 100644 --- a/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift +++ b/Spark-iOS/Spark-iOS/Source/ViewControllers/HabitRoom/SendSparkVC.swift @@ -211,6 +211,7 @@ extension SendSparkVC { // MARK: - @objc Function @objc private func sendSparkWithMessage() { + setFeedbackGenerator() sendSparkWithAPI(content: textField.text ?? "") Analytics.logEvent(Tracking.Select.clickSparkInputText, parameters: nil) }