Merge pull request #31 from Karibash/release/1.2.0

Release/1.2.0
Karibash · Jul 23, 2020 · a33ab0d · a33ab0d
2 parents 597b756 + acfb1c0
commit a33ab0d
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@
 - [ ] NFCTagReaderSession
   - [x] NFCFeliCaTag
   - [x] NFCMiFareTag
+  - [x] NFCISO7816Tag
   - [ ] NFCISO15693Tag
-  - [ ] NFCISO7816Tag
 - [ ] NFCNDEFReaderSession
 - [ ] NFCVASReaderSession
 
@@ -98,6 +98,6 @@ Feel free to check [issues page](https://github.com/Karibash/RxCoreNFC/issues) i
 
 ## 📝 License
 
-Copyright © 2019 [@Karibash](https://twitter.com/karibash).
+Copyright © 2020 [@Karibash](https://twitter.com/karibash).
 
 This project is [```MIT```](https://github.com/Karibash/RxCoreNFC/blob/master/LICENSE) licensed.
diff --git a/RxCoreNFC.podspec b/RxCoreNFC.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name               = "RxCoreNFC"
-  spec.version            = "1.1.1"
+  spec.version            = "1.2.0"
   spec.summary            = "Reactive extension for the CoreNFC."
   spec.description        = <<-DESC
   Reactive extension for the CoreNFC.

diff --git a/RxCoreNFC.xcodeproj/project.pbxproj b/RxCoreNFC.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
 		E6A6ADD824C46CFA0069F67B /* RxNFCFeliCaSendFeliCaCommandResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A6ADD724C46CFA0069F67B /* RxNFCFeliCaSendFeliCaCommandResult.swift */; };
 		E6A6AE1024C5E1B60069F67B /* RxNFCMiFareSendMiFareCommandResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A6AE0F24C5E1B60069F67B /* RxNFCMiFareSendMiFareCommandResult.swift */; };
 		E6A6AE1224C6AB640069F67B /* RxNFCMiFareSendMiFareISO7816CommandResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A6AE1124C6AB640069F67B /* RxNFCMiFareSendMiFareISO7816CommandResult.swift */; };
+		E6A6AE1524C7C47C0069F67B /* RxNFCISO7816SendCommandResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A6AE1424C7C47C0069F67B /* RxNFCISO7816SendCommandResult.swift */; };
 		E6BF06EC249C9D82007E84D3 /* RxCoreNFC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6BF06E2249C9D82007E84D3 /* RxCoreNFC.framework */; };
 /* End PBXBuildFile section */
 
@@ -79,6 +80,7 @@
 		E6A6ADD724C46CFA0069F67B /* RxNFCFeliCaSendFeliCaCommandResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxNFCFeliCaSendFeliCaCommandResult.swift; sourceTree = "<group>"; };
 		E6A6AE0F24C5E1B60069F67B /* RxNFCMiFareSendMiFareCommandResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxNFCMiFareSendMiFareCommandResult.swift; sourceTree = "<group>"; };
 		E6A6AE1124C6AB640069F67B /* RxNFCMiFareSendMiFareISO7816CommandResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxNFCMiFareSendMiFareISO7816CommandResult.swift; sourceTree = "<group>"; };
+		E6A6AE1424C7C47C0069F67B /* RxNFCISO7816SendCommandResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxNFCISO7816SendCommandResult.swift; sourceTree = "<group>"; };
 		E6BF06E2249C9D82007E84D3 /* RxCoreNFC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxCoreNFC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E6BF06EB249C9D82007E84D3 /* RxCoreNFCTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RxCoreNFCTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -206,6 +208,7 @@
 		E6A6ADD324C302D30069F67B /* NFCISO7816Tag */ = {
 			isa = PBXGroup;
 			children = (
+				E6A6AE1324C7C45C0069F67B /* Entity */,
 				E6A2A61524A6275500282503 /* NFCISO7816Tag+Rx.swift */,
 			);
 			path = NFCISO7816Tag;
@@ -245,6 +248,14 @@
 			path = Entity;
 			sourceTree = "<group>";
 		};
+		E6A6AE1324C7C45C0069F67B /* Entity */ = {
+			isa = PBXGroup;
+			children = (
+				E6A6AE1424C7C47C0069F67B /* RxNFCISO7816SendCommandResult.swift */,
+			);
+			path = Entity;
+			sourceTree = "<group>";
+		};
 		E6BF06D8249C9D82007E84D3 = {
 			isa = PBXGroup;
 			children = (
@@ -375,6 +386,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E6A2A62324AB4E9F00282503 /* RxNFCTagReaderSession+Rx.swift in Sources */,
+				E6A6AE1524C7C47C0069F67B /* RxNFCISO7816SendCommandResult.swift in Sources */,
 				E6A2A61824A62CDC00282503 /* NFCISO15693Tag+Rx.swift in Sources */,
 				E6A2A61424A6271000282503 /* NFCFeliCaTag+Rx.swift in Sources */,
 				E6A2A61F24A7878000282503 /* NFCTag+Rx.swift in Sources */,
@@ -561,7 +573,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = karibash.RxCoreNFC;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -593,7 +605,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = karibash.RxCoreNFC;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/Sources/NFCISO7816Tag/Entity/RxNFCISO7816SendCommandResult.swift b/Sources/NFCISO7816Tag/Entity/RxNFCISO7816SendCommandResult.swift
@@ -0,0 +1,16 @@
+//
+//  RxNFCISO7816SendCommandResult.swift
+//  RxCoreNFC
+//
+//  Created by Karibash on 2020/07/22.
+//  Copyright © 2020 Karibash. All rights reserved.
+//
+
+import Foundation
+
+@available(iOS 13.0, *)
+public struct RxNFCISO7816SendCommandResult {
+    public let data: Data
+    public let sw1: UInt8
+    public let sw2: UInt8
+}
diff --git a/Sources/NFCISO7816Tag/NFCISO7816Tag+Rx.swift b/Sources/NFCISO7816Tag/NFCISO7816Tag+Rx.swift
@@ -9,6 +9,33 @@
 import CoreNFC
 import RxSwift
 
+// MARK: - Extensions -
+
 @available(iOS 13.0, *)
 extension ObservableType where Element == NFCISO7816Tag {
+
+    // MARK: - Commands -
+
+    /// Sends an application protocol data unit (APDU) to the tag and receives a response APDU.
+    /// - Parameter apdu: An application protocol data unit to send to the tag.
+    /// - Returns: An APDU response and command processing status byte.
+    public func sendCommand(apdu: NFCISO7816APDU) -> Observable<RxNFCISO7816SendCommandResult> {
+        flatMap { tag in
+            Single.create { observer in
+                tag.sendCommand(apdu: apdu) { data, sw1, sw2, error in
+                    if error != nil {
+                        observer(.error(error!))
+                    } else {
+                        observer(.success(RxNFCISO7816SendCommandResult(
+                            data: data,
+                            sw1: sw1,
+                            sw2: sw2
+                        )))
+                    }
+                }
+                return Disposables.create()
+            }
+        }
+    }
+
 }
diff --git a/Sources/NFCMiFareTag/NFCMiFareTag+Rx.swift b/Sources/NFCMiFareTag/NFCMiFareTag+Rx.swift
@@ -9,6 +9,8 @@
 import CoreNFC
 import RxSwift
 
+// MARK: - Extensions -
+
 @available(iOS 13.0, *)
 extension ObservableType where Element == NFCMiFareTag {