Merge pull request #221 from Dynamsoft/_dev

Shen-wb · web-flow · commit 48a5fa5af890 · 2024-10-25T14:00:29.000+08:00
UPDATE
diff --git a/hello-world/angular/angular.json b/hello-world/angular/angular.json
@@ -91,5 +91,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }
diff --git a/hello-world/angular/src/app/video-capture/video-capture.component.ts b/hello-world/angular/src/app/video-capture/video-capture.component.ts
@@ -73,6 +73,7 @@ export class VideoCaptureComponent {
 
       // Open camera and start scanning single barcode.
       await this.cameraEnhancer.open();
+      cameraView.setScanLaserVisible(true);
       if (this.isDestroyed) {
         throw Error(componentDestroyedErrorMsg);
       }
diff --git a/hello-world/blazor/hello-world-blazor/BlazorApp/wwwroot/decodeVideo.js b/hello-world/blazor/hello-world-blazor/BlazorApp/wwwroot/decodeVideo.js
@@ -37,6 +37,7 @@ window.startVideoDecode = async () => {
 
         // Open camera and start scanning single barcode.
         await cameraEnhancer.open();
+        cameraView.setScanLaserVisible(true);
         await cvRouter.startCapturing("ReadSingleBarcode");
     } catch (ex) {
         let errMsg = ex.message || ex;
diff --git a/hello-world/electron/action.js b/hello-world/electron/action.js
@@ -66,6 +66,7 @@ Dynamsoft.Core.CoreModule.loadWasm(["DBR"]);
 
     // Open camera and start scanning single barcode.
     await cameraEnhancer.open();
+    cameraView.setScanLaserVisible(true);
     await cvRouter.startCapturing("ReadSingleBarcode");
   } catch (ex) {
     let errMsg = ex.message || ex;
diff --git a/hello-world/es6.html b/hello-world/es6.html
@@ -77,6 +77,7 @@ <h1>Hello World for ES6 (Decode via Camera)</h1>
 
           // Open camera and start scanning single barcode.
           await cameraEnhancer.open();
+          cameraView.setScanLaserVisible(true);
           await cvRouter.startCapturing("ReadSingleBarcode");
         } catch (ex) {
           let errMsg = ex.message || ex;
diff --git a/hello-world/hello-world.html b/hello-world/hello-world.html
@@ -70,6 +70,7 @@ <h1>Hello World (Decode via Camera)</h1>
 
           // Open camera and start scanning single barcode.
           await cameraEnhancer.open();
+          cameraView.setScanLaserVisible(true);
           await cvRouter.startCapturing("ReadSingleBarcode");
         } catch (ex) {
           let errMsg = ex.message || ex;
diff --git a/hello-world/native-ts/index.ts b/hello-world/native-ts/index.ts
@@ -64,6 +64,7 @@ let cvRouter: CaptureVisionRouter;
 
     // Open camera and start scanning single barcode.
     await cameraEnhancer.open();
+    cameraView.setScanLaserVisible(true);
     await cvRouter.startCapturing("ReadSingleBarcode");
   } catch (ex: any) {
     let errMsg = ex.message || ex;
diff --git a/hello-world/next/components/VideoCapture/VideoCapture.tsx b/hello-world/next/components/VideoCapture/VideoCapture.tsx
@@ -69,6 +69,7 @@ function VideoCapture() {
 
         // Open camera and start scanning single barcode.
         await cameraEnhancer.open();
+        cameraView.setScanLaserVisible(true);
         if (isDestroyed) {
           throw Error(componentDestroyedErrorMsg);
         }
diff --git a/hello-world/nuxt/components/VideoCapture.client.vue b/hello-world/nuxt/components/VideoCapture.client.vue
@@ -59,6 +59,7 @@ onMounted(async () => {
 
     // Open camera and start scanning single barcode.
     await cameraEnhancer.open();
+    cameraView.setScanLaserVisible(true);
     if (isDestroyed) { throw Error(componentDestroyedErrorMsg); }
     await cvRouter.startCapturing("ReadSingleBarcode");
     if (isDestroyed) { throw Error(componentDestroyedErrorMsg); }
diff --git a/hello-world/pwa/helloworld-pwa.html b/hello-world/pwa/helloworld-pwa.html
@@ -82,6 +82,7 @@ <h1>Hello World for PWA</h1>
 
           // Open camera and start scanning single barcode.
           await cameraEnhancer.open();
+          cameraView.setScanLaserVisible(true);
           await cvRouter.startCapturing("ReadSingleBarcode");
         } catch (ex) {
           let errMsg = ex.message || ex;
diff --git a/hello-world/pwa/service-worker.js b/hello-world/pwa/service-worker.js
@@ -1,12 +1,12 @@
 const engineResourcePaths = {
   std: "https://cdn.jsdelivr.net/npm/dynamsoft-capture-vision-std@1.4.10/dist/",
   dip: "https://cdn.jsdelivr.net/npm/dynamsoft-image-processing@2.4.20/dist/",
-  core: "https://cdn.jsdelivr.net/npm/dynamsoft-core@3.4.20/dist/",
-  license: "https://cdn.jsdelivr.net/npm/dynamsoft-license@3.4.20/dist/",
-  cvr: "https://cdn.jsdelivr.net/npm/dynamsoft-capture-vision-router@2.4.21/dist/",
+  core: "https://cdn.jsdelivr.net/npm/dynamsoft-core@3.4.21/dist/",
+  license: "https://cdn.jsdelivr.net/npm/dynamsoft-license@3.4.21/dist/",
+  cvr: "https://cdn.jsdelivr.net/npm/dynamsoft-capture-vision-router@2.4.22/dist/",
   dbr: "https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader@10.4.20/dist/",
   dce: "https://cdn.jsdelivr.net/npm/dynamsoft-camera-enhancer@4.1.0/dist/",
-  utility: "https://cdn.jsdelivr.net/npm/dynamsoft-utility@1.4.20/dist/",
+  utility: "https://cdn.jsdelivr.net/npm/dynamsoft-utility@1.4.21/dist/",
 };
 
 // Files to cache
diff --git a/hello-world/react-hooks/src/components/VideoCapture/VideoCapture.tsx b/hello-world/react-hooks/src/components/VideoCapture/VideoCapture.tsx
@@ -69,6 +69,7 @@ function VideoCapture() {
 
         // Open camera and start scanning single barcode.
         await cameraEnhancer.open();
+        cameraView.setScanLaserVisible(true);
         if (isDestroyed) {
           throw Error(componentDestroyedErrorMsg);
         }
diff --git a/hello-world/react/src/components/VideoCapture/VideoCapture.tsx b/hello-world/react/src/components/VideoCapture/VideoCapture.tsx
@@ -67,6 +67,7 @@ class VideoCapture extends React.Component {
 
       // Open camera and start scanning single barcode.
       await this.cameraEnhancer.open();
+      cameraView.setScanLaserVisible(true);
       if (this.isDestroyed) {
         throw Error(componentDestroyedErrorMsg);
       }
diff --git a/hello-world/requirejs.html b/hello-world/requirejs.html
@@ -80,6 +80,7 @@ <h1>Hello World for RequireJS (Decode via Camera)</h1>
 
               // Open camera and start scanning single barcode.
               await cameraEnhancer.open();
+              cameraView.setScanLaserVisible(true);
               await cvRouter.startCapturing("ReadSingleBarcode");
             } catch (ex) {
               let errMsg = ex.message || ex;
diff --git a/hello-world/svelte/src/components/VideoCapture.svelte b/hello-world/svelte/src/components/VideoCapture.svelte
@@ -68,6 +68,7 @@
 
         //  Open camera and start scanning single barcode.
         await cameraEnhancer.open();
+        cameraView.setScanLaserVisible(true);
         if (isDestroyed) {
           throw Error(componentDestroyedErrorMsg);
         }
diff --git a/hello-world/vue/src/components/VideoCapture.vue b/hello-world/vue/src/components/VideoCapture.vue
@@ -59,6 +59,7 @@ onMounted(async () => {
 
     // Open camera and start scanning single barcode.
     await cameraEnhancer.open();
+    cameraView.setScanLaserVisible(true);
     if (isDestroyed) { throw Error(componentDestroyedErrorMsg); }
     await cvRouter.startCapturing("ReadSingleBarcode");
     if (isDestroyed) { throw Error(componentDestroyedErrorMsg); }
diff --git a/others/debug/public/index.html b/others/debug/public/index.html
@@ -141,18 +141,20 @@ <h1 style="font-size: 1.5em">Read Barcodes from Camera - Debug</h1>
       let pInit = init();
 
       document.getElementById("btn-start-capturing").addEventListener("click", async () => {
-        const { cameraEnhancer, cvRouter } = await pInit;
+        const { cameraEnhancer, cvRouter, cameraView } = await pInit;
 
         // Open camera and start scanning single barcode.
         await cameraEnhancer.open();
+        cameraView.setScanLaserVisible(true);
         await cvRouter.startCapturing("ReadSingleBarcode");
       });
 
       document.getElementById("btn-stop-capturing").addEventListener("click", async () => {
-        const { cameraEnhancer, cvRouter } = await pInit;
+        const { cameraEnhancer, cvRouter, cameraView } = await pInit;
 
         cvRouter.stopCapturing();
         cameraEnhancer.close();
+        cameraView.setScanLaserVisible(false);
       });
 
       let switchVideoSettings = async () => {
diff --git a/use-case/fill-a-form-with-barcode-reading.html b/use-case/fill-a-form-with-barcode-reading.html
@@ -119,7 +119,7 @@ <h3>Click each input box to fill in!</h3>
         inputsContainer.style.display = "";
         loadingIndicator.style.display = "none";
 
-        return { cameraEnhancer, cvRouter };
+        return { cameraEnhancer, cvRouter, cameraView };
       };
 
       let pInit; // promise of init
@@ -128,7 +128,7 @@ <h3>Click each input box to fill in!</h3>
       for (let input of allInputs) {
         input.addEventListener("click", async function () {
           try {
-            const { cameraEnhancer, cvRouter } = await (pInit = pInit || init());
+            const { cameraEnhancer, cvRouter, cameraView } = await (pInit = pInit || init());
 
             // Define a callback for results.
             const resultReceiver = {
@@ -150,6 +150,7 @@ <h3>Click each input box to fill in!</h3>
 
             // Open camera and start scanning single barcode.
             await cameraEnhancer.open();
+            cameraView.setScanLaserVisible(true);
             await cvRouter.startCapturing("ReadSingleBarcode");
           } catch (ex) {
             let errMsg = ex.message || ex;
diff --git a/use-case/locate-an-item-with-barcode/index.html b/use-case/locate-an-item-with-barcode/index.html
@@ -375,7 +375,6 @@ <h6 id="camera-switch-notification"></h6>
         // [Optional] - Custom UI to select camera and resolution
         try {
           await cameraEnhancer.open();
-
           // Populate a list of cameras and the resolution
           const cameraList = await cameraEnhancer.getAllCameras();
           // Get current camera and current resolution to set as selected
@@ -410,6 +409,7 @@ <h6 id="camera-switch-notification"></h6>
         return {
           cameraEnhancer,
           cvRouter,
+          cameraView
         };
       };
       let pInit; // promise of init
@@ -425,7 +425,7 @@ <h6 id="camera-switch-notification"></h6>
 
         const itemIdInput = document.getElementById("item-id");
         try {
-          const { cameraEnhancer, cvRouter } = await (pInit = pInit || init());
+          const { cameraEnhancer, cvRouter, cameraView } = await (pInit = pInit || init());
 
           // Define a callback for results.
           resultReceiver = {
@@ -520,7 +520,7 @@ <h6 id="camera-switch-notification"></h6>
         closeButton.innerText = "Locate another item";
 
         try {
-          const { cameraEnhancer, cvRouter } = await (pInit = pInit || init());
+          const { cameraEnhancer, cvRouter, cameraView } = await (pInit = pInit || init());
 
           // Prepare to show overlay of the item ID on the CameraView
           resultsContainer.innerHTML = "";
diff --git a/use-case/read-a-drivers-license/index.html b/use-case/read-a-drivers-license/index.html
@@ -194,11 +194,12 @@ <h1>Read a Driver's License</h1>
       }
 
       async function switchToSingleFrameMode() {
-        const { cameraEnhancer, cvRouter } = await pInit;
+        const { cameraEnhancer, cvRouter, cameraView } = await pInit;
         cvRouter.stopCapturing();
         cameraEnhancer.close();
         cameraEnhancer.singleFrameMode = "image";
         await cameraEnhancer.open();
+        cameraView.setScanLaserVisible(true);
         await cvRouter.startCapturing("ReadDenseBarcodes");
       }
 
@@ -208,11 +209,12 @@ <h1>Read a Driver's License</h1>
         document.querySelector("#span-tip").hidden = false;
         cameraViewContainer.style.display = "block";
 
-        const { cameraEnhancer, cvRouter } = await pInit;
+        const { cameraEnhancer, cvRouter, cameraView } = await pInit;
         cvRouter.stopCapturing();
         cameraEnhancer.close();
         cameraEnhancer.singleFrameMode = "disabled";
         await cameraEnhancer.open();
+        cameraView.setScanLaserVisible(true);
         await cvRouter.startCapturing("ReadDenseBarcodes");
 
         messageDisplayTimer = setTimeout(() => {
diff --git a/use-case/show-result-texts-on-the-video.html b/use-case/show-result-texts-on-the-video.html
@@ -164,6 +164,7 @@ <h3>Scan barcodes to display results as overlays on video</h3>
 
           // Open camera and start scanning single barcode.
           await cameraEnhancer.open();
+          cameraView.setScanLaserVisible(true);
           await cvRouter.startCapturing("ReadBarcodes_SpeedFirst");
         } catch (ex) {
           let errMsg = ex.message || ex;

Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,8 @@`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
	`94`	`+ },`
	`95`	`+ "cli": {`
	`96`	`+ "analytics": false`
`94`	`97`	`}`
`95`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ export class VideoCaptureComponent {`
`73`	`73`
`74`	`74`	`// Open camera and start scanning single barcode.`
`75`	`75`	`await this.cameraEnhancer.open();`
	`76`	`+ cameraView.setScanLaserVisible(true);`
`76`	`77`	`if (this.isDestroyed) {`
`77`	`78`	`throw Error(componentDestroyedErrorMsg);`
`78`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ function VideoCapture() {`
`69`	`69`
`70`	`70`	`// Open camera and start scanning single barcode.`
`71`	`71`	`await cameraEnhancer.open();`
	`72`	`+ cameraView.setScanLaserVisible(true);`
`72`	`73`	`if (isDestroyed) {`
`73`	`74`	`throw Error(componentDestroyedErrorMsg);`
`74`	`75`	`}`