feat: restore the proxy with Windows when restart

pull/377/head
starknt 2024-10-19 13:13:46 +08:00
parent 7a7fd046c4
commit f8acabca7a
3 changed files with 7 additions and 5 deletions

View File

@ -8,6 +8,8 @@ import backend from './bridge/backend'
import DevSidecar from '@docmirror/dev-sidecar' import DevSidecar from '@docmirror/dev-sidecar'
import log from './utils/util.log' import log from './utils/util.log'
import minimist from 'minimist' import minimist from 'minimist'
const isWindows = process.platform === 'win32'
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const isMac = process.platform === 'darwin' const isMac = process.platform === 'darwin'
// import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer' // import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
@ -188,7 +190,7 @@ function createWindow (startHideWindow) {
Menu.setApplicationMenu(null) Menu.setApplicationMenu(null)
win.setMenu(null) win.setMenu(null)
// !!IMPORTANT // !!IMPORTANT
if(process.platform === 'win32') { if(isWindows) {
powerMonitor.setupMainWindow(win) powerMonitor.setupMainWindow(win)
} }
@ -448,7 +450,7 @@ if (!isFirstInstance) {
} }
powerMonitor.on('shutdown', async (e) => { powerMonitor.on('shutdown', async (e) => {
if(process.platform !== 'win32') if(e)
e.preventDefault() e.preventDefault()
log.info('系统关机,恢复代理设置') log.info('系统关机,恢复代理设置')
await quit() await quit()

View File

@ -1,5 +1,5 @@
import { powerMonitor as _powerMonitor, BrowserWindow } from 'electron' import { powerMonitor as _powerMonitor, BrowserWindow } from 'electron'
import { setMainWindowHandle, insertWndProcHook, removeWndProcHook, acquireShutdownBlock, releaseShutdownBlock } from '@natmri/platform-napi' import { setMainWindowHandle, insertWndProcHook, removeWndProcHook, releaseShutdownBlock, acquireShutdownBlock } from '@natmri/platform-napi';
class PowerMonitor { class PowerMonitor {
constructor() { constructor() {

View File

@ -82,8 +82,8 @@ module.exports = {
} }
}, },
win: { win: {
icon: 'build/icons/' icon: 'build/icons/',
// requestedExecutionLevel: 'highestAvailable' // 加了这个无法开机自启 requestedExecutionLevel: 'highestAvailable' // 加了这个无法开机自启
}, },
linux: { linux: {
icon: 'build/mac/', icon: 'build/mac/',