gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified web interface to display log files correctly (removed jquery-mobile)

Browse Source
This commit is contained in:
Graham Jones
2016-07-25 21:44:04 +01:00
parent 121b36987b
commit 426d363577
5 changed files with 131 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/assets/www/index.html
View File

@@ -1,15 +1,13 @@
<html> <html>
<head> <head>
<title>Ben's Pebble Watch Seizure Detector</title> <title>Open Seizure Detector</title>
<script src="js/jquery.js"></script> <script src="js/jquery.js"></script>
<script src="js/jBeep.js"></script> <script src="js/jBeep.js"></script>
<script src="js/Chart.min.js"></script> <script src="js/Chart.min.js"></script>
<script src="js/jquery.mobile-1.4.5.min.js"></script>
<script src="js/osd_main.js"></script> <script src="js/osd_main.js"></script>
<script src="js/osd_logs.js"></script> <script src="js/osd_logs.js"></script>
<link rel="stylesheet" href="css/osd.css" /> <link rel="stylesheet" href="css/osd.css" />
<link rel="stylesheet" href="css/jquery.mobile-1.4.5.min.css" />
</head> </head>
<body> <body>
@@ -77,23 +75,11 @@
</div> </div>
</div> <!-- content --> </div> <!-- content -->
<div data-role="footer"> <div data-role="footer">
<a href="#logs">Logs</a> <a href="logfiles.html">View Log Files</a>
<div id="debugInfo"></div> <div id="debugInfo"></div>
</div> <!--footer--> </div> <!--footer-->
</div> <!--page --> </div> <!--page -->
<div data-role="page" id="logs">
<div data-role="header">
<img src="img/icon_48x48.png" alt="logo"/>
<h1>Open Seizure Detector - Logs</h1>
</div>
<div role="main" class="ui-content">
<div id="logfilelist"> </div>
</div>
<div data-role="footer">
<a href="#home">Home</a>
</div>
</div>
</body> </body>
</html> </html>

99
app/src/main/assets/www/index_orig.html Normal file
View File

@@ -0,0 +1,99 @@
<html>
<head>
<title>Ben's Pebble Watch Seizure Detector</title>
<script src="js/jquery.js"></script>
<script src="js/jBeep.js"></script>
<script src="js/Chart.min.js"></script>
<script src="js/jquery.mobile-1.4.5.min.js"></script>
<script src="js/osd_main.js"></script>
<script src="js/osd_logs.js"></script>
<link rel="stylesheet" href="css/osd.css" />
<link rel="stylesheet" href="css/jquery.mobile-1.4.5.min.css" />
</head>
<body>
<div data-role="page" id="home">
<div id="header" data-role="header">
<img src="img/icon_48x48.png" alt="logo"/>
<h1>Open Seizure Detector</h1>
</div>
<div role="main" class="ui-content">
<div id="benStat">
OK
</div>
<div style="clear:both">
<div id="pebStat1">
<font size="7">Pebble Watch Connected</font>
</div>
<div id="pebStat2">
<font size="7">Pebble App Running</font>
</div>
<div id="pebStat3">
Pebble Battery
</div>
</div>
<div id="chartsDiv">
<canvas id="specChart1" width="400" height="300"></canvas>
<canvas id="specChart2" width="400" height="300"></canvas>
</div>
<div id="dataDiv">
<h2>Seizure Detector Data</h2>
<div id="maxFreq">
Maximum Frequency:
</div>
<div id="maxVal">
Maximum Value:
</div>
<div id="specPow">
Spectrum Power:
</div>
<div id="roiPow">
Region Of Interest Power:
</div>
<div id="alarmState">
Alarm Status:
</div>
<div id="alarmPhrase">
Alarm Phrase:
</div>
</div>
<div id="settingsDiv">
<h2>Seizure Detector Settings</h2>
<button id="muteButton">Mute Alarm</button>
<div id="sdSettings">
SD Settings
</div>
</div>
<div style="clear:both">
<p>
For details see
<a href="http://openseizuredetector.org.uk">
OpenSeizureDetector.org.uk
</a>
</p>
</div>
</div> <!-- content -->
<div data-role="footer">
<a href="#logs">Logs</a>
<div id="debugInfo"></div>
</div> <!--footer-->
</div> <!--page -->
<div data-role="page" id="logs">
<div data-role="header">
<img src="img/icon_48x48.png" alt="logo"/>
<h1>Open Seizure Detector - Logs</h1>
</div>
<div role="main" class="ui-content">
<div id="logfilelist"> </div>
</div>
<div data-role="footer">
<a href="#home">Home</a>
</div>
</div>
</body>
</html>

2
app/src/main/assets/www/js/osd_logs.js
View File

@@ -21,7 +21,7 @@ function populate_filelist(dataStr) {
$(document).delegate("#logs","pageinit", function() { $(document).ready(function() {
//alert("logs page opened"); //alert("logs page opened");
get_filelist(); get_filelist();
}); });

28
app/src/main/assets/www/logfiles.html Normal file
View File

@@ -0,0 +1,28 @@
<html>
<head>
<title>Open Seizure Detector</title>
<script src="js/jquery.js"></script>
<script src="js/jBeep.js"></script>
<script src="js/Chart.min.js"></script>
<script src="js/osd_main.js"></script>
<script src="js/osd_logs.js"></script>
<link rel="stylesheet" href="css/osd.css" />
</head>
<body>
<div data-role="page" id="logs">
<div data-role="header">
<a href="/"><img src="img/icon_48x48.png" alt="logo"/></a>
<h1>Open Seizure Detector - Logs</h1>
</div>
<div role="main" class="ui-content">
<div id="logfilelist"> </div>
</div>
<div data-role="footer">
<a href="/">Home</a>
</div>
</div>
</body>
</html>

1
app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
View File

@@ -112,6 +112,7 @@ public class SdWebServer extends NanoHTTPD {
default: default:
if (uri.startsWith("/index.html") || if (uri.startsWith("/index.html") ||
uri.startsWith("/logfiles.html") ||
uri.startsWith("/favicon.ico") || uri.startsWith("/favicon.ico") ||
uri.startsWith("/js/") || uri.startsWith("/js/") ||
uri.startsWith("/css/") || uri.startsWith("/css/") ||