Merge pull request #34 from BlinkID/feature/face-image

Feature/face image
BlinkID · Dec 8, 2017 · c123748 · c123748
2 parents 341e153 + 940fe9a
commit c123748
Show file tree

Hide file tree

Showing 15 changed files with 829 additions and 510 deletions.
diff --git a/BlinkID/initIOSFramework.sh b/BlinkID/initIOSFramework.sh
@@ -3,7 +3,7 @@
 # enter into ios project folder
 pushd src/ios/
 
-VERSION='2.12.0'
+VERSION='2.14.0'
 
 # check if Microblink framework and bundle already exist
 if [ ! -d 'blinkid-ios' ] ; then

diff --git a/BlinkID/plugin.xml b/BlinkID/plugin.xml
@@ -66,8 +66,8 @@
     </platform>
 
     <platform name="ios">
-        <source-file src="src/ios/sources/CDVblinkIdScanner.m" />
-        <header-file src="src/ios/sources/CDVblinkIdScanner.h" />
+        <source-file src="src/ios/sources/CDVBlinkIdScanner.m" />
+        <header-file src="src/ios/sources/CDVBlinkIdScanner.h" />
 
         <framework src="libc++.dylib" />
         <framework src="libz.dylib" />
@@ -90,11 +90,11 @@
         <resource-file src="src/ios/blinkid-ios/MicroBlink.bundle" />
         <config-file target="config.xml" parent="/*">
             <feature name="blinkIdScanner">
-                <param name="ios-package" value="CDVblinkIdScanner" />
+                <param name="ios-package" value="CDVBlinkIdScanner" />
             </feature>
         </config-file>
 
-        <hook type="after_platform_add" src="addEmbedded.js" />
+        <hook type="after_platform_add" src="scripts/addEmbedded.js" />
     </platform>
 
 </plugin>
diff --git a/BlinkID/addEmbedded.js → BlinkID/scripts/addEmbedded.js b/BlinkID/addEmbedded.js → BlinkID/scripts/addEmbedded.js
diff --git a/BlinkID/src/android/java/com/phonegap/plugins/blinkid/BlinkIdScanner.java b/BlinkID/src/android/java/com/phonegap/plugins/blinkid/BlinkIdScanner.java
diff --git a/BlinkID/src/android/libBlinkID.gradle b/BlinkID/src/android/libBlinkID.gradle
@@ -5,8 +5,8 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile('com.microblink:blinkid:3.11.0@aar') {
+    compile 'com.android.support:appcompat-v7:27.0.0'
+    compile('com.microblink:blinkid:3.13.0@aar') {
         transitive = false
     }
 }

diff --git a/BlinkID/src/ios/sources/CDVblinkIdScanner.h → BlinkID/src/ios/sources/CDVBlinkIdScanner.h b/BlinkID/src/ios/sources/CDVblinkIdScanner.h → BlinkID/src/ios/sources/CDVBlinkIdScanner.h
@@ -15,7 +15,7 @@
  * pdf417 plugin class.
  * Responds to JS calls
  */
-@interface CDVblinkIdScanner : CDVPlugin
+@interface CDVBlinkIdScanner : CDVPlugin
 
 /**
  * Starts the scanning process