Update app.js

added an if statement to display an alert message if the tv config file is not present.
pull/3548/head
Guptilious 2024-09-12 07:56:31 +01:00 committed by GitHub
parent 1a1d8cf1dd
commit ca004b2700
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 89 additions and 61 deletions

View File

@ -9,13 +9,15 @@ let devicefile = require("Storage").readJSON(deviceFileName, true);
//console.log(devicefile);
let serverDns = serverData.webServerDns;
let serverPort = serverData.port;
let tvIp = serverData.tvIp;
let username = serverData.username;
let password = serverData.password;
let serverDns = "webServerDns" in serverData ? serverData.webServerDns : 'undefined';
let panaIp = "tvIp" in serverData ? serverData.tvIp : 'undefined';
let serverPort = "port" in serverData ? serverData.port : 'undefined';
let tvIp = "tvIp" in serverData ? serverData.tvIp : 'undefined';
let username = "username" in serverData ? serverData.username : 'undefined';
let password = "password" in serverData ? serverData.password : 'undefined';
let panaIp = tvIp;
//"tvIp" in serverData ? serverData.tvIp : 'undefined';
let settingsPort = "port" in serverData ? serverData.port : 'undefined';
let counter;
@ -31,7 +33,12 @@ let RIGHT_MARGIN = 15;
let midpoint = (g.getWidth() / 2);
let IP_AREA = [0, RESULT_HEIGHT, g.getWidth(), g.getHeight()]; // values used for key buttons
let KEY_AREA = [0, 24, g.getWidth(), g.getHeight()];
let COLORS = {DEFAULT: ['#FF0000'], BLACK: ['#000000'], WHITE: ['#FFFFFF'], GREY: ['#808080', '#222222']}; // background
let COLORS = {
DEFAULT: ['#FF0000'],
BLACK: ['#000000'],
WHITE: ['#FFFFFF'],
GREY: ['#808080', '#222222']
}; // background
let sourceApps = {
"selection": {
@ -195,8 +202,7 @@ function sendPost(keyPress) {
};
Bangle.http(
serverUrl,
{
serverUrl, {
method: 'POST',
headers: {
'Authorization': `Basic ${credentials}`,
@ -211,12 +217,11 @@ function sendPost(keyPress) {
}
function receiveDevices() {
serverPort = settingsPort;
let serverPort = settingsPort;
let credentials = btoa(`${username}:${password}`);
let serverUrl = `https://${serverDns}:${serverPort}/ssdp-devices.json`;
return Bangle.http(
serverUrl,
{
serverUrl, {
method: 'GET',
headers: {
'Authorization': `Basic ${credentials}`
@ -306,9 +311,7 @@ function buttonPress(val, screenValue) {
if (val === '<') sendPost('back');
else if (val === 'ok') sendPost('enter');
else sendPost("num_" + val);
}
else if (screenValue === "selection") sendPost(selection[val].key);
} else if (screenValue === "selection") sendPost(selection[val].key);
else if (screenValue === "volume") sendPost(volume[val].key);
}
@ -453,9 +456,15 @@ function subMenu() {
if (typeof settingsPort !== 'undefined' && settingsPort !== 'undefined') {
let portHeader = `Port: ${settingsPort}`;
settingssub[portHeader] = function() { IPASSIGN = "port"; ipScreen();};
settingssub[portHeader] = function() {
IPASSIGN = "port";
ipScreen();
};
} else {
settingssub["Set DNS Port"] = function() { IPASSIGN = "port"; ipScreen();};
settingssub["Set DNS Port"] = function() {
IPASSIGN = "port";
ipScreen();
};
}
if (typeof panaIp !== 'undefined' && panaIp !== 'undefined') {
@ -467,14 +476,23 @@ function subMenu() {
console.log(devicefile);
};
} else {
settingssub["Set Pana IP"] = function() { IPASSIGN = "pana"; ipScreen();};
settingssub["Set Pana IP"] = function() {
IPASSIGN = "pana";
ipScreen();
};
}
if (typeof samsIp !== 'undefined' && panaIp !== 'undefined') {
let samsheader = `Sams IP: ${samsIp}`;
settingssub[samsheader] = function() { IPASSIGN = "sams"; ipScreen();};
settingssub[samsheader] = function() {
IPASSIGN = "sams";
ipScreen();
};
} else {
settingssub["Set Sams IP"] = function() { IPASSIGN = "sams"; ipScreen();};
settingssub["Set Sams IP"] = function() {
IPASSIGN = "sams";
ipScreen();
};
}
E.showMenu(settingssub);
@ -515,8 +533,11 @@ let parsedResp = JSON.parse(devicefile.resp);
let deviceSelect = {
"" : { title : "Device Select",
back : function() { subMenu(); }
"": {
title: "Device Select",
back: function() {
subMenu();
}
},
"Manual IP Assign": function() {
ipScreen();
@ -624,4 +645,11 @@ Bangle.on('touch', touchHandler);
Bangle.loadWidgets();
Bangle.drawWidgets();
if (serverData === undefined) {
E.showAlert(`${serverDataFile}.json missing.\nSee READ.me`, "Config Error").then(function() {
mainMenu();
});
} else {
mainMenu();
}