diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index ed2ed4e..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/FE_APP.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/FE_APP.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/FE_APP.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/FE_APP.xcodeproj/project.xcworkspace/xcuserdata/sojeong.xcuserdatad/UserInterfaceState.xcuserstate b/FE_APP.xcodeproj/project.xcworkspace/xcuserdata/sojeong.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index fe5b8e3..0000000 Binary files a/FE_APP.xcodeproj/project.xcworkspace/xcuserdata/sojeong.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/FE_iOS-main.xcodeproj/project.pbxproj b/FE_iOS-main.xcodeproj/project.pbxproj deleted file mode 100644 index 48e90a5..0000000 --- a/FE_iOS-main.xcodeproj/project.pbxproj +++ /dev/null @@ -1,350 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 50; - objects = { - -/* Begin PBXBuildFile section */ - 532D3DA42658B49F0050134A /* CourseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 532D3DA32658B49F0050134A /* CourseViewController.swift */; }; - 5393FCF22658B3A800C6FF54 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5393FCF12658B3A800C6FF54 /* AppDelegate.swift */; }; - 5393FCF42658B3A800C6FF54 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5393FCF32658B3A800C6FF54 /* SceneDelegate.swift */; }; - 5393FCF62658B3A800C6FF54 /* TrackMyTraceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5393FCF52658B3A800C6FF54 /* TrackMyTraceViewController.swift */; }; - 5393FCF92658B3A800C6FF54 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5393FCF72658B3A800C6FF54 /* Main.storyboard */; }; - 5393FCFB2658B3AA00C6FF54 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5393FCFA2658B3AA00C6FF54 /* Assets.xcassets */; }; - 5393FCFE2658B3AA00C6FF54 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5393FCFC2658B3AA00C6FF54 /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 532D3DA32658B49F0050134A /* CourseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseViewController.swift; sourceTree = ""; }; - 5393FCEE2658B3A800C6FF54 /* FE_iOS-main.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FE_iOS-main.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5393FCF12658B3A800C6FF54 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 5393FCF32658B3A800C6FF54 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 5393FCF52658B3A800C6FF54 /* TrackMyTraceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackMyTraceViewController.swift; sourceTree = ""; }; - 5393FCF82658B3A800C6FF54 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 5393FCFA2658B3AA00C6FF54 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 5393FCFD2658B3AA00C6FF54 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 5393FCFF2658B3AA00C6FF54 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 5393FCEB2658B3A800C6FF54 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 5393FCE52658B3A800C6FF54 = { - isa = PBXGroup; - children = ( - 5393FCF02658B3A800C6FF54 /* FE_iOS-main */, - 5393FCEF2658B3A800C6FF54 /* Products */, - ); - sourceTree = ""; - }; - 5393FCEF2658B3A800C6FF54 /* Products */ = { - isa = PBXGroup; - children = ( - 5393FCEE2658B3A800C6FF54 /* FE_iOS-main.app */, - ); - name = Products; - sourceTree = ""; - }; - 5393FCF02658B3A800C6FF54 /* FE_iOS-main */ = { - isa = PBXGroup; - children = ( - 5393FCF12658B3A800C6FF54 /* AppDelegate.swift */, - 5393FCF32658B3A800C6FF54 /* SceneDelegate.swift */, - 5393FCF52658B3A800C6FF54 /* TrackMyTraceViewController.swift */, - 5393FCF72658B3A800C6FF54 /* Main.storyboard */, - 532D3DA32658B49F0050134A /* CourseViewController.swift */, - 5393FCFA2658B3AA00C6FF54 /* Assets.xcassets */, - 5393FCFC2658B3AA00C6FF54 /* LaunchScreen.storyboard */, - 5393FCFF2658B3AA00C6FF54 /* Info.plist */, - ); - path = "FE_iOS-main"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 5393FCED2658B3A800C6FF54 /* FE_iOS-main */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5393FD022658B3AA00C6FF54 /* Build configuration list for PBXNativeTarget "FE_iOS-main" */; - buildPhases = ( - 5393FCEA2658B3A800C6FF54 /* Sources */, - 5393FCEB2658B3A800C6FF54 /* Frameworks */, - 5393FCEC2658B3A800C6FF54 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "FE_iOS-main"; - productName = "FE_iOS-main"; - productReference = 5393FCEE2658B3A800C6FF54 /* FE_iOS-main.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 5393FCE62658B3A800C6FF54 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1240; - TargetAttributes = { - 5393FCED2658B3A800C6FF54 = { - CreatedOnToolsVersion = 12.4; - }; - }; - }; - buildConfigurationList = 5393FCE92658B3A800C6FF54 /* Build configuration list for PBXProject "FE_iOS-main" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 5393FCE52658B3A800C6FF54; - productRefGroup = 5393FCEF2658B3A800C6FF54 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 5393FCED2658B3A800C6FF54 /* FE_iOS-main */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 5393FCEC2658B3A800C6FF54 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5393FCFE2658B3AA00C6FF54 /* LaunchScreen.storyboard in Resources */, - 5393FCFB2658B3AA00C6FF54 /* Assets.xcassets in Resources */, - 5393FCF92658B3A800C6FF54 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 5393FCEA2658B3A800C6FF54 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5393FCF62658B3A800C6FF54 /* TrackMyTraceViewController.swift in Sources */, - 532D3DA42658B49F0050134A /* CourseViewController.swift in Sources */, - 5393FCF22658B3A800C6FF54 /* AppDelegate.swift in Sources */, - 5393FCF42658B3A800C6FF54 /* SceneDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 5393FCF72658B3A800C6FF54 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 5393FCF82658B3A800C6FF54 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 5393FCFC2658B3AA00C6FF54 /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 5393FCFD2658B3AA00C6FF54 /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 5393FD002658B3AA00C6FF54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 5393FD012658B3AA00C6FF54 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.4; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 5393FD032658B3AA00C6FF54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = FJ57DUH592; - INFOPLIST_FILE = "FE_iOS-main/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "sk.FE-iOS-main-develop"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 5393FD042658B3AA00C6FF54 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = FJ57DUH592; - INFOPLIST_FILE = "FE_iOS-main/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "sk.FE-iOS-main-develop"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 5393FCE92658B3A800C6FF54 /* Build configuration list for PBXProject "FE_iOS-main" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5393FD002658B3AA00C6FF54 /* Debug */, - 5393FD012658B3AA00C6FF54 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 5393FD022658B3AA00C6FF54 /* Build configuration list for PBXNativeTarget "FE_iOS-main" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5393FD032658B3AA00C6FF54 /* Debug */, - 5393FD042658B3AA00C6FF54 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 5393FCE62658B3A800C6FF54 /* Project object */; -} diff --git a/FE_iOS-main.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/FE_iOS-main.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/FE_iOS-main.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/FE_iOS-main.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/FE_iOS-main.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/FE_iOS-main.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/FE_iOS-main.xcodeproj/project.xcworkspace/xcuserdata/sk.xcuserdatad/UserInterfaceState.xcuserstate b/FE_iOS-main.xcodeproj/project.xcworkspace/xcuserdata/sk.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 1a664bf..0000000 Binary files a/FE_iOS-main.xcodeproj/project.xcworkspace/xcuserdata/sk.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/FE_iOS-main.xcodeproj/project.xcworkspace/xcuserdata/sojeong.xcuserdatad/UserInterfaceState.xcuserstate b/FE_iOS-main.xcodeproj/project.xcworkspace/xcuserdata/sojeong.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 920969a..0000000 Binary files a/FE_iOS-main.xcodeproj/project.xcworkspace/xcuserdata/sojeong.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/FE_iOS-main.xcodeproj/xcuserdata/sk.xcuserdatad/xcschemes/xcschememanagement.plist b/FE_iOS-main.xcodeproj/xcuserdata/sk.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 253c0d8..0000000 --- a/FE_iOS-main.xcodeproj/xcuserdata/sk.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - SchemeUserState - - FE_iOS-main.xcscheme_^#shared#^_ - - orderHint - 0 - - - - diff --git a/FE_iOS-main.xcodeproj/xcuserdata/sojeong.xcuserdatad/xcschemes/xcschememanagement.plist b/FE_iOS-main.xcodeproj/xcuserdata/sojeong.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 253c0d8..0000000 --- a/FE_iOS-main.xcodeproj/xcuserdata/sojeong.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - SchemeUserState - - FE_iOS-main.xcscheme_^#shared#^_ - - orderHint - 0 - - - - diff --git a/FE_iOS-main/.DS_Store b/FE_iOS-main/.DS_Store deleted file mode 100644 index e8c6f9e..0000000 Binary files a/FE_iOS-main/.DS_Store and /dev/null differ diff --git a/FE_iOS-main/Base.lproj/Main.storyboard b/FE_iOS-main/Base.lproj/Main.storyboard index 8aba61b..cd569db 100644 --- a/FE_iOS-main/Base.lproj/Main.storyboard +++ b/FE_iOS-main/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -16,34 +16,76 @@ - - + + - + + + + + + + + + + + + + + + + + + - - - + + + @@ -195,5 +237,8 @@ + + + diff --git a/FE_iOS-main/TrackMyTraceViewController.swift b/FE_iOS-main/TrackMyTraceViewController.swift index 89d7e00..b4329e3 100644 --- a/FE_iOS-main/TrackMyTraceViewController.swift +++ b/FE_iOS-main/TrackMyTraceViewController.swift @@ -11,6 +11,7 @@ import MapKit class TrackMyTraceViewController: UIViewController { + var cnt = 0; @IBOutlet weak var userName: UILabel! @IBOutlet weak var userAddress: UILabel! @@ -18,8 +19,29 @@ class TrackMyTraceViewController: UIViewController { @IBAction func pickUpButton(_ sender: Any) { - //send message + if cnt < customerLocation.count { + userAddress.text = customerLocationName[cnt] + let place = MKPlacemark(coordinate: CLLocationCoordinate2D(latitude: customerLocation[cnt].latitude, longitude: customerLocation[cnt].longitude)) + let mapItem = MKMapItem(placemark: place) + let options = [MKLaunchOptionsDirectionsModeKey: + MKLaunchOptionsDirectionsModeDriving] + + mapItem.openInMaps(launchOptions: options) + cnt += 1 + }else{ + cnt = 0 + userAddress.text = customerLocationName[0] + cnt += 1 + } + + + } + + + + + @IBOutlet weak var MapView: MKMapView! @@ -28,13 +50,16 @@ class TrackMyTraceViewController: UIViewController { @IBOutlet weak var destination: UITextField! - var customerLocation: [(latitude:Double, longitude: Double)] = [(0,0),(37.5506753, 127.0409622),(37.520641,126.9139242)] + var customerLocation: [(latitude:Double, longitude: Double)] = [(37.5506753, 127.0409622),(37.520641,126.9139242),(37.338904, 126.5930664),] + + var customerLocationName = [String](repeating: "", count:5) lazy var locationManager: CLLocationManager = { let manager = CLLocationManager() manager.desiredAccuracy = kCLLocationAccuracyBest manager.startUpdatingLocation() manager.delegate = self + return manager }() @@ -65,14 +90,41 @@ class TrackMyTraceViewController: UIViewController { let findLocation = [CLLocation(latitude: customerLocation[0].latitude, longitude: customerLocation[0].longitude), CLLocation(latitude: customerLocation[1].latitude, longitude: customerLocation[1].longitude), CLLocation(latitude: customerLocation[2].latitude, longitude: customerLocation[2].longitude)] - let geocoder = CLGeocoder() - let locale = Locale(identifier: "Ko-kr") - for i in findLocation { - print(i) + + for i in coords.indices { - + let annotation = MKPointAnnotation() + annotation.coordinate = coords[i] + let findLocation = CLLocation(latitude:customerLocation[i].latitude, longitude: customerLocation[i].longitude) + let geocoder = CLGeocoder() + let locale = Locale(identifier: "Ko-kr") + geocoder.reverseGeocodeLocation(findLocation, preferredLocale: locale, completionHandler: {(placemarks, error) in + if let address: [CLPlacemark] = placemarks { + + if let name: String = address.last?.name { + print(String(i) + " " + name) + self.customerLocationName[i] = name + //self.customerLocationName.insert(name, at: i) + print(self.customerLocationName) + //self.lblCurrentLocation.text = self.customerLocationName[i] + + } + + + } + + + }) +// let geocoder = CLGeocoder() +// let locale = Locale(identifier: "Ko-kr") +// for i in findLocation { +// print(i) +// +// +// +// } +// } - for i in coords{ let annotation = MKPointAnnotation()