diff --git a/TraccarClient.xcodeproj/project.pbxproj b/TraccarClient.xcodeproj/project.pbxproj index 923762f3512349c44457f7262d6583587b516cd9..c45af4946400a5ef197c2aada28df35359ee2fef 100644 --- a/TraccarClient.xcodeproj/project.pbxproj +++ b/TraccarClient.xcodeproj/project.pbxproj @@ -1381,7 +1381,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = Z7STA3KGEU; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -1558,7 +1558,7 @@ CODE_SIGN_ENTITLEMENTS = TraccarClient/TraccarClient.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = Z7STA3KGEU; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -1597,7 +1597,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = Z7STA3KGEU; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; diff --git a/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate b/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate index 952ea67c5c28428f9b52f6d5f0902a42c09e19ba..26f4a177aef4ed2432c142d7ec85288fae02700d 100644 Binary files a/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate and b/TraccarClient.xcodeproj/project.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TraccarClient/AppManager.swift b/TraccarClient/AppManager.swift index c6b751cecf53048e4d88654cd0266c84a0f299e3..ecb4bead906c4349d62856ce4c5fa00515f0747d 100644 --- a/TraccarClient/AppManager.swift +++ b/TraccarClient/AppManager.swift @@ -39,7 +39,7 @@ final class AppManager { ] // MARK: - Data - var environment: KNEnvironment = .sandbox + var environment: KNEnvironment = .production var delegate: AppDelegate! var isUpdatingProfile: Bool = false var isLoggedIn: Bool { diff --git a/TraccarClient/RequestManager.swift b/TraccarClient/RequestManager.swift index ff46aa2abbd7a8fd7a708ee782b839a5b263e20c..c267b07e8d0b1bab443ec278fe2f50290343ed4b 100644 --- a/TraccarClient/RequestManager.swift +++ b/TraccarClient/RequestManager.swift @@ -15,14 +15,18 @@ // import Foundation - +import Alamofire public class RequestManager: NSObject { public static func sendRequest(_ url: URL, completionHandler handler: @escaping (Bool) -> Void) { - var request = URLRequest(url: url) - request.httpMethod = "POST" - NSURLConnection.sendAsynchronousRequest(request, queue: OperationQueue.main, completionHandler: {(response, data, connectionError) -> Void in - handler(data != nil) - }) + AF.request(url, method: .post).response { response in + switch response.result { + case .success: + print("time: \(Date())") + handler(true) + case .failure: + handler(false) + } + } } } diff --git a/TraccarClient/TransactionsViewController/TransactionsViewController.swift b/TraccarClient/TransactionsViewController/TransactionsViewController.swift index eb6db3d49c316086c046a94b489691b9234fbaa9..795b556866524d42838d62bba1c33472f2d01019 100644 --- a/TraccarClient/TransactionsViewController/TransactionsViewController.swift +++ b/TraccarClient/TransactionsViewController/TransactionsViewController.swift @@ -42,24 +42,28 @@ class TransactionsViewController: KNViewController { // MARK: - Methods class func addMessage(_ message: String) { - let formatter = DateFormatter() - formatter.dateFormat = "HH:mm:ss - " - - messages.append(formatter.string(from: Date()) + (message)) - - if messages.count > LIMIT { - messages.remove(at: 0) + DispatchQueue.main.async { + let formatter = DateFormatter() + formatter.dateFormat = "HH:mm:ss - " + + self.messages.append(formatter.string(from: Date()) + (message)) + + if self.messages.count > self.LIMIT { + self.messages.remove(at: 0) + } + self.transactionViewController?.tableView.reloadData() + self.transactionViewController?.noDataFoundLabel.isHidden = !TransactionsViewController.messages.isEmpty } - transactionViewController?.tableView.reloadData() - transactionViewController?.noDataFoundLabel.isHidden = !TransactionsViewController.messages.isEmpty } class func clearMessages() { - messages.removeAll() - transactionViewController?.tableView.reloadData() - transactionViewController?.noDataFoundLabel.isHidden = !TransactionsViewController.messages.isEmpty + DispatchQueue.main.async { + self.messages.removeAll() + self.transactionViewController?.tableView.reloadData() + self.transactionViewController?.noDataFoundLabel.isHidden = !TransactionsViewController.messages.isEmpty + } } override func viewWillAppear(_ animated: Bool) {