+
+
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/platforms/android/res/drawable-mdpi/icon.png b/platforms/android/res/drawable-mdpi/icon.png
index ee09831..038d85a 100644
Binary files a/platforms/android/res/drawable-mdpi/icon.png and b/platforms/android/res/drawable-mdpi/icon.png differ
diff --git a/res/icon.png b/res/icon.png
index 4fb9524..038d85a 100644
Binary files a/res/icon.png and b/res/icon.png differ
diff --git a/www/css/main.css b/www/css/main.css
index 174c418..806e392 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -151,4 +151,36 @@ body {
padding: 0px 5px 0px 5px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
+}
+
+.chatbox {
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+ height: 50%;
+ max-height: 50%;
+ width: 100%;
+}
+
+#chatmsgs {
+ z-index: 9500;
+ top: 0px;
+ width: 100%;
+ height: calc(100% - 35px) !important;
+ display: none;
+ position: absolute;
+ font-family: monospace;
+ color: #ffffff;
+ overflow-x: hidden;
+ overflow-y: auto;
+ overflow-wrap: break-word;
+ word-wrap: break-word;
+ hyphens: auto;
+ word-break: break-all;
+ background: rgba(0,0,0,.8);
+}
+
+.chatbox #chatmsgs .chat-username {
+ color: green;
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/www/js/auth.js b/www/js/auth.js
index 24aff27..bf89c78 100644
--- a/www/js/auth.js
+++ b/www/js/auth.js
@@ -62,8 +62,6 @@ function dologin() {
}
authOpInProgress = true;
$('#errorbase').hide();
- $('#loginBtn').html(' Logging in...');
- $('#loginBtn').attr('disabled', true);
if ($('#usernameBox').val() === "") {
$('#errormsg').text("Error: Missing username.");
$('#errorbase').css('display', 'block');
@@ -71,6 +69,8 @@ function dologin() {
$('#loginBtn').attr('disabled', false);
return;
}
+ $('#loginBtn').attr('disabled', true);
+ $('#loginBtn').html(' Logging in...');
$.post("https://sso.netsyms.com/api/simpleauth.php",
{user: $('#usernameBox').val(), pass: $('#passwordBox').val()},
function (data) {
diff --git a/www/js/comm.js b/www/js/comm.js
deleted file mode 100644
index b5eccfe..0000000
--- a/www/js/comm.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Handles general server communication.
- */
-
-/**
- * Syncs the user's stats with the server and calls refreshStats().
- */
-function syncStats() {
- $.getJSON(mkApiUrl('getstats') + "?user=" + username, null, function (data) {
- if (data.status === 'OK') {
- maxenergy = data.stats.maxenergy;
- energy = data.stats.energy;
- level = data.stats.level;
- refreshStats();
- }
- });
-}
-
-/**
- * Display the current stats on the home screen.
- */
-function refreshStats() {
- energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0;
- $('#energybar').css('width', String(energypercent) + '%');
-}
-
-
-syncStats();
-setInterval(function () {
- syncStats();
-}, 10 * 1000);
\ No newline at end of file
diff --git a/www/js/terrain.js b/www/js/home.js
similarity index 60%
rename from www/js/terrain.js
rename to www/js/home.js
index 34dfa94..44a5e9e 100644
--- a/www/js/terrain.js
+++ b/www/js/home.js
@@ -1,16 +1,22 @@
/* global PositionError */
+//////////////////////////////////////////////
+// GPS and terrain stuff
+//////////////////////////////////////////////
+
/**
* Handles GPS and terrain data.
*/
-var lockGot = false;
-var terrainGot = false;
+// Globals
+lockGot = false;
+terrainGot = false;
+latitude = 0.0000;
+longitude = 0.0000;
+gpsaccuracy = 9999;
+// End Globals
-var latitude = 0.0000;
-var longitude = 0.0000;
var lastgpstime = 0;
-var gpsaccuracy = 9999;
var terraintypeid = 0;
var map = L.map('map');
var tileurl = "http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg";
@@ -130,6 +136,19 @@ function onError(error) {
$('#loading-error').text("Check your device's network and location settings, and ensure a clear view of the sky.");
}
+function popGPS() {
+ navigator.notification.alert("Latitude: " + latitude +
+ "\nLongitude: " + longitude +
+ "\nAccuracy: " + gpsaccuracy +
+ "\nTerrain: " + terraintypename + " (" + terraintypeid + ")",
+ null,
+ "GPS Information",
+ "Close");
+}
+$('#terrain-image').click(function () {
+ popGPS();
+});
+
// Initial GPS position and stuff
navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true});
// Update position
@@ -145,4 +164,125 @@ setInterval(pingServer, 5000);
// Show error if it's taking too long
setTimeout(function () {
onError();
-}, 15 * 1000);
\ No newline at end of file
+}, 15 * 1000);
+
+
+
+
+
+//////////////////////////////////////////////
+// Profile, stats, and chat stuff
+//////////////////////////////////////////////
+
+
+/*
+ * Handles general server communication.
+ */
+
+/**
+ * Syncs the user's stats with the server and calls refreshStats().
+ */
+function syncStats() {
+ $.getJSON(mkApiUrl('getstats') + "?user=" + username, null, function (data) {
+ if (data.status === 'OK') {
+ maxenergy = data.stats.maxenergy;
+ energy = data.stats.energy;
+ level = data.stats.level;
+ refreshStats();
+ }
+ });
+}
+
+/**
+ * Display the current stats on the home screen.
+ */
+function refreshStats() {
+ energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0;
+ $('#energybar').css('width', String(energypercent) + '%');
+}
+
+function getChat() {
+ if (lockGot) {
+ $.getJSON(mkApiUrl('chat', 'cs'), {
+ lat: latitude,
+ long: longitude
+ }, function (data) {
+ data = sortResults(data, 'time', true);
+ var content = "";
+ data.forEach(function (msg) {
+ content += "" + msg.username + " " + msg.message + "
+
+
+
+
+
"; + }); + $('#chatmsgs').html(content); + }); + } +} + + +syncStats(); +setInterval(function () { + syncStats(); +}, 10 * 1000); +setInterval(function () { + getChat(); +}, 2000); + +// Send chat messages +$("#chatsendform").submit(function (event) { + message = $('#chatbox-input').val(); + if (message !== '') { + $.post(mkApiUrl('chat', 'cs'), { + user: username, + lat: latitude, + long: longitude, + msg: message + }, function (data) { + if (data.status === 'OK') { + $('#chatbox-input').val(""); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); + } + }, "json"); + } + event.preventDefault(); + return false; +}); + +function toggleChat() { + if ($('#chatmsgs').css('display') === 'none') { + $('#chatmsgs').css('display', 'block'); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); + } else { + $('#chatmsgs').css('display', 'none'); + } +} + +function openProfile(user) { + user = typeof user !== 'undefined' ? user : username; + $('#main-content').load("screens/profile.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + loadProfile(user); + }); +} + + + + + +////////////////////////////////////////////// +// Other things +////////////////////////////////////////////// + +function closeMain() { + $('#overlay-main').slideDown(100, function () { + $('#overlay-main').css('display', 'none'); + $('#main-content').html(""); + }); +} + +// Handle back button to close things +document.addEventListener("backbutton", function (event) { + if ($('#overlay-main').css('display') !== 'none') { + closeMain(); + } else if ($('#chatmsgs').css('display') !== 'none') { + toggleChat(); + } +}, false); \ No newline at end of file diff --git a/www/js/main.js b/www/js/main.js index 384475a..45ecfa0 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -1,8 +1,3 @@ -/* - * This file loads after JQuery and sets up variables and whatnot. - */ - - // Constants username = ""; password = ""; @@ -26,8 +21,9 @@ function onDeviceReady() { } } -function mkApiUrl(action) { - return "http://gs.terranquest.net/" + action + ".php"; +function mkApiUrl(action, server) { + server = typeof server !== 'undefined' ? server : "gs"; + return "http://" + server + ".terranquest.net/" + action + ".php"; //return "config/" + action + ".json"; } @@ -72,19 +68,10 @@ function scanCode() { } } -function syncEnergy() { - //$('.progress-bar').css('width', valeur+'%').attr('aria-valuenow', valeur); -} - -/** - * Function to enable forcing redraw of elements - * - * redraw('#theElement'); - */ -function redraw(element) { - var n = document.createTextNode(' '); - $(element).append(n); - setTimeout(function () { - n.parentNode.removeChild(n) - }, 0); +function sortResults(array, prop, asc) { + array = array.sort(function(a, b) { + if (asc) return (a[prop] > b[prop]) ? 1 : ((a[prop] < b[prop]) ? -1 : 0); + else return (b[prop] > a[prop]) ? 1 : ((b[prop] < a[prop]) ? -1 : 0); + }); + return array; } \ No newline at end of file diff --git a/www/screens/home.html b/www/screens/home.html index e3ee12c..df580a0 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -31,41 +31,20 @@
Energy
