From b87924476cc229892eae7ea0c3bc1a4ec73984c2 Mon Sep 17 00:00:00 2001 From: SeongKookKIM Date: Mon, 9 Sep 2024 14:20:23 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Fix.=EB=9D=BC=EC=9D=B4=EB=94=A9=20=EB=A6=AC?= =?UTF-8?q?=EC=85=8B,=EC=A2=85=EB=A3=94=20=EB=B2=84=ED=8A=BC=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=ED=9B=84=20=EC=B7=A8=EC=86=8C=20=EB=88=84=EB=A5=B4?= =?UTF-8?q?=EB=A9=B4=20=EC=A4=91=EC=A7=80=EB=90=98=EA=B2=8C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RideThis/View/Record/Record/RecordView.swift | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/RideThis/View/Record/Record/RecordView.swift b/RideThis/View/Record/Record/RecordView.swift index c084792..ba8d76e 100644 --- a/RideThis/View/Record/Record/RecordView.swift +++ b/RideThis/View/Record/Record/RecordView.swift @@ -221,9 +221,10 @@ class RecordView: RideThisViewController { self.viewModel.resetRecording() self.enableTabBar() } cancelAction: { - if self.stopButtonTabbed == false { - self.viewModel.resumeRecording() - } +// if self.stopButtonTabbed == false { +// self.viewModel.resumeRecording() +// } + self.stopButtonTabbed = true } }, for: .touchUpInside) @@ -291,9 +292,10 @@ class RecordView: RideThisViewController { self.enableTabBar() } cancelAction: { // MARK: 현재 기록중이었을 때만 종료버튼 후 alert에서 취소를 누르면 계속 기록이 진행되게 하기위해서 - if self.stopButtonTabbed == false { - self.viewModel.resumeRecording() - } +// if self.stopButtonTabbed == false { +// self.viewModel.resumeRecording() +// } + self.stopButtonTabbed = true } }, for: .touchUpInside) } From 53684f1e5b7bd5ab3f54e34d719108c082c2a44f Mon Sep 17 00:00:00 2001 From: SeongKookKIM Date: Mon, 9 Sep 2024 14:24:02 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Comment.=EC=A3=BC=EC=84=9D=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RideThis/View/Record/Record/RecordView.swift | 7 ------- 1 file changed, 7 deletions(-) diff --git a/RideThis/View/Record/Record/RecordView.swift b/RideThis/View/Record/Record/RecordView.swift index ba8d76e..5268ccc 100644 --- a/RideThis/View/Record/Record/RecordView.swift +++ b/RideThis/View/Record/Record/RecordView.swift @@ -221,9 +221,6 @@ class RecordView: RideThisViewController { self.viewModel.resetRecording() self.enableTabBar() } cancelAction: { -// if self.stopButtonTabbed == false { -// self.viewModel.resumeRecording() -// } self.stopButtonTabbed = true } }, for: .touchUpInside) @@ -291,10 +288,6 @@ class RecordView: RideThisViewController { self.viewModel.finishRecording() self.enableTabBar() } cancelAction: { - // MARK: 현재 기록중이었을 때만 종료버튼 후 alert에서 취소를 누르면 계속 기록이 진행되게 하기위해서 -// if self.stopButtonTabbed == false { -// self.viewModel.resumeRecording() -// } self.stopButtonTabbed = true } }, for: .touchUpInside) From f5dd91b7e461ffbd9fa44cfdd000d88179842638 Mon Sep 17 00:00:00 2001 From: SeongKookKIM Date: Mon, 9 Sep 2024 14:49:18 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Fix.=ED=83=88=ED=87=B4=EC=8B=9C=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=EB=94=94=ED=8F=B4=ED=8A=B8Device=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RideThis/View/MyPage/Setting/AccountQuitView.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RideThis/View/MyPage/Setting/AccountQuitView.swift b/RideThis/View/MyPage/Setting/AccountQuitView.swift index 854f43d..b63e3b7 100644 --- a/RideThis/View/MyPage/Setting/AccountQuitView.swift +++ b/RideThis/View/MyPage/Setting/AccountQuitView.swift @@ -176,6 +176,10 @@ class AccountQuitView: RideThisViewController { quitButton.addAction(UIAction { [weak self] _ in guard let self = self else { return } showAlert(alertTitle: "확인", msg: "정말 탈퇴하시겠습니까?", confirm: "예") { + // 탈퇴 시 유저디폴트에 DEVICE정보를 삭제 + let defaults = UserDefaults.standard + defaults.removeObject(forKey: "unkownedDevices") + self.firebaseService.deleteUser(userId: UserService.shared.combineUser!.user_id) } }, for: .touchUpInside)