TerranQuest/App
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix music overlap bug

Browse Source
This commit is contained in:
Skylar Ittner 2016-10-04 01:08:23 -06:00
parent 67427a981b
commit 447aca3a1d
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/clienterror.html
View File

@ -26,10 +26,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<meta http-equiv="Content-Security-Policy" <meta http-equiv="Content-Security-Policy" content="default-src * gap://ready file: data:; style-src 'self' 'unsafe-inline' *; script-src 'self' 'unsafe-inline' 'unsafe-eval' *">
content="default-src *;
style-src * 'self' 'unsafe-inline' 'unsafe-eval';
script-src * 'self' 'unsafe-inline' 'unsafe-eval';">
<title>TerranQuest</title> <title>TerranQuest</title>
@ -41,7 +38,7 @@
<!-- FontAwesome --> <!-- FontAwesome -->
<link href="css/font-awesome.css" rel="stylesheet"> <link href="css/font-awesome.css" rel="stylesheet">
<!-- jQuery Version 1.11.1 --> <!-- jQuery -->
<script src="js/jquery.js"></script> <script src="js/jquery.js"></script>
<!-- i18n --> <!-- i18n -->
<script src="js/jquery.localize.js"></script> <script src="js/jquery.localize.js"></script>
@ -88,8 +85,8 @@
} }
} }
}; };
$(document).ready(function () { $(document).ready(function () {
$('#clientproblemmsg').text(getUrlParameter('errmsg')); $('#clientproblemmsg').text(getUrlParameter('errmsg'));
}); });

5
www/index.html
View File

@ -43,7 +43,7 @@
<link href="css/L.Control.Locate.css" rel="stylesheet"> <link href="css/L.Control.Locate.css" rel="stylesheet">
<link href="css/MarkerCluster.css" rel="stylesheet"> <link href="css/MarkerCluster.css" rel="stylesheet">
<!-- jQuery Version 1.12.4 --> <!-- jQuery -->
<script src="js/jquery.js"></script> <script src="js/jquery.js"></script>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
@ -57,7 +57,7 @@
<!-- Skycons weather icons --> <!-- Skycons weather icons -->
<script src="js/skycons.js"></script> <script src="js/skycons.js"></script>
<script src="js/leaflet.js"></script> <script src="js/leaflet.js"></script>
<script src="js/L.Control.Locate.min.js"></script> <script src="js/L.Control.Locate.min.js"></script>
<script src="js/leaflet.markercluster.js"></script> <script src="js/leaflet.markercluster.js"></script>
@ -77,5 +77,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>

11
www/js/music.js
View File

@ -18,20 +18,31 @@
var AUDIO_WAIT_SECONDS = 10; var AUDIO_WAIT_SECONDS = 10;
var audio_stay_stopped = false; var audio_stay_stopped = false;
var audio_doneplaying = true; var audio_doneplaying = true;
var audio_isplaying = false;
var audio; var audio;
var MUSIC_DIR = getWwwFolderPath() + "assets/audio/"; var MUSIC_DIR = getWwwFolderPath() + "assets/audio/";
function queuesong(song) { function queuesong(song) {
if (audio_isplaying) {
return;
}
audio = new Media(MUSIC_DIR + song, null, null, function (status) { audio = new Media(MUSIC_DIR + song, null, null, function (status) {
if ((status == Media.MEDIA_NONE || status == Media.MEDIA_STOPPED) && !audio_stay_stopped) { if ((status == Media.MEDIA_NONE || status == Media.MEDIA_STOPPED) && !audio_stay_stopped) {
audio_doneplaying = true; audio_doneplaying = true;
audio_isplaying = false;
audio.release();
setTimeout(playAudio, AUDIO_WAIT_SECONDS * 1000); setTimeout(playAudio, AUDIO_WAIT_SECONDS * 1000);
} }
}); });
audio_isplaying = true;
} }
function playAudio() { function playAudio() {
// If something is going on, come back in 10 seconds.
if (audio_doneplaying && audio_isplaying) {
setTimeout(playAudio, 10 * 1000);
}
if (audio_doneplaying) { if (audio_doneplaying) {
if (rawWeatherData.icon == "snow" || rawWeatherData.icon == "fog") { if (rawWeatherData.icon == "snow" || rawWeatherData.icon == "fog") {
queuesong("Sisters of Snow Assent.mp3"); queuesong("Sisters of Snow Assent.mp3");

4
www/screens/home.html
View File

@ -135,8 +135,8 @@
}); });
updateStatusBarColor(); updateStatusBarColor();
setTimeout(playAudio, 10*1000); setTimeout(playAudio, 10 * 1000);
</script> </script>
<script src="js/location.js"></script> <script src="js/location.js"></script>
<script src="js/user.js"></script> <script src="js/user.js"></script>

2
www/screens/munzeelink.html
View File

@ -34,4 +34,4 @@
openscreen("home"); openscreen("home");
} }
}); });
</script> </script>

11
www/servererror.html
View File

@ -26,10 +26,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<meta http-equiv="Content-Security-Policy" <meta http-equiv="Content-Security-Policy" content="default-src * gap://ready file: data:; style-src 'self' 'unsafe-inline' *; script-src 'self' 'unsafe-inline' 'unsafe-eval' *">
content="default-src *;
style-src * 'self' 'unsafe-inline' 'unsafe-eval';
script-src * 'self' 'unsafe-inline' 'unsafe-eval';">
<title>TerranQuest</title> <title>TerranQuest</title>
@ -41,7 +38,7 @@
<!-- FontAwesome --> <!-- FontAwesome -->
<link href="css/font-awesome.css" rel="stylesheet"> <link href="css/font-awesome.css" rel="stylesheet">
<!-- jQuery Version 1.11.1 --> <!-- jQuery -->
<script src="js/jquery.js"></script> <script src="js/jquery.js"></script>
<!-- i18n --> <!-- i18n -->
<script src="js/jquery.localize.js"></script> <script src="js/jquery.localize.js"></script>
@ -92,8 +89,8 @@
} }
} }
}; };
$(document).ready(function () { $(document).ready(function () {
$('#serverproblemmsg').text(getUrlParameter('errmsg')); $('#serverproblemmsg').text(getUrlParameter('errmsg'));
}); });