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

Update: 更新WebSocket模式

Browse Source
This commit is contained in:
王立帮
2024-12-01 14:44:49 +08:00
parent 134f2c99ae
commit 9bbd0e6720
13 changed files with 611 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
common/modules/mixly-modules/common/app.js
View File

@@ -27,6 +27,8 @@ goog.require('Mixly.Web.BU');
goog.require('Mixly.Web.FS');
goog.require('Mixly.Web.File');
goog.require('Mixly.Web.Serial');
goog.require('Mixly.WebSocket.Serial');
goog.require('Mixly.WebSocket.ArduShell');
goog.provide('Mixly.App');
const {
@@ -44,11 +46,24 @@ const {
Component,
EditorMix,
Electron = {},
Web = {}
Web = {},
WebSocket = {}
} = Mixly;
const { Loader } = Electron;
let currentObj = null;
if (goog.isElectron) {
currentObj = Electron;
} else {
if (Env.hasSocketServer) {
currentObj = WebSocket;
} else {
currentObj = Web;
}
}
const {
FS,
File,
@@ -57,7 +72,7 @@ const {
BU,
PythonShell,
Serial
} = goog.isElectron? Electron : Web;
} = currentObj;
const { BOARD, SELECTED_BOARD } = Config;
@@ -149,7 +164,7 @@ class App extends Component {
id: 'port-add-btn',
displayText: Msg.Lang['nav.btn.addDevice'],
preconditionFn: () => {
if (goog.isElectron) {
if (goog.isElectron || Env.hasSocketServer) {
return false;
}
return true;
@@ -165,7 +180,10 @@ class App extends Component {
id: 'arduino-compile-btn',
displayText: Msg.Lang['nav.btn.compile'],
preconditionFn: () => {
if (!goog.isElectron || !SELECTED_BOARD?.nav?.compile) {
if (!goog.isElectron && !Env.hasSocketServer && !env.hasCompiler) {
return false;
}
if (!SELECTED_BOARD?.nav?.compile || !SELECTED_BOARD?.nav?.upload) {
return false;
}
const workspace = Workspace.getMain();
@@ -190,7 +208,10 @@ class App extends Component {
id: 'arduino-upload-btn',
displayText: Msg.Lang['nav.btn.upload'],
preconditionFn: () => {
if (!goog.isElectron || !SELECTED_BOARD?.nav?.compile || !SELECTED_BOARD?.nav?.upload) {
if (!goog.isElectron && !Env.hasSocketServer && !env.hasCompiler) {
return false;
}
if (!SELECTED_BOARD?.nav?.compile || !SELECTED_BOARD?.nav?.upload) {
return false;
}
const workspace = Workspace.getMain();