Merge pull request #75 from Dynamsoft/_dev

Cube · web-flow · commit 7d8646a55c73 · 2022-09-20T17:12:13.000+08:00
Dev
diff --git a/1.hello-world/1.hello-world.html b/1.hello-world/1.hello-world.html
@@ -37,7 +37,8 @@
                 scanner.onFrameRead = results => {
                     console.log("Barcodes on one frame:");
                     for (let result of results) {
-                        console.log(result.barcodeFormatString + ": " + result.barcodeText);
+                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        console.log(format + ": " + result.barcodeText);
                     }
                 };
                 /**
diff --git a/1.hello-world/10.read-video-pwa/helloworld-pwa.html b/1.hello-world/10.read-video-pwa/helloworld-pwa.html
@@ -56,7 +56,8 @@ <h1 style="font-size: 1.5em;">Hello World for PWA</h1>
                 scanner.onFrameRead = results => {
                     console.log("Barcodes on one frame:");
                     for (let result of results) {
-                        console.log(result.barcodeFormatString + ": " + result.barcodeText);
+                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        console.log(format + ": " + result.barcodeText);
                     }
                 };
                 scanner.onUniqueRead = (txt, result) => {
diff --git a/1.hello-world/11.read-video-requirejs.html b/1.hello-world/11.read-video-requirejs.html
@@ -38,7 +38,8 @@ <h1 style="font-size: 1.5em;">Hello World for RequireJS</h1>
                     scanner.onFrameRead = results => {
                         console.log("Barcodes on one frame:");
                         for (let result of results) {
-                            console.log(result.barcodeFormatString + ": " + result.barcodeText);
+                            const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                            console.log(format + ": " + result.barcodeText);
                         }
                     };
                     scanner.onUniqueRead = (txt, result) => {
diff --git a/1.hello-world/12.read-video-es6.html b/1.hello-world/12.read-video-es6.html
@@ -40,7 +40,8 @@ <h1 style="font-size: 1.5em;">Hello World for ES6</h1>
                  scanner.onFrameRead = results => {
                     console.log("Barcodes on one frame:");
                     for (let result of results) {
-                        console.log(result.barcodeFormatString + ": " + result.barcodeText);
+                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        console.log(format + ": " + result.barcodeText);
                     }
                 };
                 /*
diff --git a/1.hello-world/13.read-video-react-ts/src/components/VideoDecode/VideoDecode.css b/1.hello-world/13.read-video-react-ts/src/components/VideoDecode/VideoDecode.css
@@ -1,5 +1,5 @@
 .component-barcode-scanner{width:100%;height:100%;/* min-width:640px; */min-height:480px;background:#eee;position:relative;resize:both;}
