[Merge] Live 환경 배포 및 업데이트 심사 (v1.9)

Atcha-iOS.xcodeproj/project.pbxproj

@@ -151,6 +151,9 @@
 		6DC3BF5E2E07123F00831470 /* IntroCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DC3BF5D2E07123F00831470 /* IntroCell.swift */; };
 		6DC3BF602E071F0900831470 /* LoginUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DC3BF5F2E071F0900831470 /* LoginUseCase.swift */; };
 		6DC3BF682E0721F300831470 /* LoginDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DC3BF672E0721F300831470 /* LoginDTO.swift */; };
+		6DC617A72F60EB1A002DD641 /* LocationSmoother.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DC617A62F60EB1A002DD641 /* LocationSmoother.swift */; };
+		6DC617A92F610238002DD641 /* HomeArrivalManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DC617A82F610238002DD641 /* HomeArrivalManager.swift */; };
+		6DC617AD2F62EB59002DD641 /* HomeRegistrationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DC617AC2F62EB59002DD641 /* HomeRegistrationCoordinator.swift */; };
 		6DD632B12E4F8A9F00C6A66E /* CheckServiceRegionRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DD632B02E4F8A9F00C6A66E /* CheckServiceRegionRequest.swift */; };
 		6DD632B62E52E23A00C6A66E /* ProximityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DD632B52E52E23A00C6A66E /* ProximityManager.swift */; };
 		6DD632B92E52E8E300C6A66E /* ProximityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DD632B82E52E8E300C6A66E /* ProximityViewController.swift */; };
@@ -472,6 +475,9 @@
 		6DC3BF5D2E07123F00831470 /* IntroCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroCell.swift; sourceTree = "<group>"; };
 		6DC3BF5F2E071F0900831470 /* LoginUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginUseCase.swift; sourceTree = "<group>"; };
 		6DC3BF672E0721F300831470 /* LoginDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDTO.swift; sourceTree = "<group>"; };
+		6DC617A62F60EB1A002DD641 /* LocationSmoother.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationSmoother.swift; sourceTree = "<group>"; };
+		6DC617A82F610238002DD641 /* HomeArrivalManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeArrivalManager.swift; sourceTree = "<group>"; };
+		6DC617AC2F62EB59002DD641 /* HomeRegistrationCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeRegistrationCoordinator.swift; sourceTree = "<group>"; };
 		6DD632B02E4F8A9F00C6A66E /* CheckServiceRegionRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckServiceRegionRequest.swift; sourceTree = "<group>"; };
 		6DD632B52E52E23A00C6A66E /* ProximityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProximityManager.swift; sourceTree = "<group>"; };
 		6DD632B82E52E8E300C6A66E /* ProximityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProximityViewController.swift; sourceTree = "<group>"; };
@@ -687,6 +693,7 @@
 		6D1EE2D62E08E4AB00F7BBF1 /* HomeRegister */ = {
 			isa = PBXGroup;
 			children = (
+				6DC617AB2F62EB4B002DD641 /* Coordinator */,
 				6D1EE2D92E08E4E000F7BBF1 /* HomeRegisterViewController.swift */,
 				6D1EE2DB2E08E4EA00F7BBF1 /* HomeRegisterViewModel.swift */,
 			);
@@ -1109,6 +1116,21 @@
 			path = Login;
 			sourceTree = "<group>";
 		};
