update to v9.4.0

Author: Dynamsoft-Jerson

.gitignore

@@ -1,2 +1,27 @@
-
 .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

LICENSE.md

@@ -1,5 +1,5 @@
 License Notice  
 
-This folder contains code samples ("Sample Code") for use with Dynamsoft Barcode Reader, a commercial software development kit licensed by Dynamsoft. The Sample Code may be modified and included in your end user software under the terms of the Dynamsoft Software License Agreement   https://www.dynamsoft.com/barcode-reader/license-agreement/ (“Commercial License”). Except as expressly stated in the Commercial License, no other rights are granted in the Sample Code. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+This folder contains code samples ("Sample Code") for use with Dynamsoft Barcode Reader, a commercial software development kit licensed by Dynamsoft. The Sample Code may be modified and included in your end user software under the terms of the Dynamsoft Software License Agreement   https://www.dynamsoft.com/barcode-reader/license-agreement/ ("Commercial License"). Except as expressly stated in the Commercial License, no other rights are granted in the Sample Code. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 
-Copyright © 2003–2021 Dynamsoft. All rights reserved. 
+Copyright © 2003–2022 Dynamsoft. All rights reserved.

android/DecodeWithCameraX/app/build.gradle

@@ -26,14 +26,14 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     repositories {
-        maven {
-            url "https://download2.dynamsoft.com/maven/aar"
+        flatDir {
+            dirs '../../../Libs'
         }
     }
 }
 
 dependencies {
-    implementation 'com.dynamsoft:dynamsoftbarcodereader:9.2.10@aar'
+    implementation fileTree(include: ['*.aar'], dir: '../../../Libs')
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'

android/DecodeWithCameraX/app/src/main/java/com/dynamsoft/decodewithcamerax/CameraFragment.java

@@ -231,11 +231,7 @@ private void showResult(TextResult[] results) {
         StringBuilder strRes = new StringBuilder();
         if (results != null && results.length > 0) {
             for (TextResult result : results) {
-                if (result.barcodeFormat_2 != 0) {
-                    strRes.append("Format: ").append(result.barcodeFormatString_2).append("\n").append("Text: ").append(result.barcodeText).append("\n\n");
-                } else {
-                    strRes.append("Format: ").append(result.barcodeFormatString).append("\n").append("Text: ").append(result.barcodeText).append("\n\n");
-                }
+                strRes.append("Format: ").append(result.barcodeFormatString).append("\n").append("Text: ").append(result.barcodeText).append("\n\n");
             }
         } else {
             return;

android/DecodeWithCameraX/app/src/main/res/layout/activity_main.xml

@@ -25,17 +25,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    repositories {
-        maven {
-             url "https://download2.dynamsoft.com/maven/aar"
-        }
-    }
 
 }
 
 dependencies {
-    implementation 'com.dynamsoft:dynamsoftcameraenhancer:2.3.3@aar'
-    implementation 'com.dynamsoft:dynamsoftbarcodereader:9.2.10@aar'    
+    implementation fileTree(include: ['*.aar'], dir: '../../../Libs')
+    
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

android/GeneralSettings/app/build.gradle

@@ -258,13 +258,8 @@ private void showResults(TextResult[] results) {
         for (int i = 0; i < results.length; i++) {
             Map<String, String> temp = new HashMap<>();
             temp.put("Index", String.valueOf(i + 1));
-            if (results[i].barcodeFormat_2 != 0) {
-                temp.put("Format", results[i].barcodeFormatString_2);
-                continueRes.append("\n\n").append(getString(R.string.format)).append(results[i].barcodeFormatString_2).append("\n").append(getString(R.string.text)).append(results[i].barcodeText);
-            } else {
-                temp.put("Format", results[i].barcodeFormatString);
-                continueRes.append("\n\n").append(getString(R.string.format)).append(results[i].barcodeFormatString).append("\n").append(getString(R.string.text)).append(results[i].barcodeText);
-            }
+            temp.put("Format", results[i].barcodeFormatString);
+            continueRes.append("\n\n").append(getString(R.string.format)).append(results[i].barcodeFormatString).append("\n").append(getString(R.string.text)).append(results[i].barcodeText);
             temp.put("Text", results[i].barcodeText);
             resultMapList.add(temp);
         }

android/GeneralSettings/app/src/main/java/com/dynamsoft/generalsettings/scan/ScanFragment.java

@@ -25,15 +25,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }    
-    repositories {
-        maven {
-             url "https://download2.dynamsoft.com/maven/aar"
-        }
-    } }
+}
 
 dependencies {
-    implementation 'com.dynamsoft:dynamsoftcameraenhancer:2.3.3@aar'
-    implementation 'com.dynamsoft:dynamsoftbarcodereader:9.2.10@aar'    
+    implementation fileTree(include: ['*.aar'], dir: '../../../Libs')
+    
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'

android/HelloWorld/app/build.gradle

@@ -28,14 +28,11 @@ android {
     }
     repositories {
         maven { url "https://jitpack.io" }
-        maven {
-             url "https://download2.dynamsoft.com/maven/aar"
-        }    }
+    }
 }
 
 dependencies {
-    implementation 'com.dynamsoft:dynamsoftcameraenhancer:2.3.3@aar'
-    implementation 'com.dynamsoft:dynamsoftbarcodereader:9.2.10@aar'
+    implementation fileTree(include: ['*.aar'], dir: '../../../Libs')
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'

android/PerformanceSettings/app/build.gradle

@@ -166,11 +166,7 @@ private void showResults(TextResult[] results) {
             for (int i = 0; i < results.length; i++) {
                 Map<String, String> temp = new HashMap<>();
                 temp.put("Index", String.valueOf(i + 1));
-                if (results[i].barcodeFormat_2 != 0) {
-                    temp.put("Format", results[i].barcodeFormatString_2);
-                } else {
-                    temp.put("Format", results[i].barcodeFormatString);
-                }
+                temp.put("Format", results[i].barcodeFormatString);
                 temp.put("Text", results[i].barcodeText);
                 resultMapList.add(temp);
             }