Merge pull request #50 from regulaforensics/RFIDNotificationCodes

Release 6.2

Author: DzmitrySmaliakou

Samples/Advanced/DocumentReader-Swift/DocumentReader-Swift/AdditionalScreens/CustomRfidViewController.swift

@@ -122,15 +122,15 @@ class CustomRfidViewController: UIViewController {
 
     func handleRFIDNotify(rfidNotify: RFIDNotify) {
         switch rfidNotify.code {
-        case RGLRFIDNotificationCodesProgress:
+        case RFIDNotificationCodes.progress:
             DispatchQueue.main.async {
                 var progress: Float = 0
                 if self.currentRfidNotify != nil {
                     progress = Float(rfidNotify.value / 100)
                 }
                 self.progressView.progress = progress
             }
-        case RGLRFIDNotificationCodesPCSCReadingDatagroup:
+        case RFIDNotificationCodes.pcscReadingDatagroup:
             if rfidNotify.value == 1 {
                 self.currentRfidNotify = nil
             } else {
@@ -143,7 +143,7 @@ class CustomRfidViewController: UIViewController {
 
     func currentProgress(rfidNotify: RFIDNotify) -> Float {
         switch rfidNotify.code {
-        case RGLRFIDNotificationCodesProgress:
+        case RFIDNotificationCodes.progress:
             return Float(rfidNotify.value)
         default:
             break
@@ -154,7 +154,8 @@ class CustomRfidViewController: UIViewController {
 
     func currentDataGroupTypeName() -> String {
         if let notify = self.currentRfidNotify {
-            return RFIDNotify.rfidDataFileTypeName(RFIDDataFileType.init(rawValue: Int(notify.number)) ?? RFIDDataFileType.unspecified) ?? ""
+            let type = RFIDDataFileType(rawValue: notify.attachment) ?? .unspecified
+            return RFIDNotify.rfidDataFileTypeName(type) ?? ""
         }
         return ""
     }

Samples/Advanced/DocumentReader-Swift/DocumentReader-Swift/ResultsViewController/ResultsViewController.swift

@@ -221,7 +221,7 @@ class ResultsViewController: UIViewController {
         var dataGroup = GroupedAttributes(type: "Data Groups", items: [])
         applications.forEach {
             $0.files.forEach {
-                guard $0.readingStatus != RGLRFIDErrorCodesNotAvailable else { return }
+                guard $0.readingStatus != RFIDErrorCodes.notAvailable else { return }
                 let attribute = Attribute(name: $0.typeName, rfidStatus: $0.pAStatus)
                 dataGroup.items.append(attribute)
             }
@@ -372,7 +372,7 @@ extension ResultsViewController: UITableViewDataSource, UITableViewDelegate {
                 return UITableViewCell()
             }
             cell.textLabel?.text = item.name.uppercased()
-            let imageName = item.rfidStatus == RGLRFIDErrorCodesFailed ? "status_not_ok" : item.rfidStatus == RGLRFIDErrorCodesNoError ? "status_ok" : "status_undefined"
+            let imageName = item.rfidStatus == RFIDErrorCodes.failed ? "status_not_ok" : item.rfidStatus == RFIDErrorCodes.noError ? "status_ok" : "status_undefined"
             let imageView = UIImageView(image: UIImage(named: imageName))
             cell.accessoryView = imageView
             return cell

Samples/Advanced/DocumentReader-Swift/Podfile

@@ -4,6 +4,6 @@ platform :ios, '11.0'
 use_frameworks!
 
 target 'DocumentReader-Swift' do
-  pod 'DocumentReader', '~> 6.1'
+  pod 'DocumentReader', '~> 6.2'
   pod 'DocumentReaderFullRFID', '~> 6.1'
 end

Samples/Basic/DocumentReaderObjectiveC-sample/Podfile

@@ -3,6 +3,6 @@
 platform :ios, '11.0'
 
 target 'DocumentReaderFullObjectiveC-sample' do
-  pod 'DocumentReader', '~> 6.1'
+  pod 'DocumentReader', '~> 6.2'
   pod 'DocumentReaderFullRFID', '~> 6.1'
 end

Samples/Basic/DocumentReaderSwift-sample/Podfile

@@ -4,6 +4,6 @@ platform :ios, '11.0'
 use_frameworks!
 
 target 'DocumentReaderFullSwift-sample' do
-  pod 'DocumentReader', '~> 6.1'
+  pod 'DocumentReader', '~> 6.2'
   pod 'DocumentReaderFullRFID', '~> 6.1'
 end