Merge pull request #25 from copios-jp/master

Patched USB and visible version
copios-jp · Dec 14, 2018 · 7734c98 · 7734c98
2 parents c4796b9 + 075fcda
commit 7734c98
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/app/main/index.js b/app/main/index.js
@@ -38,9 +38,6 @@ app.on('ready', async () => {
     titleBarStyle: 'hiddenInset',
   })
 
-  mainWindow.on('close', () => {
-    scanner.deactivate()
-  })
   mainWindow.loadFile(path.resolve(path.join(__dirname, '../renderer/index.html')))
 
   // show window once on first load
@@ -49,6 +46,8 @@ app.on('ready', async () => {
     mainWindow.show()
     autoUpdater.checkForUpdatesAndNotify()
     PowerSaveBlocker.activate()
+    mainWindow.webContents.send('version', app.getVersion())
+
     app.on('activate', () => {
       mainWindow.show()
     })
@@ -72,7 +71,6 @@ app.on('ready', async () => {
 
 app.on('before-quit', () => {
   PowerSaveBlocker.deactivate()
-  scanner.deactivate()
 })
 
 ipcMain.on('activate', () => {

diff --git a/app/main/services/ant/Receiver.js b/app/main/services/ant/Receiver.js
@@ -47,10 +47,9 @@ class Receiver extends events.EventEmitter {
     })
     try {
       this.stick.close()
-      // this.stick.reset()
     } catch (e) {
       if (this.stick) {
-        this.stick.emit('shutdown')
+        this.stick.emit('shutdown', this)
       }
       /* noop */
     }

diff --git a/app/main/services/ant/Scanner.js b/app/main/services/ant/Scanner.js
@@ -49,6 +49,14 @@ class Scanner extends events.EventEmitter {
     }
   }
 
+  close(stick) {
+    try {
+      stick.close()
+    } catch (err) {
+      /* noop */
+    }
+  }
+
   open = (stick) => {
     stick.startupTimeout = 1
     stick.once('startup', () => {
@@ -64,15 +72,13 @@ class Scanner extends events.EventEmitter {
       } else {
         setTimeout(() => {
           if (stick.startupTimeout) {
-            console.log('Scanner#open stick opened but no startup received')
-            stick.close()
+            this.close(stick)
           }
         }, 500)
       }
     } catch (e) {
       if (e.message !== "Cannot read property 'transfer' of undefined") {
-        console.log('Scanner#open stick open errored', e)
-        stick.close()
+        this.close(stick)
       }
       stick.removeAllListeners('startup')
     }

diff --git a/app/renderer/components/status_bar/index.jsx b/app/renderer/components/status_bar/index.jsx
@@ -18,15 +18,20 @@ export class StatusBar extends Component {
   mainEvents = {
     onTransmitter: ['transmitter-added', 'transmitter-removed'],
     onReceiver: ['receiver-added', 'receiver-removed'],
+    onVersion: ['version'],
+  }
+
+  onVersion = (event, version) => {
+    this.setState({ ...this.state, version })
   }
 
   render = () => {
     const { classes } = this.props
-    const { receivers, transmitters } = this.state
+    const { receivers, transmitters, version } = this.state
     return (
       <div className={classes.statusBar}>
         <Typography variant="caption" className={classes.copyright}>
-          &copy; COPIOS
+          &copy; COPIOS v{version}
         </Typography>
         <Typography className={classes.bottomBarItem} variant="caption">
           受信機数: {receivers.length}
@@ -41,6 +46,7 @@ export class StatusBar extends Component {
   state = {
     receivers: [],
     transmitters: [],
+    version: '-',
   }
 }