anyline-ocr-react-native-module 43.0.0 → 44.1.0

package/android/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,15 +76,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Nov 16 08:15:22 CET 2022
+sdk.dir=/Users/patrickfekete/Library/Android/sdk

package/android/src/main/java/com/anyline/reactnative/AnylineSDKPlugin.java

@@ -94,6 +94,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
             }
         } catch (JSONException e) {
             e.printStackTrace();
+            returnError(e.getMessage());
         }
     }
 
@@ -103,6 +104,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
             AnylineSdk.init(license, reactContext);
         } catch (LicenseException e) {
             e.printStackTrace();
+            returnError(e.getMessage());
         }
     }
 
@@ -160,36 +162,34 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
     private void scanAnyline4() {
         try {
             configObject = new JSONObject(this.config);
-//            JSONObject options = configObject;
             if (configObject != null) {
                 scan();
             } else {
                 returnError("No ViewPlugin in config. Please check your configuration.");
             }
+        } catch (LicenseException e) {
+            e.printStackTrace();
+            returnError("LICENSE ERROR: " + e.getMessage());
         } catch (JSONException e) {
             e.printStackTrace();
+            returnError("JSON ERROR: " + e.getMessage());
         }
     }
 
-    private void scan() {
+    private void scan() throws LicenseException, JSONException {
 
         Intent intent = new Intent(getCurrentActivity(), ScanActivity.class);
 
-        try {
-            configObject = new JSONObject(this.config);
-
-            license = configObject.get("license").toString();
-            JSONObject optionsJSONObject = configObject.optJSONObject("options");
+        configObject = new JSONObject(this.config);
 
-            if (optionsJSONObject != null) {
-                intent.putExtra(
-                        EXTRA_ENABLE_BARCODE_SCANNING,
-                        optionsJSONObject.optBoolean("nativeBarcodeEnabled", false)
-                );
-            }
+        license = configObject.get("license").toString();
+        JSONObject optionsJSONObject = configObject.optJSONObject("options");
 
-        } catch (JSONException e) {
-            returnError("JSON ERROR: " + e.getMessage());
+        if (optionsJSONObject != null) {
+            intent.putExtra(
+                    EXTRA_ENABLE_BARCODE_SCANNING,
+                    optionsJSONObject.optBoolean("nativeBarcodeEnabled", false)
+            );
         }
 
         intent.putExtra(EXTRA_LICENSE_KEY, license);
@@ -198,13 +198,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor
         ResultReporter.setListener(this);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-        try {
-            AnylineSdk.init(configObject.getString("license"), reactContext);
-        } catch (LicenseException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
+        AnylineSdk.init(configObject.getString("license"), reactContext);
         reactContext.startActivityForResult(intent, 1111, intent.getExtras());
     }
 

package/android/src/main/java/com/anyline/reactnative/FeedbackConfig.java

@@ -0,0 +1,58 @@
+package com.anyline.reactnative;
+
+import android.content.Context;
+
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import io.anyline.util.SoundUtil;
+
+public class FeedbackConfig {
+    private SoundUtil soundUtil;
+    public ImageTextConfig wrongFormat = null;
+    public ImageTextConfig brightnessTooHigh = null;
+    public ImageTextConfig brightnessTooLow = null;
+    public ImageTextConfig distance = null;
+    public String sound = null;
+
+    public FeedbackConfig(Context context, JSONObject jsonObject) {
+        if (jsonObject.has("format")) {
+            wrongFormat = new ImageTextConfig(context, jsonObject.optJSONObject("format"));
+        }
+
+        if (jsonObject.has("distance")) {
+            distance = new ImageTextConfig(context, jsonObject.optJSONObject("distance"));
+        }
+
+        if (jsonObject.has("brightness")) {
+            JSONObject jsonBrightness = jsonObject.optJSONObject("brightness");
+            if (jsonBrightness.has("too_high")) {
+                brightnessTooHigh = new ImageTextConfig(context, jsonBrightness.optJSONObject("too_high"));
+            }
+            if (jsonBrightness.has("too_low")) {
+                brightnessTooLow = new ImageTextConfig(context, jsonBrightness.optJSONObject("too_low"));
+            }
+        }
+
+        if (jsonObject.has("sound")) {
+            sound = jsonObject.optString("sound", "");
+            soundUtil = new SoundUtil(context);
+            try {
+                soundUtil.loadSoundFromAssets(sound);
+            } catch (IOException e) {
+                soundUtil = null;
+            }
+        }
+
+    }
+
+    public void playBeepSound() {
+        if (sound != null) {
+            if (soundUtil != null) {
+                soundUtil.playSound(sound);
+            }
+        }
+    }
+
+}

package/android/src/main/java/com/anyline/reactnative/ImageTextConfig.java

@@ -0,0 +1,48 @@
+package com.anyline.reactnative;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ImageTextConfig {
+    public String text = null;
+    public boolean hasImage = false;
+    public int imageResId = 0;
+
+    public ImageTextConfig(Context context, JSONObject jsonObject) {
+        if (jsonObject.has("text")) {
+            text = jsonObject.optString("text", "");
+        }
+
+        if (jsonObject.has("image")) {
+            imageResId = context.getResources().getIdentifier(jsonObject.optString("image", ""),
+                    "drawable",
+                    context.getPackageName());
+            hasImage = true;
+        }
+    }
+
+    protected Bitmap getBitmapFromAsset(Context context, String filePath) {
+        AssetManager assetManager = context.getAssets();
+
+        InputStream inputStream;
+        Bitmap bitmap = null;
+        try {
+            inputStream = assetManager.open(filePath);
+            bitmap = BitmapFactory.decodeStream(inputStream);
+            inputStream.close();
+        } catch (IOException e) {
+            Log.e("ImageTextConfig", e.getMessage());
+        }
+
+        return bitmap;
+    }
+
+}

package/android/src/main/java/com/anyline/reactnative/InstructionConfig.java

@@ -0,0 +1,19 @@
+package com.anyline.reactnative;
+
+import org.json.JSONObject;
+
+public class InstructionConfig {
+    public String text = null;
+    public String textColor = null;
+    public String backgroundColor = null;
+
+    public InstructionConfig(JSONObject jsonObject) {
+        text = jsonObject.optString("text", "");
+        if (jsonObject.has("textColor")) {
+            textColor = jsonObject.optString("textColor", "");
+        }
+        if (jsonObject.has("backgroundColor")) {
+            backgroundColor = jsonObject.optString("backgroundColor", "");
+        }
+    }
+}

package/android/src/main/java/com/anyline/reactnative/ScanActivity.java

@@ -6,9 +6,16 @@ import static com.anyline.reactnative.AnylineSDKPlugin.RESULT_ERROR;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Rect;
 import android.os.Bundle;
-import android.view.Gravity;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Pair;
 import android.view.View;
+import android.view.Gravity;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -21,14 +28,21 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+
 import io.anyline2.ScanResult;
+import io.anyline2.view.BrightnessHelper;
 import io.anyline2.view.ScanView;
+import io.anyline2.viewplugin.ScanViewPlugin;
 import io.anyline2.viewplugin.ViewPluginBase;
 
 public class ScanActivity extends AppCompatActivity {
 
     private static final String KEY_DEFAULT_ORIENTATION_APPLIED = "default_orientation_applied";
 
+    private Handler handler = new Handler(Looper.getMainLooper());
     private ActivityScanBinding binding;
     private ScanView scanView;
 
@@ -36,6 +50,21 @@ public class ScanActivity extends AppCompatActivity {
     private boolean defaultOrientationApplied;
     private int orientation;
 
+    private InstructionConfig instructionConfig = null;
+    private ImageTextConfig imageCutoutConfig = null;
+    private FeedbackConfig feedbackConfig = null;
+
+    private long cleanUIFeedbackIntervalMills = 2000L;
+    private Timer cleanUIFeedbackTimer = null;
+
+    private static final String FEEDBACK_SCANINFO_LIGHTINGCONDITION = "$lightingCondition";
+    private static final String FEEDBACK_SCANINFO_LIGHTINGCONDITION_TOODARK = "TOODARK";
+    private static final String FEEDBACK_SCANINFO_LIGHTINGCONDITION_TOOBRIGHT = "TOOBRIGHT";
+    private static final int FEEDBACK_RUNSKIPPED_WRONGFORMAT = 5006;
+    private static final int FEEDBACK_RUNSKIPPED_WRONGDATE = 5027;
+    private static final int FEEDBACK_RUNSKIPPED_TOOCLOSE = 5023;
+    private static final int FEEDBACK_RUNSKIPPED_TOOFAR = 5024;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -59,11 +88,47 @@ public class ScanActivity extends AppCompatActivity {
 
                 applyDefaultOrientation(configJSON);
                 setupChangeOrientationButton(configJSON);
+                setupCustomUIFeedback(configJSON);
 
                 scanView.init(configJSON);
 
                 ViewPluginBase viewPluginBase = scanView.getScanViewPlugin();
 
+                viewPluginBase.scanInfoReceived = jsonObject -> {
+                    if (jsonObject.optString("name", "").equals(FEEDBACK_SCANINFO_LIGHTINGCONDITION)) {
+                        String lightingConditionValue = jsonObject.optString("value", "");
+                        if (feedbackConfig != null) {
+                            if (lightingConditionValue.equalsIgnoreCase(FEEDBACK_SCANINFO_LIGHTINGCONDITION_TOODARK)) {
+                                if (feedbackConfig.brightnessTooLow != null) {
+                                    updateUIFeedback(feedbackConfig.brightnessTooLow);
+                                }
+                            }
+                            else if (lightingConditionValue.equalsIgnoreCase(FEEDBACK_SCANINFO_LIGHTINGCONDITION_TOOBRIGHT)) {
+                                if (feedbackConfig.brightnessTooHigh != null) {
+                                    updateUIFeedback(feedbackConfig.brightnessTooHigh);
+                                }
+                            }
+                        }
+                    }
+                };
+
+                viewPluginBase.runSkippedReceived = jsonObject -> {
+                    if (feedbackConfig != null) {
+                        if (jsonObject.optInt("code", 0) == FEEDBACK_RUNSKIPPED_WRONGFORMAT
+                                || jsonObject.optInt("code", 0) == FEEDBACK_RUNSKIPPED_WRONGDATE) {
+                            if (feedbackConfig.wrongFormat != null) {
+                                updateUIFeedback(feedbackConfig.wrongFormat);
+                            }
+                        }
+                        if (jsonObject.optInt("code", 0) == FEEDBACK_RUNSKIPPED_TOOCLOSE
+                                || jsonObject.optInt("code", 0) == FEEDBACK_RUNSKIPPED_TOOFAR) {
+                            if (feedbackConfig.distance != null) {
+                                updateUIFeedback(feedbackConfig.distance);
+                            }
+                        }
+                    }
+                };
+
                 viewPluginBase.resultReceived = scanResult -> {
                     setResult(AnylineSDKPlugin.RESULT_OK);
                     JSONObject resultObject = getResultWithImagePath(scanResult);
@@ -157,6 +222,120 @@ public class ScanActivity extends AppCompatActivity {
         }
     }
 
+    private void setupCustomUIFeedback(JSONObject configJSON) {
+        JSONObject optionsJsonObject = configJSON.optJSONObject("options");
+        if (optionsJsonObject != null) {
+            try {
+                if (optionsJsonObject.has("instruction")) {
+                    instructionConfig = new InstructionConfig(optionsJsonObject.getJSONObject("instruction"));
+                }
+                if (optionsJsonObject.has("imageCutout")) {
+                    imageCutoutConfig = new ImageTextConfig(this, optionsJsonObject.getJSONObject("imageCutout"));
+                }
+                if (optionsJsonObject.has("feedback")) {
+                    feedbackConfig = new FeedbackConfig(this, optionsJsonObject.getJSONObject("feedback"));
+                }
+            }
+            catch (JSONException e) {
+                finishWithError("Error setting up UI Feedback: " + e.getMessage());
+                return;
+            }
+
+            if (instructionConfig != null) {
+                if (instructionConfig.text != null) {
+                    binding.textviewInstruction.setText(instructionConfig.text);
+                }
+                if (instructionConfig.textColor != null) {
+                    binding.textviewInstruction.setTextColor(Color.parseColor("#" + instructionConfig.textColor));
+                }
+                if (instructionConfig.backgroundColor != null) {
+                    binding.textviewInstruction.setBackgroundColor(Color.parseColor("#" + instructionConfig.backgroundColor));
+                }
+            }
+
+            if (imageCutoutConfig != null) {
+                if (imageCutoutConfig.hasImage) {
+                    binding.imageviewCutoutOverlay.setImageResource(imageCutoutConfig.imageResId);
+                }
+            }
+
+        }
+
+        scanView.onCutoutChanged = cutouts -> {
+            Pair<ScanViewPlugin, android.graphics.Rect> firstCutout = cutouts.get(0);
+
+            ScanViewPlugin scanViewPlugin = firstCutout.first;
+            if (scanViewPlugin != null) {
+                Rect rect = firstCutout.second;
+                if (rect != null) {
+                    if (instructionConfig != null) {
+                        CoordinatorLayout.LayoutParams instructionLayoutParams =
+                                new CoordinatorLayout.LayoutParams(rect.width(), rect.top);
+                        instructionLayoutParams.setMargins(rect.left, 0, rect.right, rect.top);
+                        binding.layoutInstruction.setVisibility(View.VISIBLE);
+                        binding.layoutInstruction.setLayoutParams(instructionLayoutParams);
+                        binding.layoutInstruction.requestLayout();
+                    }
+
+                    if (imageCutoutConfig != null) {
+                        CoordinatorLayout.LayoutParams imageCutoutLayoutParams =
+                                new CoordinatorLayout.LayoutParams(rect.width(), rect.height());
+                        imageCutoutLayoutParams.setMargins(rect.left, rect.top, rect.right, rect.bottom);
+                        binding.imageviewCutoutOverlay.setVisibility(View.VISIBLE);
+                        binding.imageviewCutoutOverlay.setLayoutParams(imageCutoutLayoutParams);
+                        binding.imageviewCutoutOverlay.requestLayout();
+                    }
+
+                    if (feedbackConfig != null) {
+                        CoordinatorLayout.LayoutParams feedbackLayoutParams =
+                                new CoordinatorLayout.LayoutParams(rect.width(), scanView.getHeight());
+                        feedbackLayoutParams.setMargins(rect.left, rect.bottom, rect.right, scanView.getBottom());
+                        binding.layoutBrightDistanceFeedback.setVisibility(View.VISIBLE);
+                        binding.layoutBrightDistanceFeedback.setLayoutParams(feedbackLayoutParams);
+                        binding.layoutBrightDistanceFeedback.requestLayout();
+                    }
+                }
+            }
+        };
+    }
+
+    private void updateUIFeedback(ImageTextConfig imageTextFeedback) {
+        if (imageTextFeedback.text != null) {
+            if (binding.textviewBrightDistanceFeedback.getText().equals(imageTextFeedback.text)) {
+                return;
+            }
+        }
+
+        handler.post(() -> {
+            if (imageTextFeedback.text != null) {
+                binding.textviewBrightDistanceFeedback.setText(imageTextFeedback.text);
+            }
+            if (imageTextFeedback.hasImage) {
+                binding.imageviewBrightDistanceFeedback.setImageResource(imageTextFeedback.imageResId);
+            }
+
+            if (feedbackConfig != null) {
+                if (feedbackConfig.sound != null) {
+                    feedbackConfig.playBeepSound();
+                }
+            }
+
+            if (cleanUIFeedbackTimer != null) {
+                cleanUIFeedbackTimer.cancel();
+            }
+            cleanUIFeedbackTimer = new Timer();
+            cleanUIFeedbackTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    handler.post(() -> {
+                        binding.textviewBrightDistanceFeedback.setText("");
+                        binding.imageviewBrightDistanceFeedback.setImageBitmap(null);
+                    });
+                }
+            }, cleanUIFeedbackIntervalMills);
+        });
+    }
+
     @NonNull
     private JSONObject getResultWithImagePath(ScanResult scanResult) {
         JSONObject resultObject = scanResult.getResult();