主设备增加清理缓存入口；

优化文本展示，翻译关闭时能自由选择文本

Author: mengjianhua

electron_gui/server/model/devices.js

@@ -1,5 +1,5 @@
 const {newDevice} = require('./device')
-const {syncTypeEum}  = require('./syncInfo')
+const {syncTypeEum} = require('./syncInfo')
 
 
 class Devices {
@@ -9,10 +9,10 @@ class Devices {
         this.pingSecond = null
     }
 
-    syncEvent(devId, syncContent){
+    syncEvent(devId, syncContent) {
         let fromDev = this.getDev(devId)
         switch (syncContent.syncType) {
-            case syncTypeEum.file:{
+            case syncTypeEum.file: {
                 let upFile = fromDev.uploadFiles[syncContent.fileHash]
                 syncContent['show'] = upFile.show
                 syncContent['fileSize'] = upFile.fileSize
@@ -21,43 +21,44 @@ class Devices {
         }
         let newDevs = []
         console.log(`fromdev:${fromDev}, content: ${syncContent}`)
-        this.devs.forEach((val)=>{
-            if(syncContent.toDevId === val.devId){
+        this.devs.forEach((val) => {
+            if (syncContent.toDevId === val.devId) {
                 val.syncDevice(fromDev, syncContent)
             }
             newDevs.push(val)
         })
         this.devs = newDevs
     }
 
-    clearSync(){
-        this.devs.forEach((val)=>{
+    clearSync(call) {
+        this.devs.forEach((val) => {
             val.clearAllSync()
         })
+        call()
     }
 
-    getDev(devId){
+    getDev(devId) {
         let focusDev = null
-        this.devs.forEach((val)=>{
-            if( val.devId === devId){
+        this.devs.forEach((val) => {
+            if (val.devId === devId) {
                 focusDev = val
 
             }
         })
         return focusDev
     }
 
-    getMasterDev(){
+    getMasterDev() {
         let focusDev = null
-        this.devs.forEach((val)=>{
-            if(val.isMaster){
+        this.devs.forEach((val) => {
+            if (val.isMaster) {
                 focusDev = val
             }
         })
         return focusDev
     }
 
-    uploadEvent(devId, filename, fileHash, fileSize){
+    uploadEvent(devId, filename, fileHash, fileSize) {
         let newDevs = []
         this.devs.forEach((val) => {
             if (devId === val.devId) {
@@ -69,7 +70,7 @@ class Devices {
         this.devs = newDevs
     }
 
-    delDev(devId){
+    delDev(devId) {
         let newDevs = []
         this.devs.forEach((val) => {
             if (devId !== val.devId) {
@@ -91,8 +92,8 @@ class Devices {
                 newDev = val
             }
 
-            if (Date.now()-val.lastTime-this.pingSecond*1000 < 0) {
-                if(onlineDevIds){
+            if (Date.now() - val.lastTime - this.pingSecond * 1000 < 0) {
+                if (onlineDevIds) {
                     val.online = onlineDevIds.indexOf(val.devId) !== -1;
                 }
 

electron_gui/server/router.js

@@ -10,8 +10,11 @@ router.post('/setting', service.anySetting.setSetting)
 router.post('/translate', service.anySetting.transInfo)
 router.post('/upload', service.upload.uploadHandler.single('file'), service.upload.uploadFunc)
 
+router.get('/openapi/batchDevices', service.openApi.batchDevices)
+router.post('/openapi/openUrl', service.openApi.openUrl)
+
 router.get('/', function (req, res) {
-    let params = req.query.masterId ? `#/?masterId=${req.query.masterId}`: ''
+    let params = req.query.masterId ? `#/?masterId=${req.query.masterId}` : ''
     res.redirect(`/index.html${params}`)
 })
 

electron_gui/server/servive/anysetting.js

@@ -20,8 +20,11 @@ function setSetting(req, res) {
         kvStore.set('captureCfg', captureCfg)
     }
     if (mode === 'clearSync'){
-        Devs.clearSync()
-        global.SYNCWS.sendGroupMsg(req.body.groupId, {msgEvent: 'pingGroup', cfg: req.body})
+        Devs.clearSync(
+            ()=>{
+                global.SYNCWS.sendGroupMsg(req.body.groupId, {msgEvent: 'ping'})
+            }
+        )
     }
 
     res.send('success')

electron_gui/server/servive/index.js

@@ -2,7 +2,8 @@ const ping = require('./ping')
 const syncWSMng = require('./sync')
 const upload = require('./upload')
 const anySetting = require('./anysetting')
+const openApi = require('./openapi')
 
 module.exports = {
-    ping, syncWSMng, upload, anySetting
+    ping, syncWSMng, upload, anySetting, openApi
 }

electron_gui/server/servive/openapi.js

@@ -0,0 +1,20 @@
+const {Devs} = require("../model");
+const {toBase64} = require("request/lib/helpers");
+
+function batchDevices(req, res) {
+    res.send(Devs.devs)
+}
+
+function openUrl(req, res) {
+    let groupId = req.body.groupId
+    let devId = req.body.devId
+    let url = req.body.url
+    let autoOpen = req.body.autoOpen
+    console.log(groupId, devId, url)
+    global.SYNCWS.sendMsg(groupId, devId, {msgEvent: 'openUrl', url: url, autoOpen: autoOpen})
+    res.send('success')
+}
+
+module.exports = {
+    batchDevices, openUrl
+}

electron_gui/server/servive/sync.js

@@ -9,7 +9,8 @@ const MsgType = {
     pingGroup: 'pingGroup',
     sync: 'sync',
     anySetting: 'anySetting',
-    capture: 'capture'
+    capture: 'capture',
+    openUrl: 'openUrl'
 }
 
 class SyncWsManager {
@@ -59,6 +60,7 @@ class SyncWsManager {
         console.log(`send[${devId}] msg:${JSON.stringify(msg)}`)
         if (this.clients[groupId][devId]) {
             this.clients[groupId][devId].send(JSON.stringify(msg))
+            console.log('send success')
         }
     }