add old style alertbox

* add old style alertbox

Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
Simon Smith 2023-12-14 14:24:55 +00:00 committed by GitHub
parent 91c83e2622
commit 947d84316b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View File

@ -1466,6 +1466,14 @@ function handleServerCommand(data) {
sendConsoleText('localappMsg: ' + data.appid + ', ' + JSON.stringify(data.value)); sendConsoleText('localappMsg: ' + data.appid + ', ' + JSON.stringify(data.value));
if (data.appid != null) { sendToRegisteredApp(data.appid, data.value); } else { broadcastToRegisteredApps(data.value); } if (data.appid != null) { sendToRegisteredApp(data.appid, data.value); } else { broadcastToRegisteredApps(data.value); }
break; break;
case 'alertbox': {
// Display an old style alert box
if (data.title && data.msg) {
MeshServerLogEx(18, [data.title, data.msg], "Displaying alert box, title=" + data.title + ", message=" + data.msg, data);
try { require('message-box').create(data.title, data.msg, 9999, 1).then(function () { }).catch(function () { }); } catch (ex) { }
}
break;
}
default: default:
// Unknown action, ignore it. // Unknown action, ignore it.
break; break;

View File

@ -5767,7 +5767,7 @@
} else if (op == 108) { } else if (op == 108) {
// Device notification // Device notification
var x = "Perform batch device notification" + '<br /><br />'; var x = "Perform batch device notification" + '<br /><br />';
x += '<select id=d2deviceop style=width:100%><option value=2>' + "Toast Notification" + '</option><option value=1>' + "Message Box" + '</option></select>'; x += '<select id=d2deviceop style=width:100%><option value=2>' + "Toast Notification" + '</option><option value=1>' + "Message Box" + '</option><option value=3>' + "Alert Box" + '</option></select>';
x += '<br /><input id=dp2notifyTitle maxlength=256 placeholder="' + "Title" + '" style=width:100% />'; x += '<br /><input id=dp2notifyTitle maxlength=256 placeholder="' + "Title" + '" style=width:100% />';
x += '<textarea id=d2notifyMsg style=background-color:#fcf3cf;width:100%;height:140px;resize:none;overflow-y:scroll></textarea>'; x += '<textarea id=d2notifyMsg style=background-color:#fcf3cf;width:100%;height:140px;resize:none;overflow-y:scroll></textarea>';
setDialogMode(2, "Device Notification", 3, d2groupActionFunctionNotifyExec, x); setDialogMode(2, "Device Notification", 3, d2groupActionFunctionNotifyExec, x);
@ -5820,6 +5820,8 @@
for (var i = 0; i < chkNodeIds.length; i++) { meshserver.send({ action: 'msg', type: 'messagebox', nodeid: chkNodeIds[i], title: title, msg: msg }); } for (var i = 0; i < chkNodeIds.length; i++) { meshserver.send({ action: 'msg', type: 'messagebox', nodeid: chkNodeIds[i], title: title, msg: msg }); }
} else if (op == 2) { // Toast } else if (op == 2) { // Toast
meshserver.send({ action: 'toast', nodeids: chkNodeIds, title: title, msg: msg }); meshserver.send({ action: 'toast', nodeids: chkNodeIds, title: title, msg: msg });
} else if (op == 3) { // Old Style MessageBox
for (var i = 0; i < chkNodeIds.length; i++) { meshserver.send({ action: 'msg', type: 'alertbox', nodeid: chkNodeIds[i], title: title, msg: msg }); }
} }
} }