accurascan_kyc 1.2.7 → 1.2.8

package/android/build.gradle

@@ -99,12 +99,12 @@ dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation 'androidx.appcompat:appcompat:1.6.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-      // For Accura OCR SDK
-    implementation 'com.github.accurascan:AccuraOCR:6.1.3'
-    // For Accura Face match
-    implementation 'com.github.accurascan:AccuraFaceMatch:3.2.2'
-    // for liveness
-    implementation 'com.github.accurascan:Liveness-Android:3.3.1'
+// Update OCR
+ implementation 'com.github.accurascan:AccuraOCR:5.5.0.0'
+// FaceMatch has no issue
+  implementation 'com.github.accurascan:AccuraFaceMatch:3.2.2'
+// Update Liveness
+implementation 'com.github.accurascan:Liveness-Android:3.3.1.1'
   implementation 'com.squareup.picasso:picasso:2.71828'
 }
 

package/android/src/main/java/com/accurascankyc/AccurascanKycModule.java

@@ -64,9 +64,6 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
   public static JSONObject actualAccuraErrorConfg = new JSONObject();
 
   private String bType;
-  public  static Boolean isDynamic = false;
-  public static String LicenseAbsolutePath = "";
-  public static String FaceLicenseAbsolutePath = "";
 
   public AccurascanKycModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -130,7 +127,7 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
 
   @ReactMethod
   public boolean getMetaData( Callback callbackContext ) throws JSONException {
-    isDynamic = false;
+
     onResult = callbackContext;
     RecogEngine recogEngine = new RecogEngine();
     AccuraLog.enableLogs(false);
@@ -196,83 +193,6 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
     return true;
   }
 
