vmario/doodle3d-connect
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-connect.git synced 2024-12-25 18:13:48 +01:00
Code Issues Releases Wiki Activity

Autoredirect from connecting page to box when it's connected

Browse Source
This commit is contained in:
peteruithoven 2014-04-28 16:58:21 +02:00
parent 267744238f
commit 5668c8edb8
1 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
js/ConnectingToNetworkPage.js
View File

@ -12,7 +12,10 @@
var _statusField; var _statusField;
var _actionField; var _actionField;
var _networkAPI = new NetworkAPI(); var _networkAPI = new NetworkAPI();
var _connectAPI = new ConnectAPI();
var _infoAPI = new InfoAPI();
var _pageData = {}; var _pageData = {};
var _connectedChecking = false;
var PAGE_ID = "#connecting_to_network"; var PAGE_ID = "#connecting_to_network";
@ -29,20 +32,36 @@
_pageData = d3d.util.getPageParams(PAGE_ID); _pageData = d3d.util.getPageParams(PAGE_ID);
var boxURL = "http://"+_pageData.localip; var boxURL = "http://"+_pageData.localip;
_infoAPI.init(boxURL);
_networkAPI.init(boxURL); _networkAPI.init(boxURL);
retrieveWiFiBoxID(function() {
joinNetwork();
_networkAPI.refreshing = onRefreshing; _networkAPI.refreshing = onRefreshing;
_networkAPI.updated = onStatusUpdated; _networkAPI.updated = onStatusUpdated;
joinNetwork();
_networkAPI.startAutoRefresh(); _networkAPI.startAutoRefresh();
}); });
});
$.mobile.document.on( "pagehide", PAGE_ID, function( event, data ) { $.mobile.document.on( "pagehide", PAGE_ID, function( event, data ) {
console.log("Connecting to network page pagehide"); console.log("Connecting to network page pagehide");
_networkAPI.stopAutoRefresh(); _networkAPI.stopAutoRefresh();
_connectAPI.stop();
}); });
function retrieveWiFiBoxID(completeHandler) {
console.log(PAGE_ID+":retrieveWiFiBoxID");
_infoAPI.getInfo(function(infoData) {
_wifiboxid = infoData.wifiboxid;
console.log(" _wifiboxid: ",_wifiboxid);
completeHandler();
},function() {
// try connecting anyway (making sure wifiboxid retrieval isn't blocking
completeHandler();
});
}
function joinNetwork() { function joinNetwork() {
console.log("joinNetwork"); console.log("joinNetwork");
console.log(" _pageData.password: ",_pageData.password); console.log(" _pageData.password: ",_pageData.password);
_networkAPI.associate(_pageData.ssid,_pageData.password,true); _networkAPI.associate(_pageData.ssid,_pageData.password,true);
_connectedChecking = false;
} }
function onRefreshing() { function onRefreshing() {
//console.log("ConnectingToNetworkPage:onRefreshing"); //console.log("ConnectingToNetworkPage:onRefreshing");
@ -60,19 +79,15 @@
switch(data.status) { switch(data.status) {
case NetworkAPI.STATUS.CONNECTING: case NetworkAPI.STATUS.CONNECTING:
statusText = "Connecting to network "; statusText = "Connecting to network ";
actionText = "Please reconnect to <b>"+_pageData.ssid+"</b>. Once you are connected return to this page."; //actionText = "Please reconnect yourself to <b>"+_pageData.ssid+"</b>. Once you are connected return to this page.";
_actionField.attr("class","info"); actionText = "Please reconnect yourself to <b>"+_pageData.ssid+"</b>. Keep this page open.";
_actionField.attr("class","notice");
break; break;
case NetworkAPI.STATUS.CONNECTING_FAILED: case NetworkAPI.STATUS.CONNECTING_FAILED:
statusText = "Could not connect..."; statusText = "Could not connect...";
actionText = "Please check password and try again"; actionText = "Please check password and try again";
_actionField.attr("class","error"); _actionField.attr("class","error");
break; break;
case NetworkAPI.STATUS.CONNECTED:
statusText = "Connected";
actionText = "The WiFi-Box is connected to <b>"+_pageData.ssid+"</b>. <br/>Please reconnect to <b>"+_pageData.ssid+"</b>. Once you are connected return to this page.";
_actionField.attr("class","info");
break;
default: default:
actionText = "Something went wrong, please try again"; actionText = "Something went wrong, please try again";
_actionField.attr("class","error"); _actionField.attr("class","error");
@ -81,11 +96,36 @@
_statusField.html(statusText); _statusField.html(statusText);
_actionField.html(actionText); _actionField.html(actionText);
if(data.status === NetworkAPI.STATUS.CONNECTED) { // When the box is connecting we start checking connect.doodle3d.com
_networkAPI.stopAutoRefresh(); // for a box with the same wifiboxid
if(data.status === NetworkAPI.STATUS.CONNECTING && !_connectedChecking && _wifiboxid !== undefined) {
_connectAPI.boxAppeared = onBoxAppeared;
_connectAPI.start();
_connectedChecking = true;
}
}
function onBoxAppeared(boxData) {
console.log(PAGE_ID+":onBoxAppeared: ",boxData.localip,boxData.wifiboxid);
// if same box is found...
if(boxData.wifiboxid === _wifiboxid) {
// check if it finished connecting
var boxURL = "http://"+boxData.localip;
var connectedBoxNetworkAPI = new NetworkAPI();
connectedBoxNetworkAPI.init(boxURL);
connectedBoxNetworkAPI.updated = function(data) {
data.status = parseInt(data.status,10);
console.log(PAGE_ID+":connectedBoxNetworkAPI:onStatusUpdated: ",data.status);
if(data.status === NetworkAPI.STATUS.CONNECTED) {
// redirect to it's box page
console.log(" redirect to box");
var linkParams = {localip: boxData.localip,wifiboxid: boxData.wifiboxid};
var link = "#box";
link = d3d.util.replaceURLParameters(link,linkParams);
$.mobile.changePage(link);
connectedBoxNetworkAPI.stopAutoRefresh();
}
};
connectedBoxNetworkAPI.startAutoRefresh();
} }
// ToDo: attempt to auto redirect to connected WiFi-Box
// attempt to retrieve connectAPI list, if same wifiboxid available (only works for version 0.10.2+), redirect to box page
} }
})(window); })(window);