From 8c70cffd251bc2617c8682cd8824e8203d2129a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Fri, 7 Mar 2025 19:56:03 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=20=E4=BF=AE=E5=A4=8D=E5=B9=B3=E6=9D=BF?= =?UTF-8?q?=E4=B8=8B=E7=83=A7=E5=BD=95=E6=8C=89=E9=92=AE=E5=8F=AF=E8=A7=81?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/modules/mixly-modules/common/app.js | 9 ++++++++- common/modules/mixly-modules/web/burn-upload.js | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/modules/mixly-modules/common/app.js b/common/modules/mixly-modules/common/app.js index e0d3690d..ebafabda 100644 --- a/common/modules/mixly-modules/common/app.js +++ b/common/modules/mixly-modules/common/app.js @@ -239,7 +239,14 @@ class App extends Component { id: 'command-burn-btn', displayText: Msg.Lang['nav.btn.burn'], preconditionFn: () => { - return SELECTED_BOARD?.nav?.burn; + if (goog.isElectron || Env.hasSocketServer) { + return SELECTED_BOARD?.nav?.burn; + } + if (Serial.devicesRegistry.hasKey('serial')) { + return SELECTED_BOARD?.nav?.burn; + } else { + return false; + } }, callback: () => BU.initBurn(), scopeType: Nav.Scope.LEFT, diff --git a/common/modules/mixly-modules/web/burn-upload.js b/common/modules/mixly-modules/web/burn-upload.js index 1b68670f..dbf5544c 100644 --- a/common/modules/mixly-modules/web/burn-upload.js +++ b/common/modules/mixly-modules/web/burn-upload.js @@ -250,7 +250,7 @@ BU.burnWithEsptool = async (binFile, erase) => { } } const port = Serial.getPort(portName); - if (port instanceof window.HIDDevice || port instanceof window.USBDevice) { + if (['HIDDevice', 'USBDevice'].includes(port.constructor.name)) { layer.msg(Msg.Lang['burn.notSupport'], { time: 1000 }); return; } @@ -370,7 +370,7 @@ BU.burnWithAdafruitEsptool = async (binFile, erase) => { } } const port = Serial.getPort(portName); - if (port instanceof window.HIDDevice || port instanceof window.USBDevice) { + if (['HIDDevice', 'USBDevice'].includes(port.constructor.name)) { layer.msg(Msg.Lang['burn.notSupport'], { time: 1000 }); return; }