mirror of
https://github.com/Doodle3D/doodle3d-connect.git
synced 2024-12-25 01:53:48 +01:00
Search for boxes in access point (hide wired box if found)
This commit is contained in:
parent
9ecee8b074
commit
4fb58d0878
21
js/main.js
21
js/main.js
@ -64,14 +64,22 @@ function retrieveList() {
|
||||
success: function(response){
|
||||
//console.log("retrieveList response: ",response);
|
||||
if(response.status == "success") {
|
||||
updateList(response.data);
|
||||
var foundBoxes = response.data;
|
||||
foundBoxes.push(connectedBox);
|
||||
updateList(foundBoxes);
|
||||
}
|
||||
clearTimeout(retrieveListDelay);
|
||||
retrieveListDelay = setTimeout(retrieveList, retrieveListInterval);
|
||||
}
|
||||
}).fail(function() {
|
||||
console.log("retrieveList: failed");
|
||||
updateList([apBox]); //if web is not accessible try to find the box as an accesspoint
|
||||
|
||||
// if web is not accessible try to find the box as an accesspoint
|
||||
// if not found, we look for a wired box
|
||||
checkBox(apBox, function(alive) {
|
||||
if(alive) updateList([apBox]);
|
||||
else updateList([connectedBox]);
|
||||
});
|
||||
clearTimeout(retrieveListDelay);
|
||||
retrieveListDelay = setTimeout(retrieveList, retrieveListInterval); // retry after delay
|
||||
});
|
||||
@ -83,8 +91,6 @@ function updateList(boxes) {
|
||||
|
||||
if (boxes===undefined) boxes = [];
|
||||
|
||||
boxes.push(connectedBox);
|
||||
|
||||
// remove displayed, but unlisted boxes
|
||||
$list.find("a").each(function(index, element) {
|
||||
var localip = $(element).attr("id");
|
||||
@ -103,14 +109,15 @@ function updateList(boxes) {
|
||||
updateIntro();
|
||||
}
|
||||
|
||||
function checkBox(box) {
|
||||
function checkBox(box,checked) {
|
||||
numBoxesChecking++;
|
||||
$.ajax({
|
||||
url: "http://"+box.localip+"/d3dapi/network/alive",
|
||||
dataType: "json",
|
||||
timeout: boxTimeoutTime,
|
||||
success: function(response){
|
||||
if(response.status == "success") {
|
||||
var alive = (response.status == "success");
|
||||
if(alive) {
|
||||
numBoxesFound++;
|
||||
addBox(box);
|
||||
} else {
|
||||
@ -118,12 +125,14 @@ function checkBox(box) {
|
||||
}
|
||||
numBoxesChecking--;
|
||||
updateIntro();
|
||||
if(checked) checked(alive);
|
||||
}
|
||||
}).fail(function() {
|
||||
//console.log("box not alive: "+box.wifiboxid);
|
||||
numBoxesChecking--;
|
||||
removeBox(box);
|
||||
updateIntro();
|
||||
if(checked) checked(false);
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user