diff --git a/android/build.gradle b/android/build.gradle
index b7fa945..4554288 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -9,10 +9,13 @@ buildscript {
maven() {
url '/usr/local/node/lib/node_modules/react-native/android'
}
+ flatDir {
+ dirs "./libs"
+ }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.3'
+ classpath 'com.android.tools.build:gradle:3.4.1'
}
}
@@ -23,11 +26,11 @@ repositories {
maven {
url '/usr/local/node/lib/node_modules/react-native/android'
}
+ flatDir {
+ dirs "./libs"
+ }
}
-
-apply plugin: 'com.android.library'
-
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
@@ -39,7 +42,7 @@ android {
versionName "1.0"
ndk {
abiFilters "armeabi-v7a", "arm64-v8a"
- }
+ }
}
buildTypes {
@@ -55,19 +58,18 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+
+ configurations.all {
+ resolutionStrategy.force 'com.squareup.okhttp3:okhttp:3.4.1'
+ resolutionStrategy.force 'com.squareup.okio:okio:1.9.0'
+ resolutionStrategy.force 'androidx.appcompat:appcompat:1.0.0'
+ }
}
dependencies {
- compileOnly 'com.facebook.react:react-native:+'
- // 本地包依赖
- implementation files('libs/aligreen-release-2.0.0.aar')
- implementation files('libs/FaceLivenessOpen-3.2.0.aar')
- implementation files('libs/NoCaptchaSDK-external-release-5.4.29.aar')
- implementation files('libs/SecurityBodySDK-external-release-5.4.79.aar')
- implementation files('libs/SecurityGuardSDK-exte rnal-release-5.4.121.aar')
- // 远程包依赖
- // implementation 'com.alibaba:fastjson:1.2.62'
- // implementation 'com.alibaba.android.mnnkit:core:0.0.5'
- compileOnly files('src/main/assets')
+ implementation 'com.facebook.react:react-native:+'
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation fileTree(include: ['*.aar'], dir: 'libs')
+ implementation files('src/main/assets')
}
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 698218f..9feecb8 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -7,8 +7,4 @@
-
-
-
-
diff --git a/android/src/main/java/com/feewee/aliface/CertificationModule.java b/android/src/main/java/com/feewee/aliface/CertificationModule.java
index 09fa6b9..deacd2b 100644
--- a/android/src/main/java/com/feewee/aliface/CertificationModule.java
+++ b/android/src/main/java/com/feewee/aliface/CertificationModule.java
@@ -1,13 +1,18 @@
package com.feewee.aliface;
+import android.util.Base64;
+
import com.alibaba.security.aligreenv2.AligreenSdkManager;
import com.alibaba.security.aligreenv2.BiometricsDetectListener;
import com.alibaba.security.aligreenv2.model.BiometricsConfig;
import com.alibaba.security.aligreenv2.model.BiometricsResult;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
public class CertificationModule extends ReactContextBaseJavaModule {
@@ -21,10 +26,10 @@ public class CertificationModule extends ReactContextBaseJavaModule {
}
@ReactMethod
- public void start(){
+ public void start(Callback callback){
//基于BiometricsConfig.Builder构造配置示例并进行参数设置
BiometricsConfig.Builder bioConfigBuilder = new BiometricsConfig.Builder();
- bioConfigBuilder.setActionCount(2); // 设置动作个数
+// bioConfigBuilder.setActionCount(2); // 设置动作个数
bioConfigBuilder.setShowTutorial(true); // 是否显示导航(预备)页
bioConfigBuilder.setRecapThreshold(1.0f); // 翻拍检测阈值(阈值越大意味着越宽松)
@@ -47,7 +52,15 @@ public class CertificationModule extends ReactContextBaseJavaModule {
@Override
public void onFinish(BiometricsResult result) {
- // 人脸采集结束
+ // 集成成功
+ if (result != null && result.getCode() == 0) {
+ // 人脸采集结束
+ WritableMap map = Arguments.createMap();
+ System.out.println();
+ map.putString("image", Base64.encodeToString(result.getBigImageData(), Base64.DEFAULT));
+ map.putInt("code", result.getCode());
+ callback.invoke(map);
+ }
}
});
}
diff --git a/android/src/main/java/com/feewee/aliface/FaceActivity.java b/android/src/main/java/com/feewee/aliface/FaceActivity.java
deleted file mode 100644
index dfdf546..0000000
--- a/android/src/main/java/com/feewee/aliface/FaceActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.feewee.aliface;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import com.alibaba.security.aligreenv2.AligreenSdkManager;
-
-public class FaceActivity extends Activity {
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- AligreenSdkManager.getInstance().init(getApplicationContext());
- }
-}
diff --git a/android/src/main/res/drawable/yw_1222_1d41.jpg b/android/src/main/res/drawable/yw_1222_1d41.jpg
new file mode 100644
index 0000000..8e5eca6
--- /dev/null
+++ b/android/src/main/res/drawable/yw_1222_1d41.jpg
diff --git a/package.json b/package.json
index cf1f176..032e836 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fw-rn-aliface",
- "version": "1.0.8",
+ "version": "1.0.11",
"description": "阿里人脸活体检测",
"main": "index.js",
"scripts": {