cronapp-plugin-mlkit 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-plugin-mlkit",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "cordova": {
     "id": "cronapp-plugin-mlkit",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cronapp-plugin-mlkit" version="1.0.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cronapp-plugin-mlkit" version="1.0.4" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>CronappMLKitPlugin</name>
 
     <js-module name="CronappMLKitPlugin" src="www/cronapp-mlkit.js">

package/src/android/CronappMLKitPlugin.java

@@ -4,8 +4,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.util.Base64;
 
+import androidx.annotation.NonNull;
+
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.mlkit.vision.barcode.Barcode;
@@ -35,8 +38,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-
 public class CronappMLKitPlugin extends CordovaPlugin {
 
   protected static Context applicationContext = null;
@@ -170,8 +171,11 @@ public class CronappMLKitPlugin extends CordovaPlugin {
       try {
         InputImage image = getImage(message);
         FaceDetectorOptions faceDetectorOptions = new FaceDetectorOptions.Builder()
-            .setClassificationMode(FaceDetectorOptions.CLASSIFICATION_MODE_ALL)
-
+            .setClassificationMode(options.optInt("classificationMode", FaceDetectorOptions.CLASSIFICATION_MODE_ALL))
+            .setPerformanceMode(options.optInt("performanceMode", FaceDetectorOptions.PERFORMANCE_MODE_FAST))
+            .setContourMode(options.optInt("contourMode", FaceDetectorOptions.CONTOUR_MODE_NONE))
+            .setMinFaceSize((float) options.optDouble("minFaceSize", 0.1F))
+            .setLandmarkMode(options.optInt("landmarkMode", FaceDetectorOptions.LANDMARK_MODE_NONE))
             .build();
         FaceDetector detector = FaceDetection.getClient(faceDetectorOptions);
         detector.process(image)
@@ -218,12 +222,12 @@ public class CronappMLKitPlugin extends CordovaPlugin {
       message = message
           .replace("data:image/png;base64,", "")
           .replace("data:image/jpeg;base64,", "");
-      byte[] decodedString = Base64.decode(message, Base64.DEFAULT);
+      byte[] decodedString = Base64.decode(message.trim(), Base64.DEFAULT);
       Bitmap bitMap = BitmapFactory.decodeByteArray(decodedString, 0, decodedString.length);
       InputImage image = InputImage.fromBitmap(bitMap, 0);
       return image;
     } else {
-      Uri uri = Uri.parse("/sdcard/Download/face.jpg");
+      Uri uri = Uri.parse(message);
       InputImage image = InputImage.fromFilePath(applicationContext, uri);
       return image;
     }

package/src/android/Utils.java

@@ -1,12 +1,15 @@
 package io.cronapp.mlkit;
 
 import android.graphics.Point;
+import android.graphics.PointF;
 import android.graphics.Rect;
 import android.text.TextUtils;
 
 import com.google.mlkit.vision.barcode.Barcode;
 import com.google.mlkit.vision.common.InputImage;
 import com.google.mlkit.vision.face.Face;
+import com.google.mlkit.vision.face.FaceContour;
+import com.google.mlkit.vision.face.FaceLandmark;
 import com.google.mlkit.vision.label.ImageLabel;
 import com.google.mlkit.vision.text.Text;
 
@@ -184,7 +187,7 @@ public class Utils {
     JSONArray array = new JSONArray();
     for (Face face : faces) {
 
-      array.put(FaceToJsonConverter.faceToJson(face));
+      array.put(parseFace(face));
     }
     return array;
   }
@@ -258,18 +261,13 @@ public class Utils {
         date.getHours(), date.getMinutes(), date.getSeconds());
   }
 
-  public static JSONObject parseFaces(Face face) {
+  public static JSONObject parseFace(Face face) {
 
     JSONObject faceData = new JSONObject();
 
     try {
       faceData.put("faceId", face.getTrackingId());
-      JSONObject boundingBox = new JSONObject();
-      boundingBox.put("left", face.getBoundingBox().left);
-      boundingBox.put("top", face.getBoundingBox().top);
-      boundingBox.put("right", face.getBoundingBox().right);
-      boundingBox.put("bottom", face.getBoundingBox().bottom);
-      faceData.put("boundingBox", boundingBox);
+      faceData.put("boundingBox", parseBoundingBox(face.getBoundingBox()));
       faceData.put("headEulerAngleX", face.getHeadEulerAngleX());
       faceData.put("headEulerAngleY", face.getHeadEulerAngleY());
       faceData.put("headEulerAngleZ", face.getHeadEulerAngleZ());
@@ -289,8 +287,25 @@ public class Utils {
         landmarksArray.put(landmarkData);
       }
       faceData.put("landmarks", landmarksArray);
+
+      JSONArray contoursArray = new JSONArray();
+
+      for (FaceContour contour : face.getAllContours()) {
+        JSONObject obj = new JSONObject();
+        JSONArray points = new JSONArray();
+        obj.put("type", contour.getFaceContourType());
+        for (PointF point: contour.getPoints()) {
+          JSONObject objPoint = new JSONObject();
+          objPoint.put("x", point.x);
+          objPoint.put("y", point.y);
+          points.put(objPoint);
+        }
+        obj.put("points", points);
+        contoursArray.put(obj);
+      }
+      faceData.put("contours", contoursArray);
     } catch (Exception e) {
-      e.printStackTrace();
+      throw new RuntimeException(e);
     }
 
     return faceData;

package/src/ios/CronappMLKitExtensions.swift

@@ -43,6 +43,7 @@ extension Text {
 
 extension Face {
     func toJSON(with image: UIImage) -> [AnyHashable: Any] {
+        // Cria o dicionário de resposta
         var response: [AnyHashable: Any] = [:]
 
         response["faceId"] = trackingID
@@ -74,6 +75,25 @@ extension Face {
         }
         response["landmarks"] = landmarksArray
 
+        var contoursArray: [[AnyHashable: Any]] = []
+        for contour in contours {
+            var contourData: [AnyHashable: Any] = [:]
+            contourData["type"] = contour.type.rawValue
+
+            var pointsArray: [[String: CGFloat]] = []
+            for point in contour.points {
+                let pointData = [
+                    "x": point.x,
+                    "y": point.y
+                ]
+                pointsArray.append(pointData)
+            }
+            contourData["points"] = pointsArray
+
+            contoursArray.append(contourData)
+        }
+        response["contours"] = contoursArray
+
         return response
     }
 }

package/src/ios/CronappMLKitPlugin.swift

@@ -35,6 +35,40 @@ class CronappMLKitPlugin: CDVPlugin {
         }
     }
 
+    func createFaceDetectorOptions(from options: AnyObject?) -> FaceDetectorOptions {
+        let defaultClassificationMode = FaceDetectorClassificationMode.all
+        let defaultPerformanceMode = FaceDetectorPerformanceMode.fast
+        let defaultContourMode = FaceDetectorContourMode.none
+        let defaultLandmarkMode = FaceDetectorLandmarkMode.none
+        let defaultMinFaceSize: Float = 0.1
+
+        let optionsDict = options as? [String: Any] ?? [:]
+
+        let classificationModeRaw = optionsDict["classificationMode"] as? Int ?? defaultClassificationMode.rawValue
+        let classificationMode = FaceDetectorClassificationMode(rawValue: classificationModeRaw) ?? defaultClassificationMode
+
+        let performanceModeRaw = optionsDict["performanceMode"] as? Int ?? defaultPerformanceMode.rawValue
+        let performanceMode = FaceDetectorPerformanceMode(rawValue: performanceModeRaw) ?? defaultPerformanceMode
+
+        let contourModeRaw = optionsDict["contourMode"] as? Int ?? defaultContourMode.rawValue
+        let contourMode = FaceDetectorContourMode(rawValue: contourModeRaw) ?? defaultContourMode
+
+        let minFaceSize = optionsDict["minFaceSize"] as? Float ?? defaultMinFaceSize
+
+        let landmarkModeRaw = optionsDict["landmarkMode"] as? Int ?? defaultLandmarkMode.rawValue
+        let landmarkMode = FaceDetectorLandmarkMode(rawValue: landmarkModeRaw) ?? defaultLandmarkMode
+
+        // Configura e retorna as opções do detector de rosto
+        let faceDetectorOptions = FaceDetectorOptions()
+        faceDetectorOptions.classificationMode = classificationMode
+        faceDetectorOptions.performanceMode = performanceMode
+        faceDetectorOptions.contourMode = contourMode
+        faceDetectorOptions.minFaceSize = CGFloat(minFaceSize)
+        faceDetectorOptions.landmarkMode = landmarkMode
+
+        return faceDetectorOptions
+    }
+
 
     @objc(faceDetector:)
     func faceDetector(command: CDVInvokedUrlCommand) {
@@ -43,21 +77,27 @@ class CronappMLKitPlugin: CDVPlugin {
             self.commandDelegate.send(pluginResult, callbackId: command.callbackId)
             return
         }
-        getImage(imageURL: imageURL) { (image, error) in
-            if let error = error {
-                let pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: error.localizedDescription)
-                self.commandDelegate.send(pluginResult, callbackId: command.callbackId)
-            } else {
-                let faceDetector = FaceDetector.faceDetector()
-                let visionImage = VisionImage(image: image!)
-                faceDetector.process(visionImage) { (faces, error) in
-                    if let error = error {
-                        let pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: error.localizedDescription)
-                        self.commandDelegate.send(pluginResult, callbackId: command.callbackId)
-                    } else {
-                        let barcodesDict = faces?.compactMap({ $0.toJSON(with: image!) })
-                        let pluginResult = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: barcodesDict)
-                        self.commandDelegate.send(pluginResult, callbackId: command.callbackId)
+        let options = command.arguments[1]
+
+            // Verifique se o argumento é um dicionário ou algo que possa ser convertido
+        if let optionsDict = options as? [String: Any] {
+
+            getImage(imageURL: imageURL) { (image, error) in
+                if let error = error {
+                    let pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: error.localizedDescription)
+                    self.commandDelegate.send(pluginResult, callbackId: command.callbackId)
+                } else {
+                  let faceDetector = FaceDetector.faceDetector(options: self.createFaceDetectorOptions(from: optionsDict as AnyObject))
+                    let visionImage = VisionImage(image: image!)
+                    faceDetector.process(visionImage) { (faces, error) in
+                        if let error = error {
+                            let pluginResult = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: error.localizedDescription)
+                            self.commandDelegate.send(pluginResult, callbackId: command.callbackId)
+                        } else {
+                            let barcodesDict = faces?.compactMap({ $0.toJSON(with: image!) })
+                            let pluginResult = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: barcodesDict)
+                            self.commandDelegate.send(pluginResult, callbackId: command.callbackId)
+                        }
                     }
                 }
             }
@@ -124,9 +164,11 @@ class CronappMLKitPlugin: CDVPlugin {
 
     private func getImage(imageURL: String, _ completion: @escaping (_ image: UIImage?, _ error: Error?) -> Void) {
         if imageURL.contains("data:") {
-            guard let data = Data(base64Encoded: imageURL
-                                    .replacingOccurrences(of: "data:image/jpeg;base64,", with: "")
-                                    .replacingOccurrences(of: "data:image/png;base64,", with: "")),
+            let b64 = imageURL
+                .replacingOccurrences(of: "data:image/jpeg;base64,", with: "")
+                .replacingOccurrences(of: "data:image/png;base64,", with: "")
+                .trimmingCharacters(in: NSCharacterSet.whitespacesAndNewlines)
+            guard let data = Data(base64Encoded: b64),
                   let image = UIImage(data: data) else {
                 let error = NSError(domain: "cronapp-plugin-mlkit",
                                     code: -1,