-.dce-bg-loading{animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
+.dce-bg-loading{display:none;animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-bg-camera{display:none;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-video-container{position:absolute;left:0;top:0;width:100%;height:100%;}
 .dce-scanarea{width:100%;height:100%;position:absolute;left:0;top:0;}
diff --git a/1.hello-world/2.read-an-image.html b/1.hello-world/2.read-an-image.html
@@ -95,9 +95,10 @@ <h1 style="font-size: 1.5em;">Read Barcode from Images</h1>
                     divResults.appendChild(createEl('p', "No Barcode Found!"));
                 }
                 for (let result of results) {
-                    iptReadonlyLastResult.value = result.barcodeFormatString + ": " + result.barcodeText; // show last txt result
+                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    iptReadonlyLastResult.value = format + ": " + result.barcodeText; // show last txt result
                     const p = document.createElement('p');
-                    p.appendChild(createEl('span', result.barcodeFormatString + ": "));
+                    p.appendChild(createEl('span', format + ": "));
                     p.appendChild(createEl('span', result.barcodeText, "sp-resultText"));
                     divResults.appendChild(p);
                     if (result.barcodeText.indexOf("Attention(exceptionCode") != -1) {
diff --git a/1.hello-world/3.read-video-angular/src/app/barcode-scanner/barcode-scanner.component.css b/1.hello-world/3.read-video-angular/src/app/barcode-scanner/barcode-scanner.component.css
@@ -1,5 +1,5 @@
 .component-barcode-scanner{width:100%;height:100%;/* min-width:640px; */min-height:480px;background:#eee;position:relative;resize:both;}
-.dce-bg-loading{animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
+.dce-bg-loading{display:none;animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-bg-camera{display:none;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-video-container{position:absolute;left:0;top:0;width:100%;height:100%;}
 .dce-scanarea{width:100%;height:100%;position:absolute;left:0;top:0;}
diff --git a/1.hello-world/4.read-video-react/src/components/VideoDecode/VideoDecode.css b/1.hello-world/4.read-video-react/src/components/VideoDecode/VideoDecode.css
@@ -1,5 +1,5 @@
 .component-barcode-scanner{width:100%;height:100%;/* min-width:640px; */min-height:480px;background:#eee;position:relative;resize:both;}
-.dce-bg-loading{animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
+.dce-bg-loading{display:none;animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-bg-camera{display:none;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-video-container{position:absolute;left:0;top:0;width:100%;height:100%;}
 .dce-scanarea{width:100%;height:100%;position:absolute;left:0;top:0;}
diff --git a/1.hello-world/5.read-video-vue/src/components/VideoDecode.vue b/1.hello-world/5.read-video-vue/src/components/VideoDecode.vue
@@ -117,6 +117,7 @@ export default {
 }
 
 .dce-bg-loading {
+  display: none;
   animation: 1s linear infinite dce-rotate;
   width: 40%;
   height: 40%;
diff --git a/1.hello-world/6.read-video-vue3/src/components/VideoDecode.vue b/1.hello-world/6.read-video-vue3/src/components/VideoDecode.vue
@@ -121,6 +121,7 @@ export default {
 }
 
 .dce-bg-loading {
+  display: none;
   animation: 1s linear infinite dce-rotate;
   width: 40%;
   height: 40%;
diff --git a/1.hello-world/7.read-video-nextjs/styles/BarcodeScanner.css b/1.hello-world/7.read-video-nextjs/styles/BarcodeScanner.css
@@ -1,5 +1,5 @@
 .component-barcode-scanner{width:100%;height:100%;/* min-width:640px; */min-height:480px;background:#eee;position:relative;resize:both;}
-.dce-bg-loading{animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
+.dce-bg-loading{display:none;animation:1s linear infinite dce-rotate;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-bg-camera{display:none;width:40%;height:40%;position:absolute;margin:auto;left:0;top:0;right:0;bottom:0;fill:#aaa;}
 .dce-video-container{position:absolute;left:0;top:0;width:100%;height:100%;}
 .dce-scanarea{width:100%;height:100%;position:absolute;left:0;top:0;}
diff --git a/1.hello-world/8.read-video-nuxtjs/components/VideoDecode.vue b/1.hello-world/8.read-video-nuxtjs/components/VideoDecode.vue
@@ -117,6 +117,7 @@ export default {
 }
 
 .dce-bg-loading {
+  display: none;
   animation: 1s linear infinite dce-rotate;
   width: 40%;
   height: 40%;
diff --git a/2.ui-tweaking/1.read-video-show-result.html b/2.ui-tweaking/1.read-video-show-result.html
@@ -69,7 +69,8 @@ <h1 style="font-size: 1.5em;">Use the Default Built-in UI</h1>
                 scanner.onFrameRead = (_results) => {
                     for (let result of _results) {
                         let newElements = [];
-                        newElements.push(createASpan(result.barcodeFormatString + ": "));
+                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        newElements.push(createASpan(format + ": "));
                         newElements.push(createASpan(result.barcodeText, "resultText"));
                         newElements.push(document.createElement('br'));
                         if (result.barcodeText.indexOf("Attention(exceptionCode") != -1) {
@@ -83,7 +84,8 @@ <h1 style="font-size: 1.5em;">Use the Default Built-in UI</h1>
                     }
                 };
                 scanner.onUniqueRead = (txt, result) => {
-                    document.getElementById('result').value = result.barcodeFormatString + ": " + txt;
+                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
                         document.getElementById('result').blur();
diff --git a/2.ui-tweaking/2.read-video-no-extra-control.html b/2.ui-tweaking/2.read-video-no-extra-control.html
@@ -61,7 +61,8 @@ <h1 style="font-size: 1.5em;">Hide UI Controls</h1>
             try {
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 scanner.onUniqueRead = (txt, result) => {
-                    document.getElementById('result').value = result.barcodeFormatString + ": " + txt;
+                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
                         document.getElementById('result').blur();
diff --git a/2.ui-tweaking/3.read-video-with-external-control.html b/2.ui-tweaking/3.read-video-with-external-control.html
@@ -123,7 +123,8 @@ <h1 style="font-size: 1.5em;">Customized UI</h1>
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 await scanner.setUIElement(document.getElementById('div-ui-container'));
                 scanner.onUniqueRead = (txt, result) => {
-                    document.getElementById('result').value = result.barcodeFormatString + ": " + txt;
+                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
                         document.getElementById('result').blur();
diff --git a/2.ui-tweaking/4.difference-video-size.html b/2.ui-tweaking/4.difference-video-size.html
@@ -86,7 +86,8 @@ <h1 style="font-size: 1.5em;">Enlarge the Video Stream</h1>
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 await scanner.setUIElement(document.getElementById('div-ui-container'));
                 scanner.onUniqueRead = (txt, result) => {
-                    document.getElementById('result').value = result.barcodeFormatString + ": " + txt;
+                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    document.getElementById('result').value = format + ": " + txt;
                     if (fitPage.hidden)
                         exitFullPage();
                     document.getElementById('result').focus();
diff --git a/2.ui-tweaking/5.read-video-with-custom-default-ui.html b/2.ui-tweaking/5.read-video-with-custom-default-ui.html
@@ -90,7 +90,8 @@ <h1>Customized Default UI</h1>
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 document.getElementById('UIElement').appendChild(scanner.getUIElement());
                 scanner.onUniqueRead = (txt, result) => {
-                    document.getElementById('result').value = result.barcodeFormatString + ": " + txt;
+                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
                         document.getElementById('result').blur();
diff --git a/3.settings/initScanner.js b/3.settings/initScanner.js
@@ -78,7 +78,8 @@ async function startReading() {
         let scanner = await pScanner;
         scanner.onFrameRead = (_results) => {
             for (let result of _results) {
-                resultBox.value = result.barcodeFormatString + ": " + result.barcodeText;
+                const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                resultBox.value = format + ": " + result.barcodeText;
             }
         };
         await scanner.show();

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ export default {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`.dce-bg-loading {`
	`120`	`+ display: none;`
`120`	`121`	`animation: 1s linear infinite dce-rotate;`
`121`	`122`	`width: 40%;`
`122`	`123`	`height: 40%;`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ export default {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`.dce-bg-loading {`
	`124`	`+ display: none;`
`124`	`125`	`animation: 1s linear infinite dce-rotate;`
`125`	`126`	`width: 40%;`
`126`	`127`	`height: 40%;`