algn with main branch

Tom-Dynamsoft · Tom-Dynamsoft · commit c633f912aad3 · 2021-11-02T10:31:59.000+08:00
diff --git a/1.hello-world/12.read-video-webpack/src/index.js b/1.hello-world/12.read-video-webpack/src/index.js
@@ -9,7 +9,7 @@ import DBR from "dynamsoft-javascript-barcode";
 /* When using your own license, uncomment the following line and specify your Organization ID. */
 
 Dynamsoft.DBR.organizationID = "200000";
-Dynamsoft.DBR.handshakeCode = "200000-dbr_js_samples";
+        Dynamsoft.DBR.handshakeCode = "200000-dbr_js_samples";
 
 /* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
 /* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
diff --git a/1.hello-world/3.read-video-angular/.gitignore b/1.hello-world/3.read-video-angular/.gitignore
@@ -44,3 +44,8 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+
+# others
+
+*-lock.json
+*.lock
diff --git a/1.hello-world/3.read-video-angular/package.json b/1.hello-world/3.read-video-angular/package.json
@@ -43,4 +43,4 @@
         "tslint": "~6.1.0",
         "typescript": "~4.1.5"
     }
-}
+}
diff --git a/1.hello-world/3.read-video-angular/src/app/dbr.ts b/1.hello-world/3.read-video-angular/src/app/dbr.ts
@@ -8,8 +8,8 @@ import DBR from "dynamsoft-javascript-barcode";
 
 /* When using your own license, uncomment the following line and specify your Organization ID. */
 
