Skip to content

Commit d50d7c1

Browse files
author
Jenkins
committed
8.3.496
1 parent 4861980 commit d50d7c1

File tree

19 files changed

+66
-33
lines changed

19 files changed

+66
-33
lines changed

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ apply plugin: 'kotlin-android'
1313

1414
android {
1515
namespace 'com.regula.plugin.documentreader'
16-
compileSdk 34
16+
compileSdk 36
1717

1818
defaultConfig {
19-
minSdk 21
19+
minSdk 24
2020
}
2121

2222
compileOptions {
@@ -28,7 +28,7 @@ android {
2828
}
2929

3030
dependencies {
31-
implementation('com.regula.documentreader:api:8.2.11804') {
31+
implementation('com.regula.documentreader:api:8.3.11882') {
3232
transitive = true
3333
}
3434

android/src/main/kotlin/com/regula/plugin/documentreader/Config.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ fun setFunctionality(config: Functionality, input: JSONObject) = input.forEach {
5858
"btDeviceName" -> editor.setBtDeviceName(v as String)
5959
"zoomFactor" -> editor.setZoomFactor(v.toFloat())
6060
"exposure" -> editor.setExposure(v.toFloat())
61+
"videoRecordingSizeDownscaleFactor" -> editor.setVideoRecordingSizeDownscaleFactor(v.toFloat())
6162
"excludedCamera2Models" -> editor.setExcludedCamera2Models((v as JSONArray).toList())
6263
"cameraSize" -> editor.setCameraSize(cameraSizeFromJSON(v as JSONObject).first, cameraSizeFromJSON(v).second)
6364
}
@@ -92,6 +93,7 @@ fun getFunctionality(input: Functionality) = mapOf(
9293
"btDeviceName" to input.btDeviceName,
9394
"zoomFactor" to input.zoomFactor,
9495
"exposure" to input.exposure,
96+
"videoRecordingSizeDownscaleFactor" to input.videoRecordingSizeDownscaleFactor,
9597
"excludedCamera2Models" to input.excludedCamera2Models.toJson(),
9698
"cameraSize" to generateCameraSize(input.cameraWidth, input.cameraHeight)
9799
).toJson()
@@ -138,6 +140,7 @@ fun setProcessParams(processParams: ProcessParam, opts: JSONObject) = opts.forEa
138140
"strictDLCategoryExpiry" -> processParams.strictDLCategoryExpiry = v as Boolean
139141
"generateAlpha2Codes" -> processParams.generateAlpha2Codes = v as Boolean
140142
"disableAuthResolutionFilter" -> processParams.disableAuthResolutionFilter = v as Boolean
143+
"strictSecurityChecks" -> processParams.strictSecurityChecks = v as Boolean
141144
"measureSystem" -> processParams.measureSystem = v.toInt()
142145
"barcodeParserType" -> processParams.barcodeParserType = v.toInt()
143146
"perspectiveAngle" -> processParams.perspectiveAngle = v.toInt()
@@ -223,6 +226,7 @@ fun getProcessParams(processParams: ProcessParam) = mapOf(
223226
"strictDLCategoryExpiry" to processParams.strictDLCategoryExpiry,
224227
"generateAlpha2Codes" to processParams.generateAlpha2Codes,
225228
"disableAuthResolutionFilter" to processParams.disableAuthResolutionFilter,
229+
"strictSecurityChecks" to processParams.strictSecurityChecks,
226230
"measureSystem" to processParams.measureSystem,
227231
"barcodeParserType" to processParams.barcodeParserType,
228232
"perspectiveAngle" to processParams.perspectiveAngle,

android/src/main/kotlin/com/regula/plugin/documentreader/JSONConstructor.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ fun onlineProcessingConfigFromJSON(input: JSONObject?) = input?.let {
318318
if (it.has("imageCompressionQuality")) builder.setImageCompressionQuality(it.getDouble("imageCompressionQuality").toFloat())
319319
if (it.has("processParams")) builder.setProcessParams(processParamFromJSON(it.getJSONObject("processParams")))
320320
if (it.has("requestHeaders")) {
321-
val listener = NetworkInterceptorListener { input.getJSONObject("requestHeaders").forEach { k, v -> it.setRequestProperty(k, v as String) } }
321+
val listener = NetworkInterceptorListener { self -> input.getJSONObject("requestHeaders").forEach { k, v -> self.setRequestProperty(k, v as String) } }
322322
weakReferencesHolder.add(listener)
323323
builder.setNetworkInterceptorListener(listener)
324324
}
@@ -370,9 +370,9 @@ fun faceApiSearchParamsFromJSON(input: JSONObject?) = input?.let {
370370
if (it.has("threshold") && !it.isNull("threshold")) result.threshold = it.getDouble("threshold").toFloat()
371371
if (it.has("groupIds") && !it.isNull("groupIds")) {
372372
val jsonArrayGroupIds = it.getJSONArray("groupIds")
373-
val groupIds = IntArray(jsonArrayGroupIds.length())
373+
val groupIds = arrayOfNulls<String>(jsonArrayGroupIds.length())
374374
for (i in 0 until jsonArrayGroupIds.length())
375-
groupIds[i] = jsonArrayGroupIds.getInt(i)
375+
groupIds[i] = jsonArrayGroupIds.getString(i)
376376
result.groupIds = groupIds
377377
}
378378

example/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
android {
8-
namespace = "com.regula.dr.fullauthrfid"
8+
namespace = "com.regula.example.dr.flutter"
99
compileSdk = flutter.compileSdkVersion
1010
ndkVersion = "27.0.12077973"
1111

@@ -15,7 +15,7 @@ android {
1515
}
1616

1717
defaultConfig {
18-
applicationId = "com.regula.dr.fullauthrfid"
18+
applicationId = "com.regula.example.dr.flutter"
1919
minSdk = flutter.minSdkVersion
2020
targetSdk = flutter.targetSdkVersion
2121
versionCode = flutter.versionCode

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<application
99
android:name="${applicationName}"
1010
android:icon="@mipmap/ic_launcher"
11-
android:label="DocumentReader"
11+
android:label="Document"
1212
android:usesCleartextTraffic="true"
1313
tools:targetApi="23">
1414
<activity
@@ -17,7 +17,6 @@
1717
android:exported="true"
1818
android:hardwareAccelerated="true"
1919
android:launchMode="singleTop"
20-
android:taskAffinity=""
2120
android:theme="@style/LaunchTheme"
2221
android:windowSoftInputMode="adjustResize">
2322
<meta-data

example/android/app/src/main/kotlin/com/regula/dr/fullauthrfid/MainActivity.kt renamed to example/android/app/src/main/kotlin/com/regula/example/dr/flutter/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.regula.dr.fullauthrfid
1+
package com.regula.example.dr.flutter
22

33
import io.flutter.embedding.android.FlutterActivity
44

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
"$(inherited)",
385385
"@executable_path/Frameworks",
386386
);
387-
PRODUCT_BUNDLE_IDENTIFIER = regula.DocumentReader;
387+
PRODUCT_BUNDLE_IDENTIFIER = com.regula.example.dr.flutter;
388388
PRODUCT_NAME = "$(TARGET_NAME)";
389389
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
390390
SWIFT_VERSION = 5.0;
@@ -568,7 +568,7 @@
568568
"$(inherited)",
569569
"@executable_path/Frameworks",
570570
);
571-
PRODUCT_BUNDLE_IDENTIFIER = regula.DocumentReader;
571+
PRODUCT_BUNDLE_IDENTIFIER = com.regula.example.dr.flutter;
572572
PRODUCT_NAME = "$(TARGET_NAME)";
573573
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
574574
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -592,7 +592,7 @@
592592
"$(inherited)",
593593
"@executable_path/Frameworks",
594594
);
595-
PRODUCT_BUNDLE_IDENTIFIER = regula.DocumentReader;
595+
PRODUCT_BUNDLE_IDENTIFIER = com.regula.example.dr.flutter;
596596
PRODUCT_NAME = "$(TARGET_NAME)";
597597
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
598598
SWIFT_VERSION = 5.0;

example/ios/Runner/Info.plist

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleDevelopmentRegion</key>
88
<string>$(DEVELOPMENT_LANGUAGE)</string>
99
<key>CFBundleDisplayName</key>
10-
<string>Flutter Document Reader</string>
10+
<string>Document</string>
1111
<key>CFBundleExecutable</key>
1212
<string>$(EXECUTABLE_NAME)</string>
1313
<key>CFBundleIdentifier</key>
@@ -26,20 +26,20 @@
2626
<string>$(FLUTTER_BUILD_NUMBER)</string>
2727
<key>LSRequiresIPhoneOS</key>
2828
<true/>
29-
<key>UIApplicationSupportsIndirectInputEvents</key>
30-
<true/>
31-
<key>UILaunchStoryboardName</key>
32-
<string>LaunchScreen</string>
33-
<key>UIMainStoryboardFile</key>
34-
<string>Main</string>
3529
<key>NFCReaderUsageDescription</key>
3630
<string>To use NFC</string>
31+
<key>NSBluetoothAlwaysUsageDescription</key>
32+
<string>To use bluetooth device</string>
3733
<key>NSCameraUsageDescription</key>
3834
<string>To use camera</string>
3935
<key>NSPhotoLibraryUsageDescription</key>
4036
<string>To use gallery</string>
41-
<key>NSBluetoothAlwaysUsageDescription</key>
42-
<string>To use bluetooth device</string>
37+
<key>UIApplicationSupportsIndirectInputEvents</key>
38+
<true/>
39+
<key>UILaunchStoryboardName</key>
40+
<string>LaunchScreen</string>
41+
<key>UIMainStoryboardFile</key>
42+
<string>Main</string>
4343
<key>UISupportedInterfaceOrientations</key>
4444
<array>
4545
<string>UIInterfaceOrientationPortrait</string>

example/ios/Tests/Tests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ class Tests: XCTestCase {
129129
"isCameraTorchCheckDisabled",
130130
"rfidTimeout",
131131
"exposure",
132+
"videoRecordingSizeDownscaleFactor",
132133
"excludedCamera2Models",
133134
"cameraSize",
134135
"cameraMode"])

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
sdk: flutter
1515
flutter_document_reader_api:
1616
path: ../
17-
flutter_document_reader_core_fullauthrfid: 8.2.561
17+
flutter_document_reader_core_fullauthrfid: 8.3.772
1818
flutter_document_reader_btdevice: 7.6.17
1919
cupertino_icons: ^1.0.8
2020

0 commit comments

Comments
 (0)