18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 调整fullPlatform下对各系统的判断顺序

Browse Source
This commit is contained in:
王立帮
2025-01-20 09:31:31 +08:00
parent 4f6ec33e89
commit d9e41b76c8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/main.js
View File

@@ -96,14 +96,14 @@ LazyLoad.js([
else if (userAgent.indexOf('Windows NT 6.1') != -1) os = 'win7'; else if (userAgent.indexOf('Windows NT 6.1') != -1) os = 'win7';
else if (userAgent.indexOf('Windows NT 6.0') != -1) os = 'winvista'; else if (userAgent.indexOf('Windows NT 6.0') != -1) os = 'winvista';
else if (userAgent.indexOf('Windows NT 5.1') != -1) os = 'winxp'; else if (userAgent.indexOf('Windows NT 5.1') != -1) os = 'winxp';
} else if (userAgent.includes('Android')) {
os = 'android';
} else if (platform.includes('mac')) { } else if (platform.includes('mac')) {
os = 'darwin'; os = 'darwin';
} else if (platform.includes('linux')) { } else if (platform.includes('linux')) {
os = 'linux'; os = 'linux';
} else if (platform.includes('iphone') || platform.includes('ipad')) { } else if (platform.includes('iphone') || platform.includes('ipad')) {
os = 'ios'; os = 'ios';
} else if (platform.includes('android')) {
os = 'android';
} }
return os; return os;
} }

6
common/modules/mixly-modules/web/burn-upload.js
View File

@@ -657,12 +657,12 @@ BU.uploadWithAmpy = (portName) => {
const mainWorkspace = Workspace.getMain(); const mainWorkspace = Workspace.getMain();
const editor = mainWorkspace.getEditorsManager().getActive(); const editor = mainWorkspace.getEditorsManager().getActive();
let useBuffer = true, dataLength = 256; let useBuffer = true, dataLength = 256;
if (BOARD.web.com === 'usb') { if (BOARD?.web?.devices?.usb) {
useBuffer = true; useBuffer = true;
dataLength = 64; dataLength = 64;
} else if (BOARD.web.com === 'hid') { } else if (BOARD?.web?.devices?.hid) {
useBuffer = true; useBuffer = true;
dataLength = 30; dataLength = 31;
} }
layer.open({ layer.open({
type: 1, type: 1,

2
common/modules/mixly-modules/web/hid.js
View File

@@ -189,7 +189,7 @@ class WebHID extends Serial {
let temp = new Uint8Array(buffer.length + 1); let temp = new Uint8Array(buffer.length + 1);
temp[0] = buffer.length; temp[0] = buffer.length;
temp.set(buffer, 1); temp.set(buffer, 1);
buffer= temp; buffer = temp;
} else { } else {
buffer.unshift(buffer.length); buffer.unshift(buffer.length);
buffer = new Uint8Array(buffer); buffer = new Uint8Array(buffer);