From cf593c4565ce26bd19a4df2428b816c2428c267f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Sun, 26 Jan 2025 14:40:46 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E5=A4=8Diphone=E5=92=8Cipad?= =?UTF-8?q?=E4=B8=8Bweb=20usb=E9=85=8D=E7=BD=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/main.js | 4 ++-- common/modules/mixly-modules/web/serial.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/main.js b/common/main.js index c1bce17e..7f9ccc32 100644 --- a/common/main.js +++ b/common/main.js @@ -98,12 +98,12 @@ LazyLoad.js([ else if (userAgent.indexOf('Windows NT 5.1') != -1) os = 'winxp'; } else if (userAgent.includes('Android')) { os = 'android'; + } else if (platform.includes('iphone') || platform.includes('ipad') || platform.includes('ipod')) { + os = 'ios'; } else if (platform.includes('mac')) { os = 'darwin'; } else if (platform.includes('linux')) { os = 'linux'; - } else if (platform.includes('iphone') || platform.includes('ipad')) { - os = 'ios'; } return os; } diff --git a/common/modules/mixly-modules/web/serial.js b/common/modules/mixly-modules/web/serial.js index e1d880e2..06944322 100644 --- a/common/modules/mixly-modules/web/serial.js +++ b/common/modules/mixly-modules/web/serial.js @@ -35,7 +35,7 @@ if (platform === 'win32' && fullPlatform !== 'win10') { Device = USBMini; } } -} else if (fullPlatform === 'android') { +} else if (['android', 'ios'].includes(fullPlatform)) { if (['BBC micro:bit', 'Mithon CC'].includes(BOARD.boardType)) { Device = USB; } else {