rename 'destroy' to 'destroyContext'; remove 'bPlaySoundOnSuccessfulRead'

Cube-J · Cube-J · commit 8826a67df39d · 2022-03-22T10:21:52.000+08:00
diff --git a/1.hello-world/2.read-an-image.html b/1.hello-world/2.read-an-image.html
@@ -75,7 +75,7 @@ <h1 style="font-size: 1.5em;">Read Barcode from Images</h1>
 
                 // show image
                 divCvsContainer.innerHTML = '';
-                divCvsContainer.appendChild(reader.oriCanvas);
+                divCvsContainer.appendChild(reader.getOriginalImageInACanvas());
                 
                 // show results
                 divResults.appendChild(createEl('h3', file.name + ": "));
diff --git a/1.hello-world/3.read-video-angular/package.json b/1.hello-world/3.read-video-angular/package.json
@@ -20,7 +20,7 @@
         "@angular/platform-browser-dynamic": "~11.2.5",
         "@angular/router": "~11.2.5",
         "dynamsoft-javascript-barcode": "8.8.7",
-        "keillion-dynamsoft-javascript-barcode": "0.20220318155126.0",
+        "keillion-dynamsoft-javascript-barcode": "0.20220321180719.0",
         "rxjs": "~6.6.0",
         "tslib": "^2.0.0",
         "zone.js": "~0.11.3"
diff --git a/1.hello-world/3.read-video-angular/src/app/barcode-scanner/barcode-scanner.component.ts b/1.hello-world/3.read-video-angular/src/app/barcode-scanner/barcode-scanner.component.ts
@@ -27,7 +27,7 @@ export class VideoDecodeComponent implements OnInit {
   }
   async ngOnDestroy() {
     if (this.pScanner) {
-      (await this.pScanner).destroy();
+      (await this.pScanner).destroyContext();
       console.log('BarcodeScanner Component Unmount');
     }
   }