-        DBR.organizationID = "200000";
-        DBR.handshakeCode = "200000-dbr_js_samples";
+DBR.organizationID = "200000";
+DBR.handshakeCode = "200000-dbr_js_samples";
 
 /* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
 /* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
diff --git a/1.hello-world/3.read-video-angular/src/app/hello-world/hello-world.component.css b/1.hello-world/3.read-video-angular/src/app/hello-world/hello-world.component.css
@@ -72,3 +72,7 @@
       height: 40vh;
       width: 80vw;
     }
+
+    h1 {
+      font-size: 1.5em;
+    }
diff --git a/1.hello-world/3.read-video-angular/src/app/hello-world/hello-world.component.html b/1.hello-world/3.read-video-angular/src/app/hello-world/hello-world.component.html
@@ -1,5 +1,5 @@
 <div class="helloWorld">
-    <h1 style="font-size: 1.5em;">Hello World for Angular<img style="height: 25px;" alt="logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg=="
+    <h1>Hello World for Angular<img style="height: 25px;" alt="logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg=="
         />
     </h1>
     <input type="text" [value]="resultValue" readonly="true" class="latest-result" placeholder="The Last Read Barcode">
diff --git a/1.hello-world/4.read-video-react/.gitignore b/1.hello-world/4.read-video-react/.gitignore
@@ -21,3 +21,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# others
+
+*.lock
diff --git a/1.hello-world/4.read-video-react/src/components/HelloWorld.css b/1.hello-world/4.read-video-react/src/components/HelloWorld.css
@@ -9,6 +9,10 @@
     color: #455A64;
 }
 
+h1 {
+    font-size: 1.5em;
+}
+
 button {
     font-size: 1.5rem;
     margin-bottom: 2vh;
diff --git a/1.hello-world/4.read-video-react/src/components/HelloWorld.js b/1.hello-world/4.read-video-react/src/components/HelloWorld.js
@@ -5,102 +5,85 @@ import React from 'react';
 import BarcodeScanner from './BarcodeScanner';
 
 class HelloWorld extends React.Component {
-        constructor(props) {
-            super(props);
-            this.refDivMessage = React.createRef();
-            this.state = {
-                libLoaded: false,
-                resultValue: "",
-                resultItems: [],
-                bShowScanner: false
-            };
-        }
-        async componentDidMount() {
-            try {
-                await DBR.BarcodeScanner.loadWasm();
-                this.setState(state => {
-                    state.libLoaded = true;
-                    return state;
-                }, () => {
-                    this.showScanner();
-                });
-            } catch (ex) {
-                alert(ex.message);
-                throw ex;
-            }
+    constructor(props) {
+        super(props);
+        this.refDivMessage = React.createRef();
+        this.state = {
+            libLoaded: false,
+            resultValue: "",
+            resultItems: [],
+            bShowScanner: false
+        };
+    }
+    async componentDidMount() {
+        try {
+            await DBR.BarcodeScanner.loadWasm();
+            this.setState(state => {
+                state.libLoaded = true;
+                return state;
+            }, () => {
+                this.showScanner();
+            });
+        } catch (ex) {
+            alert(ex.message);
+            throw ex;
         }
+    }
 
-        scrollToBottom = () => {
-            this.refDivMessage.current.scrollTop = this.refDivMessage.current.scrollHeight;
-        }
+    scrollToBottom = () => {
+        this.refDivMessage.current.scrollTop = this.refDivMessage.current.scrollHeight;
+    }
 
-        componentDidUpdate() {
-            this.scrollToBottom();
-        }
+    componentDidUpdate() {
+        this.scrollToBottom();
+    }
 
-        appendMessage = (message) => {
-            switch (message.type) {
-                case "result":
-                    this.setState(prevState => {
-                        prevState.resultValue = message.format + ": " + message.text;
-                        prevState.resultItems = prevState.resultItems.concat([{ type: message.format + ": ", text: message.text }]);
-                        return prevState;
-                    });
-                    break;
-                case "error":
-                    this.setState(prevState => {
-                        prevState.resultValue = message.msg;
-                        prevState.resultItems = prevState.resultItems.concat([{ type: "Error: ", text: message.msg }]);
-                        return prevState;
-                    });
-                    break;
-                default:
-                    break;
-            }
-        }
-        showScanner = () => {
-            this.setState({
-                bShowScanner: true
-            });
+    appendMessage = (message) => {
+        switch (message.type) {
+            case "result":
+                this.setState(prevState => {
+                    prevState.resultValue = message.format + ": " + message.text;
+                    prevState.resultItems = prevState.resultItems.concat([{ type: message.format + ": ", text: message.text }]);
+                    return prevState;
+                });
+                break;
+            case "error":
+                this.setState(prevState => {
+                    prevState.resultValue = message.msg;
+                    prevState.resultItems = prevState.resultItems.concat([{ type: "Error: ", text: message.msg }]);
+                    return prevState;
+                });
+                break;
+            default:
+                break;
         }
-        render() {
-                return ( <
-                        div className = "helloWorld" >
-                        <
-                        h1 style = "font-size: 1.5em;" > Hello World
-                        for React < img src = { reactLogo }
-                        className = "App-logo"
-                        alt = "logo" / > < /h1> <
-                        input type = "text"
-                        value = { this.state.resultValue }
-                        readOnly = { true }
-                        className = "latest-result"
-                        placeholder = "The Last Read Barcode" / >
-                        <
-                        div id = "UIElement" > {!this.state.libLoaded ? ( < span style = {
-                                    { fontSize: "x-large" }
-                                } > Loading Library... < /span>) : ""} {
-                                this.state.bShowScanner ? ( < BarcodeScanner appendMessage = { this.appendMessage } > < /BarcodeScanner>) : ""} < /
-                                    div > <
-                                    div >
-                                    <
-                                    span style = {
-                                        { float: "left" }
-                                    } > All Results: < /span><br / >
-                                    <
-                                    div id = "results"
-                                    ref = { this.refDivMessage } >
-                                    <
-                                    ul > {
-                                        this.state.resultItems.map((item, index) => ( <
-                                            li key = { 100000 + index } > < span > { item.type } < /span><span className="resultText">{item.text}</span > < /li>
-                                        ))
-                                    } <
-                                    /ul> < /
-                                    div > <
-                                    /div> < /
-                                    div >
-                                );
-                            }
-                        }
-                        export default HelloWorld;
+    }
+    showScanner = () => {
+        this.setState({
+            bShowScanner: true
+        });
+    }
+    render() {
+        return (
+            <div className="helloWorld">
+                <h1>Hello World for React<img src={reactLogo} className="App-logo" alt="logo" /></h1>
+                <input type="text" value={this.state.resultValue} readOnly={true} className="latest-result" placeholder="The Last Read Barcode" />
+                <div id="UIElement">
+                    {!this.state.libLoaded ? (<span style={{ fontSize: "x-large" }}>Loading Library...</span>) : ""}
+                    {this.state.bShowScanner ? (<BarcodeScanner appendMessage={this.appendMessage}></BarcodeScanner>) : ""}
+                </div>
+                <div>
+                    <span style={{ float: "left" }}>All Results:</span><br />
+                    <div id="results" ref={this.refDivMessage}>
+                        <ul>
+                            {this.state.resultItems.map((item, index) => (
+                                <li key={100000 + index} ><span>{item.type}</span><span className="resultText">{item.text}</span>                                </li>
+                            ))}
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+}
+export default HelloWorld;
diff --git a/1.hello-world/5.read-video-vue/.gitignore b/1.hello-world/5.read-video-vue/.gitignore
@@ -21,3 +21,7 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+
+# others
+
+*.lock
diff --git a/1.hello-world/5.read-video-vue/src/components/HelloWorld.vue b/1.hello-world/5.read-video-vue/src/components/HelloWorld.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="helloWorld">
-    <h1 style="font-size: 1.5em;">{{ msg }} <img class="applogo" alt="Vue logo" src="../assets/logo.png" /></h1>
+    <h1>{{ msg }} <img class="applogo" alt="Vue logo" src="../assets/logo.png" /></h1>
     <input
       type="text"
       v-model="resultValue"
@@ -91,6 +91,11 @@ export default {
 h3 {
   margin: 40px 0 0;
 }
+
+h1 {
+  font-size: 1.5em;
+}
+
 ul {
   list-style-type: none;
   padding: 0;
diff --git a/1.hello-world/6.read-video-vue3/.gitignore b/1.hello-world/6.read-video-vue3/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+/dist
 
 
 # local env files
@@ -20,4 +21,7 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-*.lock
+
+# others
+
+*.lock
diff --git a/1.hello-world/6.read-video-vue3/src/components/HelloWorld.vue b/1.hello-world/6.read-video-vue3/src/components/HelloWorld.vue
@@ -1,6 +1,6 @@
 <template>
   <div className="helloWorld">
-    <h2>{{ msg }} <img class="applogo" alt="Vue logo" src="../assets/logo.png" /></h2>
+    <h1>{{ msg }} <img class="applogo" alt="Vue logo" src="../assets/logo.png" /></h1>
     <input
       type="text"
       placeholder="The Last Read Barcode"
@@ -146,4 +146,8 @@ export default {
 .resultText {
   color: #ce5e04;
 }
+
+h1 {
+  font-size: 1.5em;
+}
 </style>
diff --git a/1.hello-world/6.read-video-vue3/yarn.lock b/1.hello-world/6.read-video-vue3/yarn.lock
@@ -1,7 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
 
-
+ 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
diff --git a/1.hello-world/7.read-video-nextjs/.gitignore b/1.hello-world/7.read-video-nextjs/.gitignore
@@ -32,3 +32,7 @@ yarn-error.log*
 
 # vercel
 .vercel
+
+# others
+
+*.lock
diff --git a/1.hello-world/8.read-video-nuxtjs/.gitignore b/1.hello-world/8.read-video-nuxtjs/.gitignore
@@ -88,3 +88,8 @@ sw.*
 
 # Vim swap files
 *.swp
+
+# others
+
+*.lock
+
diff --git a/1.hello-world/8.read-video-nuxtjs/dbr.js b/1.hello-world/8.read-video-nuxtjs/dbr.js
@@ -22,4 +22,4 @@ DBR.handshakeCode = "200000-dbr_js_samples";
 
 DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.3/dist/";
 
-export default DBR;
+export default DBR;
diff --git a/1.hello-world/9.read-video-electron/action.js b/1.hello-world/9.read-video-electron/action.js
@@ -1,4 +1,4 @@
-window.onload = function() {
+window.onload = function () {
     /** LICENSE ALERT - README
      * The library requires a license to work, you use the API organizationID to tell the program where to fetch your license.
      * If the Organizaion ID is not specified, a 7-day (public) trial license will be used by default which is the case in this sample.
@@ -8,7 +8,7 @@ window.onload = function() {
     /* When using your own license, uncomment the following line and specify your Organization ID. */
 
     Dynamsoft.DBR.organizationID = "200000";
