From 0be16feb9e7b4abf098d4b47697efebfc0416400 Mon Sep 17 00:00:00 2001 From: YouTransactor <59020462+YouTransactor@users.noreply.github.com> Date: Tue, 18 Jan 2022 20:53:02 +0100 Subject: [PATCH 1/2] Evolution #8317 [SDK IOS] GetInfo Tag FC : speed Mode Evolution #8313 [SDK IOS] manage the new tag for configuring the speed of the timer of the BLE fsm --- Podfile | 2 +- Podfile.lock | 2 +- .../RPC/DeviceInfoTableViewController.swift | 104 ++++-------------- 3 files changed, 23 insertions(+), 85 deletions(-) diff --git a/Podfile b/Podfile index e49e1d3..2b6be62 100644 --- a/Podfile +++ b/Podfile @@ -8,7 +8,7 @@ target 'uCubeSampleApp' do # Pods for uCubeSampleApp # Framework only - #pod 'UCube', :git => 'git@github.com:YouTransactor/mPOS-SDK-IOS-Framework.git', :tag => 'v0.5.23' + #pod 'UCube', :git => 'git@github.com:YouTransactor/mPOS-SDK-IOS-Framework.git', :tag => 'v0.5.24' # Development pod 'UCube', :path => '../mPOS-SDK-IOS-Source-Code' diff --git a/Podfile.lock b/Podfile.lock index 69b476d..9276e7b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -18,6 +18,6 @@ SPEC CHECKSUMS: UCube: 2c62edf2e851531b0b89283f46d25c286b7d74f8 Zip: 8877eede3dda76bcac281225c20e71c25270774c -PODFILE CHECKSUM: 04ae922da8261745779410408b0406f91c90003e +PODFILE CHECKSUM: 57c86f38bbb930794da5fd19b22f90c5c12bf4e1 COCOAPODS: 1.10.1 diff --git a/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift b/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift index 15eabd5..270c3e3 100644 --- a/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift +++ b/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift @@ -35,13 +35,15 @@ class DeviceInfoTableViewController: UITableViewController { RPC.Tag.configurationMerchantInterfaceLocale, RPC.Tag.terminalChargingStatus, RPC.Tag.bleFirmwareVersion, - RPC.Tag.resourcesFileVersion + RPC.Tag.resourcesFileVersion, + RPC.Tag.speedMode ] let uInt8Tags = tags.map{ UInt8($0) } let command = GetInfoCommand(tags: uInt8Tags) command.execute(monitor: TaskMonitor(eventHandler: { (event: TaskEvent, parameters: [Any]) in switch event { case .failed, .cancelled: + print("get info failed with status \(event)") self.deviceInfo = DeviceInfo(tlv: Data()) self.tableView.tableHeaderView = nil self.tableView.reloadData() @@ -71,38 +73,7 @@ class DeviceInfoTableViewController: UITableViewController { guard deviceInfo != nil else { return 0 } - return 14 - } - - private func getNfcModuleText(_ state: UInt8) -> String { - var nfcModuleState = "" - switch state { - case 0x00: - nfcModuleState = "no mpos module available" - case 0x01: - nfcModuleState = "mpos module initializing" - case 0x02: - nfcModuleState = "mpos initialization done" - case 0x03: - nfcModuleState = "mpos module is ready" - case 0x04: - nfcModuleState = "mpos module is in bootloader mode" - case 0x05: - nfcModuleState = "mpos bootloader initializing" - case 0x06: - nfcModuleState = "mpos module faces an internal error" - case 0x07: - nfcModuleState = "mpos module firmware not loaded" - case 0x08: - nfcModuleState = "mpos firmware update is ongoing" - case 0x09: - nfcModuleState = "mpos app firmware is corrupted" - case 0x10: - nfcModuleState = "mpos bootloader firmware is corrupted" - default: - break - } - return nfcModuleState + return 15 } override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { @@ -144,19 +115,32 @@ class DeviceInfoTableViewController: UITableViewController { }else { switch deviceInfo?.getChargingStatus() { case 0x00: - text = "Battry State : battery is NOT charging" + text = "Battery State : battery is NOT charging" case 0x01: - text = "Battry State : battery is charging" + text = "Battery State : battery is charging" case 0x03: - text = "Battry State : battery is full and dongle is plugged to the USB." + text = "Battery State : battery is full and dongle is plugged to the USB." default: - text = "Battry State : unknown" + text = "Battery State : unknown" } } case 12: text = "BLE version : \(deviceInfo?.getBleFirmwareVersion() ?? "")" case 13: text = "Resources file version : \(deviceInfo?.getResourcesFileVersion() ?? "")" + case 14: + if(deviceInfo?.getSpeedMode() == nil) { + text = "Speed Mode unknown" + }else { + switch deviceInfo?.getSpeedMode() { + case 0: + text = "SLOW MODE" + case 1: + text = "QUICK MODE" + default: + text = "Speed Mode unknown" + } + } default: text = "" } @@ -164,50 +148,4 @@ class DeviceInfoTableViewController: UITableViewController { cell.textLabel?.text = text return cell } - - /* - // Override to support conditional editing of the table view. - override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { - // Return false if you do not want the specified item to be editable. - return true - } - */ - - /* - // Override to support editing the table view. - override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) { - if editingStyle == .delete { - // Delete the row from the data source - tableView.deleteRows(at: [indexPath], with: .fade) - } else if editingStyle == .insert { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } - } - */ - - /* - // Override to support rearranging the table view. - override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) { - - } - */ - - /* - // Override to support conditional rearranging of the table view. - override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool { - // Return false if you do not want the item to be re-orderable. - return true - } - */ - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - } From 5ff10032b449c1e4a58b305d4227607cf4e7803d Mon Sep 17 00:00:00 2001 From: YouTransactor <59020462+YouTransactor@users.noreply.github.com> Date: Tue, 18 Jan 2022 22:19:43 +0100 Subject: [PATCH 2/2] Evolution #8374 [uCube Touch SDK IOS] update Copyright Text --- Podfile | 19 +++++ .../AlertPresenterViewController.swift | 26 +++++-- uCubeSampleApp/AlertViewController.swift | 26 +++++-- uCubeSampleApp/AppDelegate.swift | 26 +++++-- .../Connection/DeviceConnection.swift | 26 +++++-- .../Connection/DeviceListController.swift | 26 +++++-- .../Connection/DeviceTableViewCell.swift | 29 +++++--- .../MDM/ConfigTableViewController.swift | 26 +++++-- .../MDM/UpdateTableViewController.swift | 30 +++++--- uCubeSampleApp/MainViewController.swift | 31 +++++--- uCubeSampleApp/MenuTableViewController.swift | 73 +++++-------------- .../Payment/AuthorizationTask.swift | 26 +++++-- .../Payment/PaymentViewController.swift | 26 +++++-- .../Payment/RiskManagementTask.swift | 26 +++++-- .../RPC/DeviceInfoTableViewController.swift | 26 +++++-- uCubeSampleApp/RPC/DisplayMessage.swift | 28 ++++--- 16 files changed, 305 insertions(+), 165 deletions(-) diff --git a/Podfile b/Podfile index 2b6be62..54afd84 100644 --- a/Podfile +++ b/Podfile @@ -1,3 +1,22 @@ +#============================================================================ +# Copyright © 2022 YouTransactor. +# All Rights Reserved. +# +# This software is the confidential and proprietary information of YouTransactor +# ("Confidential Information"). You shall not disclose or redistribute such +# Confidential Information and shall use it only in accordance with the terms of +# the license agreement you entered into with YouTransactor. +# +# This software is provided by YouTransactor AS IS, and YouTransactor +# makes no representations or warranties about the suitability of the software, +# either express or implied, including but not limited to the implied warranties +# of merchantability, fitness for a particular purpose or non-infringement. +# YouTransactor shall not be liable for any direct, indirect, incidental, +# special, exemplary, or consequential damages suffered by licensee as the +# result of using, modifying or distributing this software or its derivatives. +# +#==========================================================================# + # Uncomment the next line to define a global platform for your project platform :ios, '13.0' diff --git a/uCubeSampleApp/AlertPresenterViewController.swift b/uCubeSampleApp/AlertPresenterViewController.swift index 3a3580c..13e37a6 100644 --- a/uCubeSampleApp/AlertPresenterViewController.swift +++ b/uCubeSampleApp/AlertPresenterViewController.swift @@ -1,10 +1,22 @@ -// -// AlertPresenterViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 8/5/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit diff --git a/uCubeSampleApp/AlertViewController.swift b/uCubeSampleApp/AlertViewController.swift index 0eeb19e..ee93d3b 100644 --- a/uCubeSampleApp/AlertViewController.swift +++ b/uCubeSampleApp/AlertViewController.swift @@ -1,10 +1,22 @@ -// -// AlertViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 8/5/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit diff --git a/uCubeSampleApp/AppDelegate.swift b/uCubeSampleApp/AppDelegate.swift index 031f8ce..9271bf1 100644 --- a/uCubeSampleApp/AppDelegate.swift +++ b/uCubeSampleApp/AppDelegate.swift @@ -1,10 +1,22 @@ -// -// AppDelegate.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 5/21/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube diff --git a/uCubeSampleApp/Connection/DeviceConnection.swift b/uCubeSampleApp/Connection/DeviceConnection.swift index 9ce4843..29ea1ad 100644 --- a/uCubeSampleApp/Connection/DeviceConnection.swift +++ b/uCubeSampleApp/Connection/DeviceConnection.swift @@ -1,10 +1,22 @@ -// -// DeviceConnection.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/15/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube diff --git a/uCubeSampleApp/Connection/DeviceListController.swift b/uCubeSampleApp/Connection/DeviceListController.swift index 88477b9..3aa5eab 100644 --- a/uCubeSampleApp/Connection/DeviceListController.swift +++ b/uCubeSampleApp/Connection/DeviceListController.swift @@ -1,10 +1,22 @@ -// -// DeviceListController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 5/21/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube diff --git a/uCubeSampleApp/Connection/DeviceTableViewCell.swift b/uCubeSampleApp/Connection/DeviceTableViewCell.swift index ef5ae73..09e862e 100644 --- a/uCubeSampleApp/Connection/DeviceTableViewCell.swift +++ b/uCubeSampleApp/Connection/DeviceTableViewCell.swift @@ -1,10 +1,22 @@ -// -// DeviceTableViewCell.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 6/10/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit @@ -15,13 +27,10 @@ class DeviceTableViewCell: UITableViewCell { override func awakeFromNib() { super.awakeFromNib() - // Initialization code } override func setSelected(_ selected: Bool, animated: Bool) { super.setSelected(selected, animated: animated) - - // Configure the view for the selected state } } diff --git a/uCubeSampleApp/MDM/ConfigTableViewController.swift b/uCubeSampleApp/MDM/ConfigTableViewController.swift index 23e2220..831b55b 100644 --- a/uCubeSampleApp/MDM/ConfigTableViewController.swift +++ b/uCubeSampleApp/MDM/ConfigTableViewController.swift @@ -1,10 +1,22 @@ -// -// ConfigTableViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/30/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube diff --git a/uCubeSampleApp/MDM/UpdateTableViewController.swift b/uCubeSampleApp/MDM/UpdateTableViewController.swift index 39aaf62..2845e58 100644 --- a/uCubeSampleApp/MDM/UpdateTableViewController.swift +++ b/uCubeSampleApp/MDM/UpdateTableViewController.swift @@ -1,10 +1,22 @@ -// -// UpdateTableViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/30/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube @@ -70,9 +82,7 @@ class UpdateTableViewController: AlertPresenterTableViewController { selectedUpdates.append(updates[i]) } } -// presentAlert(message: "Coming soon", actions: [ -// AlertAction(title: "OK") -// ]) + UCubeAPI.mdmUpdate(updates: selectedUpdates, didProgess: { state in self.presentAlert(message: "\(state.name)...") }) { (success, parameters) in diff --git a/uCubeSampleApp/MainViewController.swift b/uCubeSampleApp/MainViewController.swift index 4d3f065..cf117c5 100644 --- a/uCubeSampleApp/MainViewController.swift +++ b/uCubeSampleApp/MainViewController.swift @@ -1,10 +1,22 @@ -// -// MainViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/10/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube @@ -46,11 +58,6 @@ class MainViewController: UIViewController { LogManager.debug(message: "No device found with identifier: \(identifier)") } } -// BLEConnectionManager.shared.connect(identifier: identifier) { status in -// LogManager.debug(message: "Connection to identifier: \(identifier), status: \(status)") -// } - // You can connect directly with UCubeDevice -// BLEConnectionManager.shared.connect(device: device) } appVersionLabel.text = "UCube Example v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] ?? "")" frameworkVersionLabel.text = "UCube Framework v\(Bundle(for: BLEConnectionManager.self).infoDictionary?["CFBundleShortVersionString"] ?? "")" diff --git a/uCubeSampleApp/MenuTableViewController.swift b/uCubeSampleApp/MenuTableViewController.swift index e9a29a5..7d2b722 100644 --- a/uCubeSampleApp/MenuTableViewController.swift +++ b/uCubeSampleApp/MenuTableViewController.swift @@ -1,10 +1,22 @@ -// -// MenuTableViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/10/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import CoreBluetooth import UIKit @@ -65,27 +77,6 @@ class MenuTableViewController: AlertPresenterTableViewController { } } - // MARK: - IBActions - - /*@IBAction func connectAction(_ sender: UIButton) { - guard isDeviceSelected() else { - return - } - - let device = BLEConnectionManager.shared.getDevice()! - if BLEConnectionManager.shared.isConnected { - presentAlert(title: nil, message: "Disconnecting from \(device.name)...") - deviceConnection.disconnect() - } else { - presentAlert(title: nil, message: "Connecting to \(device.name)...", actions: [ - AlertAction(title: "Cancel", handler: { - BLEConnectionManager.shared.cancelConnect() - }) - ]) - deviceConnection.connect() - } - }*/ - @IBAction func connectAction(_ sender: UIButton) { guard isDeviceSelected() else { return @@ -111,31 +102,6 @@ class MenuTableViewController: AlertPresenterTableViewController { } } - /* @IBAction func connectAction(_ sender: UIButton) { - guard isDeviceSelected() else { - return - } - - let device = BLEConnectionManager.shared.getDevice()! - if BLEConnectionManager.shared.isConnected { - presentAlert(title: nil, message: "Disconnecting from \(device.name)...") - BLEConnectionManager.shared.disconnect() - } else { - presentAlert(title: nil, message: "Connecting to \(device.name)...", actions: [ - AlertAction(title: "Cancel", handler: { - BLEConnectionManager.shared.cancelConnect() - }) - ]) - - BLEConnectionManager.shared.connect( - identifier: device.identifier, - completion: { _ in - print("BLEConnectionManager.shared.connect(completion:) called") - } - ) - } - }*/ - @IBAction func changeLanguage(_ sender: Any) { guard isDeviceSelected() else { return @@ -219,7 +185,6 @@ class MenuTableViewController: AlertPresenterTableViewController { }) { (success, parameters) in if success { let updates = parameters![0] as! [BinaryUpdate] -// let configs = parameters![1] as! [Config] if updates.count == 0 { self.presentAlert(message: "uCube is up-to-date", actions: [ AlertAction(title: "OK") diff --git a/uCubeSampleApp/Payment/AuthorizationTask.swift b/uCubeSampleApp/Payment/AuthorizationTask.swift index 46db31a..4087190 100644 --- a/uCubeSampleApp/Payment/AuthorizationTask.swift +++ b/uCubeSampleApp/Payment/AuthorizationTask.swift @@ -1,10 +1,22 @@ -// -// AuthorizationTask.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/23/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UCube import UIKit diff --git a/uCubeSampleApp/Payment/PaymentViewController.swift b/uCubeSampleApp/Payment/PaymentViewController.swift index 6056a53..baa892b 100644 --- a/uCubeSampleApp/Payment/PaymentViewController.swift +++ b/uCubeSampleApp/Payment/PaymentViewController.swift @@ -1,10 +1,22 @@ -// -// PaymentViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/29/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube diff --git a/uCubeSampleApp/Payment/RiskManagementTask.swift b/uCubeSampleApp/Payment/RiskManagementTask.swift index ec27023..86d44ef 100644 --- a/uCubeSampleApp/Payment/RiskManagementTask.swift +++ b/uCubeSampleApp/Payment/RiskManagementTask.swift @@ -1,10 +1,22 @@ -// -// RiskManagementTask.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/23/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube diff --git a/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift b/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift index 270c3e3..d45e5af 100644 --- a/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift +++ b/uCubeSampleApp/RPC/DeviceInfoTableViewController.swift @@ -1,10 +1,22 @@ -// -// DeviceInfoTableViewController.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/17/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UIKit import UCube diff --git a/uCubeSampleApp/RPC/DisplayMessage.swift b/uCubeSampleApp/RPC/DisplayMessage.swift index 9792c36..d426ca9 100644 --- a/uCubeSampleApp/RPC/DisplayMessage.swift +++ b/uCubeSampleApp/RPC/DisplayMessage.swift @@ -1,10 +1,22 @@ -// -// DisplayMessage.swift -// uCubeSampleApp -// -// Created by Rémi Hillairet on 7/15/20. -// Copyright © 2020 YouTransactor. All rights reserved. -// +/*============================================================================ + +* Copyright © 2022 YouTransactor. +* All Rights Reserved. +* +* This software is the confidential and proprietary information of YouTransactor +* ("Confidential Information"). You shall not disclose or redistribute such +* Confidential Information and shall use it only in accordance with the terms of +* the license agreement you entered into with YouTransactor. +* +* This software is provided by YouTransactor AS IS, and YouTransactor +* makes no representations or warranties about the suitability of the software, +* either express or implied, including but not limited to the implied warranties +* of merchantability, fitness for a particular purpose or non-infringement. +* YouTransactor shall not be liable for any direct, indirect, incidental, +* special, exemplary, or consequential damages suffered by licensee as the +* result of using, modifying or distributing this software or its derivatives. +* +*==========================================================================*/ import UCube @@ -28,7 +40,5 @@ struct DisplayMessage { break } })) - - } }