+		6DC617AA2F62E931002DD641 /* ChangeHome */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = ChangeHome;
+			sourceTree = "<group>";
+		};
+		6DC617AB2F62EB4B002DD641 /* Coordinator */ = {
+			isa = PBXGroup;
+			children = (
+				6DC617AC2F62EB59002DD641 /* HomeRegistrationCoordinator.swift */,
+			);
+			path = Coordinator;
+			sourceTree = "<group>";
+		};
 		6DD632AE2E4F8A6600C6A66E /* SearchLocation */ = {
 			isa = PBXGroup;
 			children = (
@@ -1181,6 +1203,8 @@
 				6DADA5952EA09B9500CA9BE2 /* Amplitude */,
 				B61C448D2E3F57B600285A4B /* AlarmManager.swift */,
 				6DD632B72E52E8D000C6A66E /* Proximity */,
+				6DC617A62F60EB1A002DD641 /* LocationSmoother.swift */,
+				6DC617A82F610238002DD641 /* HomeArrivalManager.swift */,
 			);
 			path = Manager;
 			sourceTree = "<group>";
@@ -1305,6 +1329,7 @@
 		B65C12D82E042A320016D2F0 /* DIContainer */ = {
 			isa = PBXGroup;
 			children = (
+				6DC617AA2F62E931002DD641 /* ChangeHome */,
 				6D61ABE62F57174500111C9B /* Intro */,
 				B61C44962E40340C00285A4B /* LockScreen */,
 				6D2B8CB62E39C87F00608104 /* BusInfo */,
@@ -2144,6 +2169,7 @@
 				6DB7636D2E45C69400D06A49 /* AlarmRepository.swift in Sources */,
 				6DB7636F2E45C6D100D06A49 /* AlarmRepositoryImpl.swift in Sources */,
 				B65C12E22E042D400016D2F0 /* FetchUserUseCase.swift in Sources */,
+				6DC617AD2F62EB59002DD641 /* HomeRegistrationCoordinator.swift in Sources */,
 				B6EDD73C2E0D87F2006170DF /* FileStorageImpl.swift in Sources */,
 				B6793D4B2E3493D6001BE9F5 /* AtcahaInsetLabel.swift in Sources */,
 				6D2B8CB52E39AC7200608104 /* BusPositionInfoResponse.swift in Sources */,
@@ -2199,6 +2225,7 @@
 				B664018B2E2277A900A397AE /* PushAlarmOption.swift in Sources */,
 				6D26E0072F3C197F005097A4 /* SubwayInfoRepository.swift in Sources */,
 				B65C13082E057C590016D2F0 /* APIService.swift in Sources */,
+				6DC617A92F610238002DD641 /* HomeArrivalManager.swift in Sources */,
 				6D6879D02E4211B800E59C55 /* HomePatchRequest.swift in Sources */,
 				6D9283742E3AFF6A0090889B /* BusRouteCell.swift in Sources */,
 				6D73EB5F2E16120200F8DF8B /* CourseSearchViewModel.swift in Sources */,
@@ -2281,6 +2308,7 @@
 				6DADA5972EA09BA400CA9BE2 /* AmplitudeManager.swift in Sources */,
 				6DD632C22E544DB500C6A66E /* PushAlarmBottomView.swift in Sources */,
 				6D5E03D02E28853E0065AFBE /* CourseSearchResponse.swift in Sources */,
+				6DC617A72F60EB1A002DD641 /* LocationSmoother.swift in Sources */,
 				6D91A8E62E29F5BC0081BAFC /* CourseSettingViewModel.swift in Sources */,
 				6D26E0002F3C17C3005097A4 /* SubwayRealTimeInfoRequest.swift in Sources */,
 				B673C4912E0424FD00EE4AD0 /* SplashViewModel.swift in Sources */,
@@ -2460,7 +2488,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 23SCTLK482;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2483,7 +2511,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2507,7 +2535,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Atcha-iOS/Atcha-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 23SCTLK482;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2530,7 +2558,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.9;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2555,7 +2583,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 23SCTLK482;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2578,7 +2606,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atcha.iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Atcha-iOS/App/DIContainer/Main/MainDIContainer.swift

@@ -48,6 +48,10 @@ final class MainDIContainer {
         LoginDIContainer(apiService: apiService)
     }()
 
+    private lazy var homeRegisterDI: HomeRegisterDIContainer = {
+        HomeRegisterDIContainer(apiService: apiService, locationStateHolder: locationStateHolder)
+    }()
+
     init(apiService: APIService, locationStateHolder: LocationStateHolder) {
         self.apiService = apiService
         self.locationStateHolder = locationStateHolder
@@ -128,3 +132,10 @@ extension MainDIContainer{
     }
 }
 
+
+// MARK: - HomeRegister
+extension MainDIContainer{
+    func makeHomeRegisterDIContainer() -> HomeRegisterDIContainer {
+        return homeRegisterDI
+    }
+}

Atcha-iOS/Core/Manager/AlarmManager.swift

@@ -33,6 +33,7 @@ final class AlarmManager {
     private var shouldKeepBackgroundAudio = false
     private var isPreviewing = false
     private var hapticEngine: CHHapticEngine?
+    private var autoStopWorkItem: DispatchWorkItem?
 
     // MARK: - Init
     private init() {
@@ -71,6 +72,8 @@ final class AlarmManager {
     /// 서버에서 받은 출발 시각 기준으로 1분 전에 반복 푸시/사운드/진동을 시작
     func startAlarm(title: String, body: String) {
         // 기존 알람 상태만 정리 (silent는 유지 or 다시 켜기)
+        autoStopWorkItem?.cancel()
+        autoStopWorkItem = nil
         stopAlarm(keepSilent: true)
         ensureBackgroundSilentRunning()
         applySavedVolumeForAlarmStart()
@@ -99,6 +102,9 @@ final class AlarmManager {
 
     /// 완전 정지: 예약/타이머/진동/알림/오디오 모두 끊기
     func stopAlarm(keepSilent: Bool = false) {
+        autoStopWorkItem?.cancel()
+        autoStopWorkItem = nil
+
         shouldKeepBackgroundAudio = false
         pendingStartWorkItem?.cancel()
         pendingStartWorkItem = nil
@@ -121,6 +127,7 @@ final class AlarmManager {
         }
 
         print("알람 종료 (keepSilent = \(keepSilent))")
+        UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: [AlarmNotificationID.autoStopInfo])
     }
 
     func alarmInit() {
@@ -220,13 +227,19 @@ extension AlarmManager {
 
                 self.sendImmediateLocalPush(title: title, body: body)
             }
+
+        scheduleAutoStop()
     }
 
-    func sendImmediateLocalPush(title: String, body: String) {
+    func sendImmediateLocalPush(title: String, body: String, playSound: Bool = false) {
         let content = UNMutableNotificationContent()
         content.title = title
         content.body = body
-        content.sound = nil // 사운드는 직접 재생 중
+        if playSound {
+            content.sound = .default
+        } else {
+            content.sound = nil
+        }
 
         let request = UNNotificationRequest(
             identifier: UUID().uuidString,
@@ -593,3 +606,37 @@ extension AlarmManager {
         print("미리듣기 종료 (keep=\(shouldKeepBackgroundAudio))")
     }
 }
+
+extension AlarmManager {
+    private func scheduleAutoStop() {
+        autoStopWorkItem?.cancel()
+
+        let content = UNMutableNotificationContent()
+        content.title = "출발 알람이 자동 종료되었어요"
+        content.body = "클릭해서 경로 재탐색하기"
+        content.sound = .default
+
+        let request = UNNotificationRequest(
+            identifier: AlarmNotificationID.autoStopInfo,
+            content: content,
+            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 120.0, repeats: false)
+        )
+        UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
+
+        // 2. 앱 내부의 정지 로직 및 팝업 신호 (포그라운드일 때 즉시, 백그라운드면 켜질 때 실행됨)
+        let workItem = DispatchWorkItem { [weak self] in
+            guard let self = self else { return }
+
+            // 음악/진동 정지
+            self.stopAlarm(keepSilent: false) // 아예 무음까지 끄기
+
+            UserDefaults.standard.set(true, forKey: "isAlarmTimedOut")
+
+            // 메인 뷰에 타임아웃 팝업 띄우라고 신호
+            NotificationCenter.default.post(name: NSNotification.Name("alarmDidTimeout"), object: nil)
+        }
+
+        autoStopWorkItem = workItem
+        DispatchQueue.main.asyncAfter(deadline: .now() + 120.0, execute: workItem)
+    }
+}