bak
This commit is contained in:
@@ -200,16 +200,16 @@ export async function createWindow() {
|
||||
function registerShortcuts(window=null) {
|
||||
// 先注销可能存在的F5快捷键
|
||||
globalShortcut.unregister('F5')
|
||||
|
||||
|
||||
// 注册 F5 刷新快捷键
|
||||
const success = globalShortcut.register('F5', () => {
|
||||
logger.info('F5 快捷键触发')
|
||||
|
||||
|
||||
try {
|
||||
// 获取当前焦点窗口
|
||||
const focusedWindow = BrowserWindow.getFocusedWindow()
|
||||
logger.info('当前焦点窗口:', focusedWindow ? '存在' : '不存在')
|
||||
|
||||
|
||||
if (focusedWindow && !focusedWindow.isDestroyed()) {
|
||||
logger.info('刷新当前焦点窗口')
|
||||
focusedWindow.reload()
|
||||
@@ -226,7 +226,7 @@ function registerShortcuts(window=null) {
|
||||
logger.error('F5快捷键执行出错:', error)
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
logger.info(`F5快捷键注册${success ? '成功' : '失败'}`)
|
||||
|
||||
const isRegistered_F12 = globalShortcut.isRegistered('F12');
|
||||
@@ -622,13 +622,6 @@ export function createConfigWindow() {
|
||||
})
|
||||
|
||||
|
||||
const h5_client_url=getStoreValue("h5_client_url")+"/electron_h5/#/config"
|
||||
|
||||
|
||||
logger.info("======================== configWindow 11111111111:")
|
||||
logger.info(h5_client_url)
|
||||
// configWindow.loadURL(h5_client_url)
|
||||
|
||||
|
||||
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
|
||||
configWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] + '/#/config')
|
||||
@@ -657,24 +650,24 @@ export function closeConfigWindow() {
|
||||
// 测试快捷键是否正常工作
|
||||
export function testShortcuts() {
|
||||
logger.info('测试快捷键功能...')
|
||||
|
||||
|
||||
// 检查F5快捷键是否已注册
|
||||
const isF5Registered = globalShortcut.isRegistered('F5')
|
||||
logger.info(`F5快捷键是否已注册: ${isF5Registered}`)
|
||||
|
||||
|
||||
// 获取所有已注册的快捷键
|
||||
const allShortcuts = globalShortcut.isRegistered('F5') ? ['F5'] : []
|
||||
logger.info(`已注册的快捷键: ${allShortcuts.join(', ')}`)
|
||||
|
||||
|
||||
// 获取当前焦点窗口
|
||||
const focusedWindow = BrowserWindow.getFocusedWindow()
|
||||
logger.info(`当前焦点窗口: ${focusedWindow ? '存在' : '不存在'}`)
|
||||
|
||||
|
||||
if (focusedWindow) {
|
||||
logger.info(`焦点窗口标题: ${focusedWindow.getTitle()}`)
|
||||
logger.info(`焦点窗口是否销毁: ${focusedWindow.isDestroyed()}`)
|
||||
}
|
||||
|
||||
|
||||
return {
|
||||
f5Registered: isF5Registered,
|
||||
focusedWindow: focusedWindow ? 'exists' : 'none',
|
||||
|
||||
Reference in New Issue
Block a user