Merge pull request #38 from nashaofu/dev

优化截图，减少一次屏幕截图

app/shortcut-capture.js

@@ -40,10 +40,10 @@ function createWindow (source) {
   const { display } = source
   const $win = new BrowserWindow({
     title: '截图',
-    width: display.size.width,
-    height: display.size.height,
-    x: display.bounds.x,
-    y: display.bounds.y,
+    width: display.width,
+    height: display.height,
+    x: display.x,
+    y: display.y,
     frame: false,
     show: false,
     transparent: true,
@@ -82,10 +82,10 @@ function createWindow (source) {
 
 function setFullScreen ($win, display) {
   $win.setBounds({
-    width: display.size.width,
-    height: display.size.height,
-    x: display.bounds.x,
-    y: display.bounds.y
+    width: display.width,
+    height: display.height,
+    x: display.x,
+    y: display.y
   })
   $win.setAlwaysOnTop(true)
   $win.setFullScreen(true)

app/window/js/main.js

@@ -1,5 +1,7 @@
 const fs = require('fs')
 const path = require('path')
+const _ = require('lodash')
+
 const {
   ipcRenderer,
   webFrame,
@@ -338,27 +340,38 @@ class Injector {
   onShortcutCapture () {
     ipcRenderer.on('shortcut-capture', () => {
       const displays = screen.getAllDisplays()
-      const getDesktopCapturer = displays.map((display, i) => {
-        return new Promise((resolve, reject) => {
-          desktopCapturer.getSources({
-            types: ['screen'],
-            thumbnailSize: display.size
-          }, (error, sources) => {
-            if (!error) {
-              return resolve({
-                display,
-                thumbnail: sources[i].thumbnail.toDataURL()
-              })
+        .map(item => ({
+          width: item.size.width,
+          height: item.size.height,
+          x: item.bounds.x,
+          y: item.bounds.y,
+          scaleFactor: item.scaleFactor
+        }))
+
+      // 用最大的屏幕去截屏，保证图片高清
+      const max = _.maxBy(displays, item => item.width * item.height)
+      desktopCapturer.getSources({
+        types: ['screen'],
+        thumbnailSize: {
+          width: max.width,
+          height: max.height
+        }
+      }, (error, sources) => {
+        if (!error) {
+          sources = sources.map((item, i) => {
+            const display = displays[i]
+            return {
+              display,
+              thumbnail: item.thumbnail.resize({
+                width: display.width,
+                height: display.height,
+                quality: 'best'
+              }).toDataURL()
             }
-            return reject(error)
           })
-        })
+        }
+        ipcRenderer.send('shortcut-capture', sources)
       })
-      Promise.all(getDesktopCapturer)
-        .then(sources => {
-          ipcRenderer.send('shortcut-capture', sources)
-        })
-        .catch(error => console.log(error))
     })
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dingtalk",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "钉钉linux桌面版",
   "main": "./app/index.js",
   "scripts": {