diff --git a/1.hello-world/3.read-video-angular/src/app/img-decode/img-decode.component.ts b/1.hello-world/3.read-video-angular/src/app/img-decode/img-decode.component.ts
@@ -25,7 +25,7 @@ export class ImgDecodeComponent implements OnInit {
 
   async ngOnDestroy() {
     if (this.pReader) {
-      (await this.pReader).destroy();
+      (await this.pReader).destroyContext();
       console.log('ImgDecode Component Unmount');
     }
   }
diff --git a/1.hello-world/4.read-video-react/src/components/ImgDecode/ImgDecode.js b/1.hello-world/4.read-video-react/src/components/ImgDecode/ImgDecode.js
@@ -22,7 +22,7 @@ export default class ImgDecode extends Component {
 
   async componentWillUnmount() {
     if (this.pReader) {
-      (await this.pReader).destroy();
+      (await this.pReader).destroyContext();
       console.log('ImgDecode Component Unmount');
     }
   }
diff --git a/1.hello-world/4.read-video-react/src/components/VideoDecode/VideoDecode.js b/1.hello-world/4.read-video-react/src/components/VideoDecode/VideoDecode.js
diff --git a/1.hello-world/5.read-video-vue/src/components/ImgDecode.vue b/1.hello-world/5.read-video-vue/src/components/ImgDecode.vue
@@ -26,7 +26,7 @@ export default {
   },
   async beforeDestroy() {
     if (this.pReader) {
-      (await this.pReader).destroy();
+      (await this.pReader).destroyContext();
       console.log('ImgDecode Component Unmount');
     }
   },
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
@@ -109,7 +109,7 @@ export default {
   },
   async beforeDestroy() {
     if (this.pScanner) {
-      (await this.pScanner).destroy();
+      (await this.pScanner).destroyContext();
       console.log("BarcodeScanner Component Unmount");
     }
   },
diff --git a/1.hello-world/6.read-video-vue3/src/components/ImgDecode.vue b/1.hello-world/6.read-video-vue3/src/components/ImgDecode.vue
@@ -23,7 +23,7 @@ export default {
     }
     onBeforeUnmount(async () => {
       if (pReader.value) {
-        (await pReader.value).destroy();
+        (await pReader.value).destroyContext();
         console.log('ImgDecode Component Unmount');
       }
     })
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
@@ -109,7 +109,7 @@ export default {
     });
     onBeforeUnmount(async () => {
       if (pScanner.value) {
-        (await pScanner.value).destroy();
+        (await pScanner.value).destroyContext();
         console.log('BarcodeScanner Component Unmount');
       }
     });
diff --git a/1.hello-world/7.read-video-nextjs/components/ImgDecode.js b/1.hello-world/7.read-video-nextjs/components/ImgDecode.js
@@ -21,7 +21,7 @@ export default class ImgDecode extends Component {
 
   async componentWillUnmount() {
     if (this.pReader) {
-      (await this.pReader).destroy();
+      (await this.pReader).destroyContext();
       console.log('ImgDecode Component Unmount');
     }
   }
diff --git a/1.hello-world/7.read-video-nextjs/components/VideoDecode.js b/1.hello-world/7.read-video-nextjs/components/VideoDecode.js
diff --git a/1.hello-world/8.read-video-nuxtjs/components/ImgDecode.vue b/1.hello-world/8.read-video-nuxtjs/components/ImgDecode.vue
@@ -27,7 +27,7 @@ export default {
   },
   async beforeDestroy() {
     if (this.pReader) {
-      (await this.pReader).destroy();
+      (await this.pReader).destroyContext();
       console.log('ImgDecode Component Unmount');
     }
   },
diff --git a/1.hello-world/8.read-video-nuxtjs/components/VideoDecode.vue b/1.hello-world/8.read-video-nuxtjs/components/VideoDecode.vue
@@ -109,7 +109,7 @@ export default {
   },
   async beforeDestroy() {
     if (this.pScanner) {
-      (await this.pScanner).destroy();
+      (await this.pScanner).destroyContext();
       console.log('BarcodeSanner Component Unmount');
     }
   },
diff --git a/2.ui-tweaking/3.read-video-with-external-control.html b/2.ui-tweaking/3.read-video-with-external-control.html
@@ -60,7 +60,7 @@ <h1>Customized UI</h1>
             <span class="slider round"></span>
         </label> Toggle Sound
     </div>
-    </div>
+    
     <div id="UIElement" class="UIElement">
         <div id="div-ui-container" class="div-ui-container">
             <div class="dce-video-container"></div>
@@ -277,7 +277,7 @@ <h1>Customized UI</h1>
             try {
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 await scanner.setUIElement(document.getElementById('div-ui-container'));
-                scanner.onUnduplicatedRead = (txt, result) => { alert(txt); };
+                scanner.onUniqueRead = (txt, result) => { alert(txt); };
                 await scanner.show();
                 updateOptions();
             } catch (ex) {
diff --git a/4.use-case/1.fill-a-form-with-barcode-reading.html b/4.use-case/1.fill-a-form-with-barcode-reading.html
@@ -47,7 +47,9 @@ <h3>Click each input box to fill in!</h3>
                 input.addEventListener('click', async function() {
                     try {
                         let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
-                        scanner.bPlaySoundOnSuccessfulRead = true;
+                        let scanSettings = await scanner.getScanSettings();
+                        scanSettings.whenToPlaySoundforSuccessfulRead = "frame";
+                        await scanner.updateScanSettings(scanSettings);
                         scanner.onUniqueRead = (txt, result) => {
                             this.value = result.barcodeText;
                             scanner.hide();
diff --git a/5.others/debug/public/index.html b/5.others/debug/public/index.html
@@ -20,7 +20,7 @@ <h1 style="font-size: 1.5em;">Read Barcodes from Camera - Debug</h1>
     <br>
     <div id="div-video-container" style="width:100%;height:calc(100vh - 150px);"></div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/eruda/2.4.1/eruda.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/dbr.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/keillion-dynamsoft-javascript-barcode@0.20220318174621.0/dist/dbr.js"></script>
     <script>
         eruda.init();
         Dynamsoft.DBR.BarcodeReader._onLog = console.log;
@@ -43,12 +43,12 @@ <h1 style="font-size: 1.5em;">Read Barcodes from Camera - Debug</h1>
         document.getElementById('btn-show-scanner').addEventListener('click', async() => {
             try {
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
-                scanner.bPlaySoundOnSuccessfulRead = true;
                 let rs = await scanner.getRuntimeSettings();
                 rs.timeout = 100000;
                 await scanner.updateRuntimeSettings(rs);
                 let ss = await scanner.getScanSettings();
                 ss.intervalTime = 100;
+                scanSettings.whenToPlaySoundforSuccessfulRead = "frame";
                 await scanner.updateScanSettings(ss);
                 scanner.ifSaveOriginalImageInACanvas = true;
                 let processingCount = 0;
@@ -65,7 +65,7 @@ <h1 style="font-size: 1.5em;">Read Barcodes from Camera - Debug</h1>
                              * The original image is the one the reader worked on,
                              * we can collect it for futher testing and debugging.
                              */
-                            let cvs = await scanner.getOriginalImageInACanvas();
+                            let cvs = scanner.getOriginalImageInACanvas();
                             let fd = new FormData();
                             if (cvs != null) {
                                 let blob = cvs.convertToBlob ?

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export class VideoDecodeComponent implements OnInit {`
`27`	`27`	`}`
`28`	`28`	`async ngOnDestroy() {`
`29`	`29`	`if (this.pScanner) {`
`30`		`- (await this.pScanner).destroy();`
	`30`	`+ (await this.pScanner).destroyContext();`
`31`	`31`	`console.log('BarcodeScanner Component Unmount');`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class ImgDecodeComponent implements OnInit {`
`25`	`25`
`26`	`26`	`async ngOnDestroy() {`
`27`	`27`	`if (this.pReader) {`
`28`		`- (await this.pReader).destroy();`
	`28`	`+ (await this.pReader).destroyContext();`
`29`	`29`	`console.log('ImgDecode Component Unmount');`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export default class ImgDecode extends Component {`
`22`	`22`
`23`	`23`	`async componentWillUnmount() {`
`24`	`24`	`if (this.pReader) {`
`25`		`- (await this.pReader).destroy();`
	`25`	`+ (await this.pReader).destroyContext();`
`26`	`26`	`console.log('ImgDecode Component Unmount');`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export default {`
`26`	`26`	`},`
`27`	`27`	`async beforeDestroy() {`
`28`	`28`	`if (this.pReader) {`
`29`		`- (await this.pReader).destroy();`
	`29`	`+ (await this.pReader).destroyContext();`
`30`	`30`	`console.log('ImgDecode Component Unmount');`
`31`	`31`	`}`
`32`	`32`	`},`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ export default {`
`109`	`109`	`},`
`110`	`110`	`async beforeDestroy() {`
`111`	`111`	`if (this.pScanner) {`
`112`		`- (await this.pScanner).destroy();`
	`112`	`+ (await this.pScanner).destroyContext();`
`113`	`113`	`console.log("BarcodeScanner Component Unmount");`
`114`	`114`	`}`
`115`	`115`	`},`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export default {`
`23`	`23`	`}`
`24`	`24`	`onBeforeUnmount(async () => {`
`25`	`25`	`if (pReader.value) {`
`26`		`- (await pReader.value).destroy();`
	`26`	`+ (await pReader.value).destroyContext();`
`27`	`27`	`console.log('ImgDecode Component Unmount');`
`28`	`28`	`}`
`29`	`29`	`})`