-    Dynamsoft.DBR.handshakeCode = "200000-dbr_js_samples";
+        Dynamsoft.DBR.handshakeCode = "200000-dbr_js_samples";
 
     /* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
     /* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
@@ -18,10 +18,10 @@ window.onload = function() {
     // Dynamsoft.DBR.productKeys = "YOUR-PRODUCT-KEY";
 
     /** LICENSE ALERT - THE END */
-
+    
     Dynamsoft.DBR.loadWasm();
     let pScanner = null;
-    document.getElementById('readBarcode').onclick = async() => {
+    document.getElementById('readBarcode').onclick = async () => {
         try {
             let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
             scanner.onFrameRead = results => {
diff --git a/3.settings/initScanner.js b/3.settings/initScanner.js
diff --git a/4.use-case/2.read-a-drivers-license.html b/4.use-case/2.read-a-drivers-license.html
diff --git a/5.others/debug/.gitignore b/5.others/debug/.gitignore
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,4 @@`
`43`	`43`	`"tslint": "~6.1.0",`
`44`	`44`	`"typescript": "~4.1.5"`
`45`	`45`	`}`
`46`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -72,3 +72,7 @@`
`72`	`72`	`height: 40vh;`
`73`	`73`	`width: 80vw;`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ h1 {`
	`77`	`+ font-size: 1.5em;`
	`78`	`+ }`