diff --git a/iOS/ARShooterExample/ARShooterGame/Podfile b/iOS/ARShooterExample/ARShooterGame/Podfile index 7cbbf01b6..af99c7854 100644 --- a/iOS/ARShooterExample/ARShooterGame/Podfile +++ b/iOS/ARShooterExample/ARShooterGame/Podfile @@ -1,6 +1,6 @@ use_frameworks! -platform :ios, '11.4' +platform :ios, '12.0' # Default Specs.git: source 'https://github.com/CocoaPods/Specs.git' @@ -8,7 +8,7 @@ source 'https://github.com/CocoaPods/Specs.git' plugin 'cocoapods-art', :sources => ['cocoapods-releases'] target 'ARShooter' do - pod 'MobiledgeXiOSLibrary', '= 2.0' + pod 'MobiledgeXiOSLibrary', '= 2.1.0' target 'ARShooterTests' do inherit! :search_paths diff --git a/iOS/ARShooterExample/ARShooterSkeleton/ARShooterSkeleton/LoginViewController/LoginViewController.swift b/iOS/ARShooterExample/ARShooterSkeleton/ARShooterSkeleton/LoginViewController/LoginViewController.swift index ef06e0904..073634b5e 100644 --- a/iOS/ARShooterExample/ARShooterSkeleton/ARShooterSkeleton/LoginViewController/LoginViewController.swift +++ b/iOS/ARShooterExample/ARShooterSkeleton/ARShooterSkeleton/LoginViewController/LoginViewController.swift @@ -22,7 +22,7 @@ import MobiledgeXiOSLibrary import Promises import SocketIO -class LoginViewController: UIViewController { +class LoginViewController: UIViewController, CLLocationManagerDelegate { @IBOutlet weak var gameIDField: UITextField! @IBOutlet weak var userNameField: UITextField! @@ -40,11 +40,6 @@ class LoginViewController: UIViewController { var appVers: String? var orgName: String! var carrierName: String? - var authToken: String? - var uniqueIDType: MobiledgeXiOSLibrary.MatchingEngine.IDTypes? - var uniqueID: String? - var cellID: UInt32? - var tags: [MobiledgeXiOSLibrary.MatchingEngine.Tag]? var host: String? var port: UInt16? var internalPort: UInt16 = 3838 // internal port I specified when deploying my app @@ -53,6 +48,9 @@ class LoginViewController: UIViewController { var demo = true var manager: SocketManager? + + var locationManager: CLLocationManager? + enum LoginViewControllerError: Error { case runtimeError(String) } @@ -68,6 +66,18 @@ class LoginViewController: UIViewController { gameIDField.delegate = self setUpMatchingEngineParameters() + + SKToast.show(withMessage: "Request location permissions not implemented yet") + + mobiledgeXIntegration() + } + + // Location Manager delegate. Called when Authorization Status is changed + func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) { + SKToast.show(withMessage: "Location Manager delegate not implemented yet") + } + + func mobiledgeXIntegration() { DispatchQueue.main.async { self.callMatchingEngineAPIs() self.getWebsocketConnection() diff --git a/iOS/ARShooterExample/ARShooterSkeleton/Podfile b/iOS/ARShooterExample/ARShooterSkeleton/Podfile index e5762ecb7..889377e89 100644 --- a/iOS/ARShooterExample/ARShooterSkeleton/Podfile +++ b/iOS/ARShooterExample/ARShooterSkeleton/Podfile @@ -1,6 +1,6 @@ use_frameworks! -platform :ios, '11.4' +platform :ios, '12.0' # Default Specs.git: source 'https://github.com/CocoaPods/Specs.git' @@ -8,7 +8,7 @@ source 'https://github.com/CocoaPods/Specs.git' plugin 'cocoapods-art', :sources => ['cocoapods-releases'] target 'ARShooterSkeleton' do - pod 'MobiledgeXiOSLibrary', '= 2.0' + pod 'MobiledgeXiOSLibrary', '= 2.1.0' target 'ARShooterSkeletonTests' do inherit! :search_paths