Skip to content

Commit

Permalink
Merge pull request #75 from YouTransactor-SAS/develop-dhouha
Browse files Browse the repository at this point in the history
Develop dhouha
  • Loading branch information
YouTransactor authored Jan 20, 2022
2 parents 65a6369 + 5ff1003 commit 94d734a
Show file tree
Hide file tree
Showing 17 changed files with 328 additions and 250 deletions.
21 changes: 20 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -8,7 +27,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'
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ SPEC CHECKSUMS:
UCube: 2c62edf2e851531b0b89283f46d25c286b7d74f8
Zip: 8877eede3dda76bcac281225c20e71c25270774c

PODFILE CHECKSUM: 04ae922da8261745779410408b0406f91c90003e
PODFILE CHECKSUM: 57c86f38bbb930794da5fd19b22f90c5c12bf4e1

COCOAPODS: 1.10.1
26 changes: 19 additions & 7 deletions uCubeSampleApp/AlertPresenterViewController.swift
Original file line number Diff line number Diff line change
@@ -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

Expand Down
26 changes: 19 additions & 7 deletions uCubeSampleApp/AlertViewController.swift
Original file line number Diff line number Diff line change
@@ -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

Expand Down
26 changes: 19 additions & 7 deletions uCubeSampleApp/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down
26 changes: 19 additions & 7 deletions uCubeSampleApp/Connection/DeviceConnection.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down
26 changes: 19 additions & 7 deletions uCubeSampleApp/Connection/DeviceListController.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 19 additions & 10 deletions uCubeSampleApp/Connection/DeviceTableViewCell.swift
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
}

}
26 changes: 19 additions & 7 deletions uCubeSampleApp/MDM/ConfigTableViewController.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down
30 changes: 20 additions & 10 deletions uCubeSampleApp/MDM/UpdateTableViewController.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
31 changes: 19 additions & 12 deletions uCubeSampleApp/MainViewController.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"] ?? "")"
Expand Down
Loading

0 comments on commit 94d734a

Please sign in to comment.