Skip to content

Commit 57f18b7

Browse files
author
build
committed
New version of Flutter CaptureSDK
1 parent 2768235 commit 57f18b7

22 files changed

+248
-140
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.5.60]
6+
7+
### Improvements
8+
9+
- Upgrade to [`iOS CaptureSDK v1.9.139`](https://github.com/SocketMobile/cocoapods-capturesdk)
10+
- On iOS, you can get the `tagId` data so you can get the NFC Tag ID
11+
512
## [1.5.55]
613

714
### Improvements

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Flutter CaptureSDK - Version 1.5.55
1+
# Flutter CaptureSDK - Version 1.5.60
22

33
This is the Flutter CatureSDK for Socket Mobile's Capture library.
44

@@ -21,7 +21,7 @@ Install the flutter package by adding the following to your `pubspec.yaml` file.
2121
```dart
2222
dependencies:
2323
...
24-
capturesdk_flutter: ^1.5.55
24+
capturesdk_flutter: ^1.5.60
2525
...
2626
```
2727

example/ios/Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
PODS:
2-
- CaptureSDK (1.9.113):
2+
- CaptureSDK (1.9.139):
33
- CryptoSwift (< 2.0, >= 1.6.0)
4-
- SwiftDecoderSDK (~> 6.0.10)
4+
- SwiftDecoderSDK (~> 6.2.3)
55
- capturesdk_flutter (1.5.11):
6-
- CaptureSDK (~> 1.9.113)
6+
- CaptureSDK (~> 1.9.139)
77
- Flutter
88
- CryptoSwift (1.8.4)
99
- Flutter (1.0.0)
10-
- SwiftDecoderSDK (6.0.10)
10+
- SwiftDecoderSDK (6.2.3)
1111

1212
DEPENDENCIES:
1313
- capturesdk_flutter (from `.symlinks/plugins/capturesdk_flutter/ios`)
@@ -26,11 +26,11 @@ EXTERNAL SOURCES:
2626
:path: Flutter
2727

2828
SPEC CHECKSUMS:
29-
CaptureSDK: d565f12c56bdd7570efb6b69d69e0f6583998fe2
30-
capturesdk_flutter: 16ccbecc698733cdb9821f5f07bc49208f5a7a54
29+
CaptureSDK: 8113d6ae1420290e06afb4033dea6b4304d33a3c
30+
capturesdk_flutter: 185f31edb0969774122f4d0ebed1f89e2e12a98f
3131
CryptoSwift: e64e11850ede528a02a0f3e768cec8e9d92ecb90
3232
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
33-
SwiftDecoderSDK: 8de8071c82cc5a44a24bc70f94335c880c583cf9
33+
SwiftDecoderSDK: 4fe7edb4e3a0d553962c97c0920823f0fc56dabd
3434

3535
PODFILE CHECKSUM: a3a24ce09e8c36005957e760bce0abacf387618c
3636

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
5050
debugServiceExtension = "internal"
51+
enableGPUValidationMode = "1"
5152
allowLocationSimulation = "YES">
5253
<BuildableProductRunnable
5354
runnableDebuggingMode = "0">

example/lib/main.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ class _MyHomePageState extends State<MyHomePage> {
256256
List<DecodedData> _myList = [..._decodedDataList];
257257
Map<String, dynamic> jsonMap = e.value as Map<String, dynamic>;
258258
DecodedData decoded = DecodedData.fromJson(jsonMap);
259+
logger.log('Decoded Data =>', decoded.toString());
259260
_myList.add(decoded);
260261
setState(() {
261262
_decodedDataList = _myList;

example/pubspec.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ packages:
5252
dependency: transitive
5353
description:
5454
name: crypto
55-
sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
55+
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
5656
url: "https://pub.dev"
5757
source: hosted
58-
version: "3.0.3"
58+
version: "3.0.6"
5959
cupertino_icons:
6060
dependency: "direct main"
6161
description:
6262
name: cupertino_icons
63-
sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
63+
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
6464
url: "https://pub.dev"
6565
source: hosted
66-
version: "1.0.6"
66+
version: "1.0.8"
6767
fake_async:
6868
dependency: transitive
6969
description:
@@ -94,34 +94,34 @@ packages:
9494
dependency: transitive
9595
description:
9696
name: freezed_annotation
97-
sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
97+
sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
9898
url: "https://pub.dev"
9999
source: hosted
100-
version: "2.4.1"
100+
version: "2.4.4"
101101
http:
102102
dependency: transitive
103103
description:
104104
name: http
105-
sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
105+
sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
106106
url: "https://pub.dev"
107107
source: hosted
108-
version: "1.2.2"
108+
version: "1.4.0"
109109
http_parser:
110110
dependency: transitive
111111
description:
112112
name: http_parser
113-
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
113+
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
114114
url: "https://pub.dev"
115115
source: hosted
116-
version: "4.0.2"
116+
version: "4.1.2"
117117
json_annotation:
118118
dependency: transitive
119119
description:
120120
name: json_annotation
121-
sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
121+
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
122122
url: "https://pub.dev"
123123
source: hosted
124-
version: "4.8.1"
124+
version: "4.9.0"
125125
leak_tracker:
126126
dependency: transitive
127127
description:
@@ -243,10 +243,10 @@ packages:
243243
dependency: transitive
244244
description:
245245
name: typed_data
246-
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
246+
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
247247
url: "https://pub.dev"
248248
source: hosted
249-
version: "1.3.2"
249+
version: "1.4.0"
250250
vector_math:
251251
dependency: transitive
252252
description:
@@ -267,18 +267,18 @@ packages:
267267
dependency: transitive
268268
description:
269269
name: web
270-
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
270+
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
271271
url: "https://pub.dev"
272272
source: hosted
273-
version: "0.5.1"
273+
version: "1.1.1"
274274
web_socket_channel:
275275
dependency: transitive
276276
description:
277277
name: web_socket_channel
278-
sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2"
278+
sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
279279
url: "https://pub.dev"
280280
source: hosted
281-
version: "2.4.4"
281+
version: "2.4.0"
282282
sdks:
283283
dart: ">=3.7.0-0 <4.0.0"
284284
flutter: ">=3.18.0-18.0.pre.54"

ios/Classes/TransportConnector.m

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,14 @@ -(NSString *)createJsonFromHandle:(NSNumber *)handle withResult:(SKTResult)resul
449449
{
450450
[json appendString:@", \"value\": {"];
451451
[json appendFormat:@"\"data\": %@,", [TransportConnector ConvertToStringFromData:event.Data.DecodedData.DecodedData]];
452-
[json appendFormat:@"\"id\": %ld,", (long)event.Data.DecodedData.DataSourceID];
453-
[json appendFormat:@"\"name\": \"%@\"}}}", event.Data.DecodedData.DataSourceName];
454-
452+
[json appendFormat:@" \"id\": %ld,", (long)event.Data.DecodedData.DataSourceID];
453+
454+
if (event.Data.DecodedData.TagIdData.length > 0) {
455+
[json appendFormat:@" \"tagId\": \"%@\",", [TransportConnector stringFromTagIdData:event.Data.DecodedData.TagIdData]];
456+
}
457+
458+
[json appendFormat:@" \"name\": \"%@\"}}}", event.Data.DecodedData.DataSourceName];
459+
455460
dispatch_async(dispatch_get_main_queue(), ^{
456461
UIViewController *mainUiViewController = [TransportConnector getPresentedViewController];
457462
if ([mainUiViewController isKindOfClass:NSClassFromString(@"CaptureSDK.SocketCamViewController")] || [mainUiViewController isKindOfClass:NSClassFromString(@"CaptureSDK.SocketCamSwiftDecoderViewController")]) {
@@ -496,5 +501,16 @@ +(NSString *)ConvertToStringFromData:(NSData *)data {
496501
return stringData;
497502
}
498503

504+
505+
+ (NSString *)stringFromTagIdData:(NSData *)tagIdData {
506+
const unsigned char *bytes = (const unsigned char *)tagIdData.bytes;
507+
NSMutableString *hexString = [NSMutableString stringWithCapacity:tagIdData.length * 2];
508+
for (NSUInteger i = 0; i < tagIdData.length; i++) {
509+
[hexString appendFormat:@"%02X", bytes[i]];
510+
}
511+
512+
return hexString;
513+
}
514+
499515
@end
500516

ios/capturesdk_flutter.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'capturesdk_flutter'
3-
s.version = '1.5.55'
3+
s.version = '1.5.60'
44
s.summary = 'Flutter CaptureSDK for Socket Mobile Inc.'
55
s.description = 'The official Flutter CaptureSDK by Socket Mobile. It supports all current Socket Mobile’s barcode and NFC Reader scanning solutions.'
66
s.homepage = 'https://docs.socketmobile.dev/captureflutter/en/latest'
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.public_header_files = 'Classes/**/*.h'
1212
s.platforms = { :ios => "13.0" }
1313
s.dependency 'Flutter'
14-
s.dependency 'CaptureSDK', '~>1.9.113'
14+
s.dependency 'CaptureSDK', '~>1.9.139'
1515
s.static_framework = true
1616
# Flutter.framework does not contain a i386 slice.
1717
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }

lib/classes/capture_event.g.dart

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/classes/capture_property.g.dart

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)