Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo #30

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
14 changes: 7 additions & 7 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class _MyAppState extends State<MyApp> {
var img1 = Image.asset('assets/images/portrait.png');
var img2 = Image.asset('assets/images/portrait.png');
String _similarity = "nil";
String _liveness = "nil";
String _aliveness = "nil";

@override
void initState() {
Expand Down Expand Up @@ -101,7 +101,7 @@ class _MyAppState extends State<MyApp> {
image1.imageType = type;
setState(() {
img1 = Image.memory(imageFile);
_liveness = "nil";
_aliveness = "nil";
});
} else {
image2.bitmap = base64Encode(imageFile);
Expand All @@ -115,7 +115,7 @@ class _MyAppState extends State<MyApp> {
img1 = Image.asset('assets/images/portrait.png');
img2 = Image.asset('assets/images/portrait.png');
_similarity = "nil";
_liveness = "nil";
_aliveness = "nil";
});
image1 = new Regula.MatchFacesImage();
image2 = new Regula.MatchFacesImage();
Expand Down Expand Up @@ -145,12 +145,12 @@ class _MyAppState extends State<MyApp> {
}

liveness() => Regula.FaceSDK.startLiveness().then((value) {
var result = Regula.LivenessResponse.fromJson(json.decode(value));
var result = Regula.AlivenessResponse.fromJson(json.decode(value));
if(result!.bitmap == null) return;
setImage(true, base64Decode(result.bitmap!.replaceAll("\n", "")),
Regula.ImageType.LIVE);
setState(() => _liveness =
result.liveness == Regula.LivenessStatus.PASSED
setState(() => _aliveness =
result.aliveness == Regula.LivenessStatus.PASSED
? "passed"
: "unknown");
});
Expand Down Expand Up @@ -201,7 +201,7 @@ class _MyAppState extends State<MyApp> {
Text("Similarity: " + _similarity,
style: TextStyle(fontSize: 18)),
Container(margin: EdgeInsets.fromLTRB(20, 0, 0, 0)),
Text("Liveness: " + _liveness,
Text("Liveness: " + _aliveness,
style: TextStyle(fontSize: 18))
],
))
Expand Down
28 changes: 13 additions & 15 deletions lib/face_api.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'dart:async';
import 'package:flutter/services.dart';

// Classes

class FaceCaptureException {
String? errorCode;
String? message;
Expand Down Expand Up @@ -53,15 +51,15 @@ class InitException {

class LivenessErrorException {
String? errorCode;
LivenessBackendException? underlyingException;
AlivenessBackendException? underlyingException;
String? message;

static LivenessErrorException? fromJson(jsonObject) {
if (jsonObject == null) return null;
var result = new LivenessErrorException();

result.errorCode = jsonObject["errorCode"];
result.underlyingException = LivenessBackendException.fromJson(jsonObject["underlyingException"]);
result.underlyingException = AlivenessBackendException.fromJson(jsonObject["underlyingException"]);
result.message = jsonObject["message"];

return result;
Expand All @@ -78,13 +76,13 @@ class LivenessErrorException {
}
}

class LivenessBackendException {
class AlivenessBackendException {
int? errorCode;
String? message;

static LivenessBackendException? fromJson(jsonObject) {
static AlivenessBackendException? fromJson(jsonObject) {
if (jsonObject == null) return null;
var result = new LivenessBackendException();
var result = new AlivenessBackendException();

result.errorCode = jsonObject["errorCode"];
result.message = jsonObject["message"];
Expand Down Expand Up @@ -150,20 +148,20 @@ class FaceCaptureResponse {
}
}

class LivenessResponse {
class AlivenessResponse {
String? bitmap;
String? liveness;
String? aliveness;
String? tag;
String? transactionId;
int? estimatedAge;
LivenessErrorException? exception;

static LivenessResponse? fromJson(jsonObject) {
static AlivenessResponse? fromJson(jsonObject) {
if (jsonObject == null) return null;
var result = new LivenessResponse();
var result = new AlivenessResponse();

result.bitmap = jsonObject["bitmap"];
result.liveness = jsonObject["liveness"];
result.aliveness = jsonObject["liveness"];
result.tag = jsonObject["tag"];
result.transactionId = jsonObject["transactionId"];
result.estimatedAge = jsonObject["estimatedAge"];
Expand All @@ -176,7 +174,7 @@ class LivenessResponse {
Map _result = {};

if (bitmap != null) _result.addAll({"bitmap": bitmap});
if (liveness != null) _result.addAll({"liveness": liveness});
if (aliveness != null) _result.addAll({"liveness": aliveness});
if (tag != null) _result.addAll({"tag": tag});
if (transactionId != null) _result.addAll({"transactionId": transactionId});
if (estimatedAge != null) _result.addAll({"estimatedAge": estimatedAge});
Expand Down Expand Up @@ -1251,14 +1249,14 @@ class SearchPersonDetection {

class LivenessNotification {
String? status;
LivenessResponse? response;
AlivenessResponse? response;

static LivenessNotification? fromJson(jsonObject) {
if (jsonObject == null) return null;
var result = new LivenessNotification();

result.status = jsonObject["status"];
result.response = LivenessResponse.fromJson(jsonObject["response"]);
result.response = AlivenessResponse.fromJson(jsonObject["response"]);

return result;
}
Expand Down
38 changes: 19 additions & 19 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.17.2"
version: "1.17.1"
fake_async:
dependency: transitive
description:
Expand All @@ -59,22 +59,30 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
js:
dependency: transitive
description:
name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
url: "https://pub.dev"
source: hosted
version: "0.6.7"
matcher:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.2.0"
meta:
dependency: transitive
description:
Expand All @@ -100,10 +108,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -140,10 +148,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.6.0"
version: "0.5.1"
vector_math:
dependency: transitive
description:
Expand All @@ -152,14 +160,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
sdks:
dart: ">=3.1.0-185.0.dev <4.0.0"
dart: ">=3.0.0-0 <4.0.0"
flutter: ">=3.3.0"