From a0c34403061e4978247693893072fe543baeec44 Mon Sep 17 00:00:00 2001 From: L-j-h-c Date: Sat, 23 Jul 2022 11:49:29 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]=20#220=20-=20=EC=8A=A4=ED=81=AC=EB=9E=A9?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthFoodMe.xcodeproj/project.pbxproj | 12 +++++----- .../Map/MainMapScene/VC/MainMapVC.swift | 4 +--- .../VC/SupplementMapVC.swift | 23 ++++++++++++++++++- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj index e7d249d7..61f9c734 100644 --- a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj +++ b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj @@ -2482,11 +2482,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = HealthFoodMe/HealthFoodMe.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = 4QG3GC35LA; + DEVELOPMENT_TEAM = FY8N9XTH66; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = HealthFoodMe/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "헬푸미"; @@ -2507,9 +2507,9 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.releasedf; + PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.release; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = HealthFoodMe_Dev; + PROVISIONING_PROFILE_SPECIFIER = healthFood_dev; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -2547,7 +2547,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.releasedf; + PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.release; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = healthfood_distribution; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift index 572ae413..7cd2af1f 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift @@ -184,8 +184,6 @@ class MainMapVC: UIViewController, NMFLocationManagerDelegate { setMapView() addObserver() self.bindViewModels() - - let temp: Double = 116.40000000000001 } override func viewWillAppear(_ animated: Bool) { @@ -411,7 +409,7 @@ extension MainMapVC { initialMapOpened = true let NMGPosition = self.locationManager?.currentLatLng() if NMGPosition != nil { - self.mapView.moveCameraPositionWithZoom(LocationLiterals.gangnamStation, 1600) + self.mapView.moveCameraPositionWithZoom(LocationLiterals.gangnamStation, 2000) } isInitialPoint = true } diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/SupplementMapScene/VC/SupplementMapVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/SupplementMapScene/VC/SupplementMapVC.swift index 04f65bb7..d8863e71 100644 --- a/HealthFoodMe/HealthFoodMe/Presentation/Map/SupplementMapScene/VC/SupplementMapVC.swift +++ b/HealthFoodMe/HealthFoodMe/Presentation/Map/SupplementMapScene/VC/SupplementMapVC.swift @@ -98,6 +98,7 @@ class SupplementMapVC: UIViewController, NMFLocationManagerDelegate { bindMapView() setPanGesture() setInitialMarker() + setDelegate() } override func viewWillAppear(_ animated: Bool) { @@ -146,11 +147,14 @@ extension SupplementMapVC { } } + private func setDelegate() { + mapDetailSummaryView.delegate = self + } + func setInitialMapPoint() { switch mapType { case .search: - print(initialId, "체크") if let id = initialId { self.bindSetSelectPointForSearchVC(id: id) } else { @@ -491,6 +495,12 @@ extension SupplementMapVC { } } +extension SupplementMapVC: MapDetailSummaryViewDelegate { + func MapDetailSummaryViewScarp() { + putScrap(userId: UserManager.shared.getUser ?? "", restaurantId: currentRestaurantId) + } +} + // MARK: - Network extension SupplementMapVC { @@ -552,4 +562,15 @@ extension SupplementMapVC { } } } + + private func putScrap(userId: String, restaurantId: String) { + UserService.shared.putScrap(userId: userId, restaurantId: restaurantId) { networkResult in + switch networkResult { + case .success(let message): + print(message) + default: + break; + } + } + } }