小调整。
parent
1a34c1e575
commit
b8d5e1b3e2
|
@ -23,6 +23,8 @@
|
|||
"dependencies": {
|
||||
"@docmirror/dev-sidecar": "^1.8.8",
|
||||
"@docmirror/mitmproxy": "^1.8.8",
|
||||
"@mihomo-party/sysproxy": "^2.0.4",
|
||||
"@natmri/platform-napi": "0.0.7",
|
||||
"adm-zip": "^0.5.5",
|
||||
"ant-design-vue": "^1.6.5",
|
||||
"compressing": "^1.5.1",
|
||||
|
@ -43,9 +45,7 @@
|
|||
"sass-loader": "^10.0.4",
|
||||
"vue": "^2.6.11",
|
||||
"vue-json-editor-fix-cn": "^1.4.3",
|
||||
"vue-router": "^3.4.8",
|
||||
"@natmri/platform-napi": "0.0.7",
|
||||
"@mihomo-party/sysproxy": "^2.0.4"
|
||||
"vue-router": "^3.4.8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^4.5.0",
|
||||
|
@ -54,9 +54,9 @@
|
|||
"@vue/eslint-config-standard": "^5.1.2",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"electron": "^17.4.11",
|
||||
"electron-builder": "^23.0.3",
|
||||
"electron-devtools-installer": "^3.1.0",
|
||||
"electron-icon-builder": "^2.0.1",
|
||||
"electron-builder": "^23.0.3",
|
||||
"eslint": "^6.7.2",
|
||||
"eslint-plugin-import": "^2.20.2",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
|
|
|
@ -189,6 +189,7 @@ function createWindow (startHideWindow) {
|
|||
|
||||
Menu.setApplicationMenu(null)
|
||||
win.setMenu(null)
|
||||
|
||||
// !!IMPORTANT
|
||||
if (isWindows) {
|
||||
powerMonitor.setupMainWindow(win)
|
||||
|
@ -450,12 +451,13 @@ if (!isFirstInstance) {
|
|||
}
|
||||
|
||||
powerMonitor.on('shutdown', async (e) => {
|
||||
if(e)
|
||||
if (e) {
|
||||
e.preventDefault()
|
||||
}
|
||||
log.info('系统关机,恢复代理设置')
|
||||
if (isWindows) {
|
||||
const Sysproxy = require('@mihomo-party/sysproxy')
|
||||
Sysproxy.triggerManualProxy(false, "", 0, "")
|
||||
Sysproxy.triggerManualProxy(false, '', 0, '')
|
||||
}
|
||||
await quit()
|
||||
})
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { powerMonitor as _powerMonitor, BrowserWindow } from 'electron'
|
||||
import { setMainWindowHandle, insertWndProcHook, removeWndProcHook, releaseShutdownBlock, acquireShutdownBlock } from '@natmri/platform-napi';
|
||||
import { powerMonitor as _powerMonitor } from 'electron'
|
||||
import { setMainWindowHandle, insertWndProcHook, removeWndProcHook, releaseShutdownBlock, acquireShutdownBlock } from '@natmri/platform-napi'
|
||||
|
||||
class PowerMonitor {
|
||||
constructor () {
|
||||
|
@ -9,7 +9,6 @@ class PowerMonitor {
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {BrowserWindow} window
|
||||
*/
|
||||
setupMainWindow (window) {
|
||||
|
@ -48,7 +47,7 @@ class PowerMonitor {
|
|||
releaseShutdownBlock()
|
||||
}
|
||||
insertWndProcHook(this._shutdownCallback)
|
||||
acquireShutdownBlock("正在停止 DevSidecar 代理")
|
||||
acquireShutdownBlock('正在停止 DevSidecar 代理')
|
||||
}
|
||||
this._listeners.push(listener)
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue