update to v2.4.2000

Author: JaneYe-Dynamsoft

Diff for: .gitignore

@@ -1,3 +1,32 @@
 Android/MRZScanner/.gradle
 Android/MRZScanner/.idea
 Android/MRZScanner/local.properties
+.DS_Store
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+iOSInjectionProject/
+project.xcworkspace
+.idea/
+xcshareddata/

Diff for: Android/MRZScanner/.gitignore renamed to Android/DocumentScanner/.gitignore

@@ -0,0 +1,50 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    namespace 'com.dynamsoft.ddn.autonormalize'
+    compileSdk 33
+
+    defaultConfig {
+        applicationId "com.dynamsoft.ddn.autonormalize"
+        minSdk 21
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+    implementation("com.dynamsoft:dynamsoftcapturevisionbundle:2.4.2000") {
+        exclude group: "com.dynamsoft", module: "dynamsoftbarcodereader"
+        exclude group: "com.dynamsoft", module: "dynamsoftlabelrecognizer"
+        exclude group: "com.dynamsoft", module: "dynamsoftcodeparser"
+        exclude group: "com.dynamsoft", module: "dynamsoftcodeparserdedicator"
+    }
+
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment:2.5.1'
+    implementation 'androidx.navigation:navigation-ui:2.5.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}

Diff for: Android/MRZScanner/app/.gitignore renamed to Android/DocumentScanner/AutoNormalize/.gitignore

@@ -0,0 +1,26 @@
+package com.dynamsoft.ddn.myapplication;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.dynamsoft.ddn.myapplication", appContext.getPackageName());
+    }
+}

Diff for: Android/DocumentScanner/AutoNormalize/build.gradle

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ddn_icon"
+        android:label="@string/app_name"
+        android:roundIcon="@drawable/ddn_icon"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.HelloWord_DDN">
+        <activity
+            android:name="com.dynamsoft.ddn.autonormalize.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.HelloWord_DDN">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

Diff for: Android/MRZScanner/app/proguard-rules.pro renamed to Android/DocumentScanner/AutoNormalize/proguard-rules.pro

@@ -0,0 +1,51 @@
+package com.dynamsoft.ddn.autonormalize;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.navigation.NavController;
+import androidx.navigation.Navigation;
+import androidx.navigation.ui.AppBarConfiguration;
+import androidx.navigation.ui.NavigationUI;
+
+import com.dynamsoft.dce.utils.PermissionUtil;
+import com.dynamsoft.ddn.autonormalize.databinding.ActivityMainBinding;
+import com.dynamsoft.license.LicenseManager;
+
+public class MainActivity extends AppCompatActivity {
+    private AppBarConfiguration appBarConfiguration;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if(savedInstanceState == null) {
+            // Initialize the license.
+            // The license string here is a trial license. Note that network connection is required for this license to work.
+            // You can request an extension via the following link: https://www.dynamsoft.com/customer/license/trialLicense?product=ddn&utm_source=samples&package=android
+            LicenseManager.initLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", this, (isSuccess, error) -> {
+                if (!isSuccess) {
+                    error.printStackTrace();
+                    runOnUiThread(()-> ((TextView) findViewById(R.id.tv_license_error)).setText("License initialization failed: "+error.getMessage()));
+                }
+            });
+        }
+        PermissionUtil.requestCameraPermission(this);
+
+        ActivityMainBinding binding = ActivityMainBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        setSupportActionBar(binding.toolbar);
+        NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
+        appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build();
+        NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
+        return NavigationUI.navigateUp(navController, appBarConfiguration)
+                || super.onSupportNavigateUp();
+    }
+}

Diff for: Android/DocumentScanner/AutoNormalize/src/androidTest/java/com/dynamsoft/ddn/myapplication/ExampleInstrumentedTest.java

@@ -0,0 +1,9 @@
+package com.dynamsoft.ddn.autonormalize;
+
+import androidx.lifecycle.ViewModel;
+
+import com.dynamsoft.core.basic_structures.ImageData;
+
+public class MainViewModel extends ViewModel {
+    public ImageData normalizedImage;
+}

Diff for: Android/DocumentScanner/AutoNormalize/src/main/AndroidManifest.xml

@@ -0,0 +1,85 @@
+package com.dynamsoft.ddn.autonormalize.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.dynamsoft.cvr.CapturedResult;
+import com.dynamsoft.core.basic_structures.CoreException;
+import com.dynamsoft.core.basic_structures.ImageData;
+import com.dynamsoft.cvr.CaptureVisionRouter;
+import com.dynamsoft.cvr.CaptureVisionRouterException;
+import com.dynamsoft.cvr.EnumPresetTemplate;
+import com.dynamsoft.cvr.SimplifiedCaptureVisionSettings;
+import com.dynamsoft.ddn.EnumImageColourMode;
+import com.dynamsoft.ddn.NormalizedImageResultItem;
+import com.dynamsoft.ddn.autonormalize.MainViewModel;
+import com.dynamsoft.ddn.autonormalize.databinding.FragmentNormalizeBinding;
+
+public class NormalizeFragment extends Fragment {
+
+    private FragmentNormalizeBinding binding;
+    private CaptureVisionRouter router;
+    private MainViewModel viewModel;
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentNormalizeBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
+        try {
+            assert viewModel.normalizedImage != null;
+            binding.ivNormalize.setImageBitmap(viewModel.normalizedImage.toBitmap());
+        } catch (CoreException e) {
+            e.printStackTrace();
+        }
+        binding.btnBinary.setOnClickListener(v->showNormalizeInDifferentColorMode(EnumImageColourMode.ICM_BINARY));
+        binding.btnGrayscale.setOnClickListener(v->showNormalizeInDifferentColorMode(EnumImageColourMode.ICM_GRAYSCALE));
+        binding.btnColour.setOnClickListener(v->showNormalizeInDifferentColorMode(EnumImageColourMode.ICM_COLOUR));
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    private void showNormalizeInDifferentColorMode(@EnumImageColourMode int colorMode) {
+        ImageData normalize = getNormalizeInDifferentColorMode(colorMode);
+        if(normalize != null) {
+            try {
+                binding.ivNormalize.setImageBitmap(normalize.toBitmap());
+            } catch (CoreException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private ImageData getNormalizeInDifferentColorMode(@EnumImageColourMode int colorMode) {
+        if(router == null) {
+            router = new CaptureVisionRouter(requireContext());
+        }
+        try {
+            SimplifiedCaptureVisionSettings simplifiedSettings = router.getSimplifiedSettings(EnumPresetTemplate.PT_NORMALIZE_DOCUMENT);
+            simplifiedSettings.documentSettings.colourMode = colorMode;
+            router.updateSettings(EnumPresetTemplate.PT_NORMALIZE_DOCUMENT, simplifiedSettings);
+        } catch (CaptureVisionRouterException e) {
+            e.printStackTrace();
+        }
+        CapturedResult result = router.capture(viewModel.normalizedImage, EnumPresetTemplate.PT_NORMALIZE_DOCUMENT);
+        if (result != null && result.getItems() != null && result.getItems().length > 0) {
+            return ((NormalizedImageResultItem) result.getItems()[0]).getImageData();
+        }
+        return null;
+    }
+
+}