-  @ReactMethod
-  public boolean getDynamicMetaData(ReadableArray argsNew, Callback callbackContext ) throws JSONException {
-
-    onResult = callbackContext;
-    RecogEngine recogEngine = new RecogEngine();
-    AccuraLog.enableLogs(false);
-    recogEngine.setDialog(false);
-    JSONObject results = new JSONObject();
-
-    JSONArray args = ReactNativeJSON.convertArrayToJson(argsNew);
-    JSONObject accuraConf = args.getJSONObject(0);
-
-    LicenseAbsolutePath = accuraConf.getString("licensePath");
-    FaceLicenseAbsolutePath = accuraConf.getString("faceLicensePath");
-    isDynamic = true;
-
-    RecogEngine.SDKModel sdkModel = recogEngine.initEngine(getReactApplicationContext(), LicenseAbsolutePath);
-
-    if (sdkModel.i >= 0) {
-      // AndroidNetworking.initialize(getReactApplicationContext(), UnsafeOkHttpClient.getUnsafeOkHttpClient());
-      results.put("sdk_version", recogEngine.getVersion());
-
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !isPermissionsGranted(getCurrentActivity())) {
-        requestCameraPermission();
-      }
-
-      results.put("isValid", true);
-      // if OCR enable then get card list
-      if (sdkModel.isOCREnable) {
-        results.put("isOCR", true);
-        List<ContryModel> modelList = recogEngine.getCardList(getCurrentActivity());
-        JSONArray countries = new JSONArray();
-        for (int i = 0; i < modelList.size(); i++) {
-          JSONObject country = new JSONObject();
-//          if (Objects.equals(modelList.get(i).getCountry_name(), "Saint Kitts and Nevis")) {
-//            results.put("isSchengen", true);
-//          } else {
-          country.put("name", modelList.get(i).getCountry_name());
-          country.put("id", modelList.get(i).getCountry_id());
-          JSONArray cards = new JSONArray();
-          List<ContryModel.CardModel> cardList = modelList.get(i).getCards();
-          for (int j = 0; j < cardList.size(); j++) {
-            JSONObject card = new JSONObject();
-            card.put("name", cardList.get(j).getCard_name());
-            card.put("id", cardList.get(j).getCard_id());
-            card.put("type", cardList.get(j).getCard_type());
-            cards.put(card);
-          }
-          country.put("cards", cards);
-          countries.put(country);
-//          }
-        }
-        results.put("countries", countries);
-      }
-      results.put("isOCREnable", sdkModel.isOCREnable);
-      results.put("isBarcode", sdkModel.isAllBarcodeEnable);
-      if (sdkModel.isAllBarcodeEnable) {
-        List<BarcodeFormat> CODE_NAMES = BarcodeFormat.getList();
-        JSONArray barcodes = new JSONArray();
-        for (int i = 0; i < CODE_NAMES.size(); i++) {
-          JSONObject barcode = new JSONObject();
-          barcode.put("name", CODE_NAMES.get(i).barcodeTitle);
-          barcode.put("type", CODE_NAMES.get(i).formatsType);
-          barcodes.put(barcode);
-        }
-        results.put("barcodes", barcodes);
-      }
-      results.put("isBankCard", sdkModel.isBankCardEnable);
-      results.put("isMRZ", sdkModel.isMRZEnable);
-
-    } else {
-      results.put("isValid", false);
-    }
-    callbackContext.invoke(null, results.toString());
-    return true;
-  }
-
   @ReactMethod
   public boolean setupAccuraConfig(ReadableArray argsNew, Callback result) throws JSONException {
 
@@ -433,8 +353,6 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
     ActivityFaceMatch.faceMatchConfig = args.getJSONObject(1);
     ActivityFaceMatch.sface = accuraConf.getString("face1");
     ActivityFaceMatch.mface = accuraConf.getString("face2");
-    ActivityFaceMatch.faceLicensePath = FaceLicenseAbsolutePath;
-    ActivityFaceMatch.isDynamic = isDynamic;
     Intent intent = new Intent(getCurrentActivity(), ActivityFaceMatch.class);
     getCurrentActivity().startActivity(intent);
     return true;
@@ -450,8 +368,6 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
     JSONObject accuraConf = args.getJSONObject(0);
     ActivityFaceMatch.sface = accuraConf.getString("face1");
     ActivityFaceMatch.mface = accuraConf.getString("face2");
-    ActivityFaceMatch.faceLicensePath = FaceLicenseAbsolutePath;
-    ActivityFaceMatch.isDynamic = isDynamic;
 //    JSONObject config = args.getJSONObject(1);
     Intent intent = new Intent(getCurrentActivity(), ActivityFaceMatch.class);
 //    intent = addDefaultConfigs(intent, accuraConf);
@@ -469,8 +385,6 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
     JSONObject accuraConf = args.getJSONObject(0);
     ActivityFaceMatch.sface = accuraConf.getString("face1");
     ActivityFaceMatch.mface = accuraConf.getString("face2");
-    ActivityFaceMatch.faceLicensePath = FaceLicenseAbsolutePath;
-    ActivityFaceMatch.isDynamic = isDynamic;
 //    JSONObject config = args.getJSONObject(1);
     Intent intent = new Intent(getCurrentActivity(), ActivityFaceMatch.class);
 //    intent = ActivityFaceMatch(intent, accuraConf);
@@ -491,8 +405,6 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
     ActivityFaceMatch.faceMatchConfig = args.getJSONObject(1);
     ActivityFaceMatch.sface = accuraConf.getString("face1");
     ActivityFaceMatch.mface = accuraConf.getString("face2");
-    ActivityFaceMatch.faceLicensePath = FaceLicenseAbsolutePath;
-    ActivityFaceMatch.isDynamic = isDynamic;
 //    JSONObject config = args.getJSONObject(1);
     Intent intent = new Intent(getCurrentActivity(), ActivityFaceMatch.class);
 //    intent = addDefaultConfigs(intent, accuraConf);
@@ -615,8 +527,6 @@ public class AccurascanKycModule extends ReactContextBaseJavaModule {
     OcrResultActivity.face1 = BitmapFactory.decodeFile(uri.replace("file://",""));
     OcrResultActivity.which = 0;
     OcrResultActivity.faceConfig = arg.getJSONObject(1);
-    OcrResultActivity.faceLicensePath = FaceLicenseAbsolutePath;
-    OcrResultActivity.isDynamic = isDynamic;
     Intent intent = new Intent(getCurrentActivity(),OcrResultActivity.class);
     Objects.requireNonNull(getCurrentActivity()).startActivity(intent);
 

package/android/src/main/java/com/accurascankyc/ActivityFaceMatch.java

@@ -44,8 +44,7 @@ public class ActivityFaceMatch extends Activity implements FaceCallback {
   public static int which;
   public static int No;
   public static JSONObject faceMatchConfig;
-  public static String faceLicensePath;
-  public static Boolean isDynamic;
+
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -54,15 +53,7 @@ public class ActivityFaceMatch extends Activity implements FaceCallback {
 
     helper = new FaceHelper(this);
     helper.setFaceMatchCallBack(this);
-//    helper.initEngine();
-    if(isDynamic){
-//      System.out.println("FaceMatch activity isDynamic true");
-      helper.initEngine(faceLicensePath);
-    }else{
-//      System.out.println("FaceMatch activity  isDynamic false");
-      helper.initEngine();
-    }
-
+    helper.initEngine();
     image1 = new FaceImageview(this);  //initialize the view of front image
     image2 = new FaceImageview(this);
     bundle = getIntent().getExtras();

package/android/src/main/java/com/accurascankyc/OcrActivity.java

@@ -31,7 +31,7 @@ import androidx.annotation.Nullable;
 
 import com.accurascan.facedetection.utils.AccuraLivenessLog;
 import com.accurascan.ocr.mrz.CameraView;
-// import com.accurascan.ocr.mrz.customview.CustomTextView;
+import com.accurascan.ocr.mrz.customview.CustomTextView;
 import com.accurascan.ocr.mrz.interfaces.OcrCallback;
 import com.accurascan.ocr.mrz.model.BarcodeFormat;
 import com.accurascan.ocr.mrz.model.CardDetails;

package/android/src/main/java/com/accurascankyc/OcrResultActivity.java

@@ -47,9 +47,6 @@ public class OcrResultActivity extends Activity implements FaceCallback {
 
   public static JSONObject faceConfig;
   public static JSONObject livenessConfig;
-  public static String faceLicensePath;
-  public static Boolean isDynamic;
-
   ImageView ivUserProfile2;
   View loutImg2;
   public static int which;
@@ -65,14 +62,7 @@ public class OcrResultActivity extends Activity implements FaceCallback {
 
     faceHelper = new FaceHelper(this);
     faceHelper.setFaceMatchCallBack(this);
-//    faceHelper.initEngine();
-    if(isDynamic){
-//      System.out.println("FaceMatch activity isDynamic true");
-      faceHelper.initEngine(faceLicensePath);
-    }else{
-//      System.out.println("FaceMatch activity  isDynamic false");
-      faceHelper.initEngine();
-    }
+    faceHelper.initEngine();
     if (getIntent().getIntExtra("app_orientation", 1) != 0) {
       setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
     } else {

package/android/src/main/res/layout/custom_frame_layout.xml

@@ -118,7 +118,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true">
 
-            <TextView
+            <com.accurascan.ocr.mrz.customview.CustomTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""

package/android/src/main/res/layout-land/custom_frame_layout.xml

@@ -118,7 +118,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true">
 
-            <TextView
+            <com.accurascan.ocr.mrz.customview.CustomTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""

package/ios/AccurascanKyc.m

@@ -4,8 +4,6 @@
 
 RCT_EXTERN_METHOD(getMetaData:(RCTResponseSenderBlock)callback)
 
-RCT_EXTERN_METHOD(getDynamicMetaData:(NSArray *)argsNew callback:(RCTResponseSenderBlock)callback)
-
 RCT_EXTERN_METHOD(setupAccuraConfig:(NSArray *)argsNew callback:(RCTResponseSenderBlock)callback)
 
 RCT_EXTERN_METHOD(startMRZ:(NSArray *)argsNew callback:(RCTResponseSenderBlock)callback)

package/ios/AccurascanKyc.swift

@@ -21,9 +21,6 @@ class AccurascanKyc: NSObject {
     var accuraTitleMsg:NSDictionary = [:]
     var viewController: UIViewController? = nil;
     var viewControllerWindow: UIWindow? = nil;
-    var LicenseAbsoultPath:String = "";
-    var FaceLicenseAbsoultPath:String = "";
-    var isDynamic:Bool = false;
     
     var actualConfig:NSDictionary = [
       "setFaceBlurPercentage": 80,
@@ -129,19 +126,6 @@ class AccurascanKyc: NSObject {
         return nil
     }
     
-    func faceLicenseInit() {
-        EngineWrapper.faceEngineClose()
-        let fmInit = EngineWrapper.isEngineInit()
-        if !fmInit{
-            if (isDynamic){
-                EngineWrapper.faceEngineInit(FaceLicenseAbsoultPath)
-            }else{
-                EngineWrapper.faceEngineInit()
-            }
-            
-        }
-    }
-    
     
     @objc(getMetaData:)
     func getMetaData(_ callback: @escaping RCTResponseSenderBlock) {
@@ -216,93 +200,6 @@ class AccurascanKyc: NSObject {
         }
     }
     
-    @objc(getDynamicMetaData:callback:)
-        func getDynamicMetaData(_ argsNew: NSArray, _ callback: @escaping RCTResponseSenderBlock) {
-            goNativeArgs = argsNew
-            goNativeCallBack = callback
-            isDynamic = true
-            var results:[String: Any] = [:]
-            results["isValid"] = false
-            
-            guard let configs = goNativeArgs[0] as? [String: Any] else {
-    //            print("Invalid argument format")
-                results["status"] = "Invalid argument format"
-                self.goNativeCallBack?([ AccurascanKyc.convertJSONString(results: results),NSNull()])
-                return
-            }
-            LicenseAbsoultPath = configs["licensePath"] as! String
-            FaceLicenseAbsoultPath = configs["faceLicensePath"] as! String
-            
-            accuraCameraWrapper = AccuraCameraWrapper.init()
-    //        DispatchQueue.main.async {
-    //            self.accuraCameraWrapper?.setDefaultDialogs(true)
-    //            self.accuraCameraWrapper?.showLogFile(true) // Set true to print log from KYC SDK
-    //        }
-            
-            DispatchQueue.main.async {
-            self.viewController = RCTPresentedViewController()!
-            self.viewControllerWindow = RCTKeyWindow()!
-            let sdkModel = self.accuraCameraWrapper!.loadEngine(self.LicenseAbsoultPath, documentDirectory: NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0] as String)
-                
-            
-                
-                if sdkModel!.i > 0 {
-                    var countries:[Any] = []
-                    results["sdk_version"] = ""
-                    results["isValid"] = true
-                    results["isOCR"] = sdkModel!.isOCREnable
-                    results["isOCREnable"] = sdkModel!.isOCREnable
-                    results["isBarcode"] = sdkModel!.isBarcodeEnable
-                    results["isBankCard"] = sdkModel!.isBankCardEnable
-                    results["isMRZ"] = sdkModel!.isMRZEnable
-                    
-                    
-                    let countryListStr = self.accuraCameraWrapper!.getOCRList();
-                    for item in countryListStr ?? [] {
-                        let cntry = item as! NSDictionary
-                        var country:[String: Any] = [:]
-    //                    if cntry.value(forKey: "country_name") as? String == "Saint Kitts and Nevis" {
-    //                              results["isSchengen"] = true
-    //                    }else{
-                            country["name"] = cntry.value(forKey: "country_name")
-                            country["id"] = cntry.value(forKey: "country_id")
-                            var cards:[[String: Any]] = []
-                            for cd in cntry.value(forKey: "cards") as! NSArray {
-                                let cardF = cd as! NSDictionary
-                                var card:[String: Any] = [:]
-                                card["name"] = cardF.value(forKey:"card_name")
-                                card["id"] = cardF.value(forKey:"card_id")
-                                card["type"] = cardF.value(forKey:"card_type")
-                                cards.append(card)
-                            }
-                            country["cards"] = cards
-                            countries.append(country)
-    //                    }
-                    }
-                    results["countries"] = countries
-                    if  sdkModel!.isBarcodeEnable {
-                        var barcodes:[[String: String]] = []
-                        barcodes.append(["name": "ALL FORMATS","type": "ALL FORMATS"])
-                        barcodes.append(["name": "EAN-8", "type": "EAN-8"])
-                        barcodes.append(["name": "EAN-13", "type": "EAN-13"])
-                        barcodes.append(["name": "PDF417", "type": "PDF417"])
-                        barcodes.append(["name": "AZTEC", "type": "AZTEC"])
-                        barcodes.append(["name": "CODE 128", "type": "CODE 128"])
-                        barcodes.append(["name": "CODE 39", "type": "CODE 39"])
-                        barcodes.append(["name": "CODE 93", "type": "CODE 93"])
-                        barcodes.append(["name": "DATA MATRIX", "type": "DATA MATRIX"])
-                        barcodes.append(["name": "QR CODE", "type": "QR CODE"])
-                        barcodes.append(["name": "UPC-E", "type": "UPC-E"])
-                        barcodes.append(["name": "UPC-A", "type": "UPC-A"])
-                        barcodes.append(["name": "CODABAR", "type": "CODABAR"])
-                        results["barcodes"] = barcodes
-                    }
-                }
-                self.goNativeCallBack!([NSNull(), AccurascanKyc.convertJSONString(results: results)])
-                //        }
-            }
-        }
-    
     @objc(startOcrWithCard:callback:)
     func startOcrWithCard(_ argsNew: NSArray, callback: @escaping RCTResponseSenderBlock){
         lvfm.faceImage = nil
@@ -498,14 +395,13 @@ class AccurascanKyc: NSObject {
         self.goNativeArgs = argsNew;
         let face:NSDictionary
         face = goNativeArgs[0] as! NSDictionary
-        faceLicenseInit()
-//        EngineWrapper.faceEngineClose()
-//        let fmInit = EngineWrapper.isEngineInit()
-//        if !fmInit{
-//            DispatchQueue.main.async {
-//                EngineWrapper.faceEngineInit()
-//            }
-//        }
+        EngineWrapper.faceEngineClose()
+        let fmInit = EngineWrapper.isEngineInit()
+        if !fmInit{
+            DispatchQueue.main.async {
+                EngineWrapper.faceEngineInit()
+            }
+        }
         let fmValue = EngineWrapper.getEngineInitValue() //get engineWrapper load status
         if fmValue == -20{
             self.goNativeCallBack!(["key not found", NSNull()])
@@ -537,12 +433,11 @@ class AccurascanKyc: NSObject {
             self.goNativeArgs = argsNew;
             let face:NSDictionary
             face = self.goNativeArgs[0] as! NSDictionary
-            self.faceLicenseInit()
-//            EngineWrapper.faceEngineClose()
-//            let fmInit = EngineWrapper.isEngineInit()
-//            if !fmInit{
-//                EngineWrapper.faceEngineInit()
-//            }
+            EngineWrapper.faceEngineClose()
+            let fmInit = EngineWrapper.isEngineInit()
+            if !fmInit{
+                EngineWrapper.faceEngineInit()
+            }
             let fmValue = EngineWrapper.getEngineInitValue() //get engineWrapper load status
             if fmValue == -20{
                 self.goNativeCallBack!(["key not found", NSNull()])
@@ -572,12 +467,11 @@ class AccurascanKyc: NSObject {
         DispatchQueue.main.async {
         self.goNativeCallBack = callback;
         self.goNativeArgs = argsNew;
-        self.faceLicenseInit()
-//        EngineWrapper.faceEngineClose()
-//        let fmInit = EngineWrapper.isEngineInit()
-//        if !fmInit{
-//            EngineWrapper.faceEngineInit()
-//        }
+        EngineWrapper.faceEngineClose()
+        let fmInit = EngineWrapper.isEngineInit()
+        if !fmInit{
+            EngineWrapper.faceEngineInit()
+        }
         let fmValue = EngineWrapper.getEngineInitValue() //get engineWrapper load status
         if fmValue == -20{
             self.sendError(msg: "Key not found")
@@ -620,12 +514,11 @@ class AccurascanKyc: NSObject {
         DispatchQueue.main.async {
         self.goNativeCallBack = callback;
         self.goNativeArgs = argsNew;
-        self.faceLicenseInit()
-//        EngineWrapper.faceEngineClose()
-//        let fmInit = EngineWrapper.isEngineInit()
-//        if !fmInit{
-//            EngineWrapper.faceEngineInit()
-//        }
+        EngineWrapper.faceEngineClose()
+        let fmInit = EngineWrapper.isEngineInit()
+        if !fmInit{
+            EngineWrapper.faceEngineInit()
+        }
         let fmValue = EngineWrapper.getEngineInitValue() //get engineWrapper load status
         if fmValue == -20{
             self.sendError(msg: "Key not found")
@@ -664,14 +557,13 @@ class AccurascanKyc: NSObject {
         DispatchQueue.main.async {
         self.goNativeCallBack = callback;
         self.goNativeArgs = argsNew;
-        self.faceLicenseInit()
-//        EngineWrapper.faceEngineClose()
-//        let fmInit = EngineWrapper.isEngineInit()
-//        if !fmInit{
-//            DispatchQueue.main.async {
-//                EngineWrapper.faceEngineInit()
-//            }
-//        }
+        EngineWrapper.faceEngineClose()
+        let fmInit = EngineWrapper.isEngineInit()
+        if !fmInit{
+            DispatchQueue.main.async {
+                EngineWrapper.faceEngineInit()
+            }
+        }
         let fmValue = EngineWrapper.getEngineInitValue() //get engineWrapper load status
         if fmValue == -20{
             //            goNativeCallBack!(FlutterError.init(code: "101", message: "Key not found", details: nil))
@@ -711,12 +603,11 @@ class AccurascanKyc: NSObject {
         DispatchQueue.main.async {
         self.goNativeCallBack = callback;
         self.goNativeArgs = argsNew;
-        self.faceLicenseInit()
-//        EngineWrapper.faceEngineClose()
-//        let fmInit = EngineWrapper.isEngineInit()
-//        if !fmInit{
-//            EngineWrapper.faceEngineInit()
-//        }
+        EngineWrapper.faceEngineClose()
+        let fmInit = EngineWrapper.isEngineInit()
+        if !fmInit{
+            EngineWrapper.faceEngineInit()
+        }
         let fmValue = EngineWrapper.getEngineInitValue() //get engineWrapper load status
         if fmValue == -20{
             self.sendError(msg: "Key not found")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accurascan_kyc",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Accura Scan",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -84,7 +84,6 @@
   "engines": {
     "node": ">= 10.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [