Added ability to specify how many results will be returned
This commit is contained in:
parent
f72afb66e5
commit
f1237e0dc4
3 changed files with 29 additions and 15 deletions
|
@ -43,10 +43,10 @@ public class Main {
|
|||
}
|
||||
|
||||
private static void refresh() throws IOException {
|
||||
data.put(conf.getString("monitors.monitor1.DepartureTime"),check.getStatus(conf.getString("monitors.monitor1.Station"),conf.getString("monitors.monitor1.DepartureTime"), conf.getString("monitors.monitor1.FinalStop"),conf.getString("monitors.monitor1.TrainType")));
|
||||
data.put(conf.getString("monitors.monitor2.DepartureTime"),check.getStatus(conf.getString("monitors.monitor2.Station"),conf.getString("monitors.monitor2.DepartureTime"), conf.getString("monitors.monitor2.FinalStop"),conf.getString("monitors.monitor2.TrainType")));
|
||||
data.put(conf.getString("monitors.monitor3.DepartureTime"),check.getStatus(conf.getString("monitors.monitor3.Station"),conf.getString("monitors.monitor3.DepartureTime"), conf.getString("monitors.monitor3.FinalStop"),conf.getString("monitors.monitor3.TrainType")));
|
||||
data.put(conf.getString("monitors.monitor4.DepartureTime"),check.getStatus(conf.getString("monitors.monitor4.Station"),conf.getString("monitors.monitor4.DepartureTime"), conf.getString("monitors.monitor4.FinalStop"),conf.getString("monitors.monitor4.TrainType")));
|
||||
data.put(conf.getString("monitors.monitor1.DepartureTime"),check.getStatus(conf.getString("monitors.monitor1.Station"),conf.getString("monitors.monitor1.DepartureTime"), conf.getString("monitors.monitor1.FinalStop"),conf.getString("monitors.monitor1.TrainType"),String.valueOf(conf.getInt("monitors.monitor1.maxjourneys"))));
|
||||
data.put(conf.getString("monitors.monitor2.DepartureTime"),check.getStatus(conf.getString("monitors.monitor2.Station"),conf.getString("monitors.monitor2.DepartureTime"), conf.getString("monitors.monitor2.FinalStop"),conf.getString("monitors.monitor2.TrainType"),String.valueOf(conf.getInt("monitors.monitor2.maxjourneys"))));
|
||||
data.put(conf.getString("monitors.monitor3.DepartureTime"),check.getStatus(conf.getString("monitors.monitor3.Station"),conf.getString("monitors.monitor3.DepartureTime"), conf.getString("monitors.monitor3.FinalStop"),conf.getString("monitors.monitor3.TrainType"),String.valueOf(conf.getInt("monitors.monitor3.maxjourneys"))));
|
||||
data.put(conf.getString("monitors.monitor4.DepartureTime"),check.getStatus(conf.getString("monitors.monitor4.Station"),conf.getString("monitors.monitor4.DepartureTime"), conf.getString("monitors.monitor4.FinalStop"),conf.getString("monitors.monitor4.TrainType"),String.valueOf(conf.getInt("monitors.monitor4.maxjourneys"))));
|
||||
time = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
|
@ -69,6 +69,11 @@ public class Main {
|
|||
private static String createOutput(){
|
||||
JSONArray dat = new JSONArray();
|
||||
Date updatetime = new Date(time);
|
||||
JSONObject displays = new JSONObject();
|
||||
JSONArray display = new JSONArray();
|
||||
JSONObject refresh = new JSONObject();
|
||||
refresh.put("interval",conf.getInt("refreshTime"));
|
||||
dat.put(refresh);
|
||||
JSONObject monitor1 = new JSONObject();
|
||||
monitor1.put("label","Zug");
|
||||
JSONArray layout = new JSONArray();
|
||||
|
@ -95,36 +100,41 @@ public class Main {
|
|||
monitor1.put("labelColor","red");
|
||||
monitor1.put("color","red");
|
||||
monitor1.put("background","silver");
|
||||
dat.put(monitor1);
|
||||
display.put(monitor1);
|
||||
|
||||
JSONObject monitor2 = new JSONObject();
|
||||
monitor2.put("label",conf.getString("monitors.monitor1.Title"));
|
||||
monitor2.put("labelColor","green");
|
||||
monitor2.put("fullDraw",true);
|
||||
int zug1 = data.get(conf.getString("monitors.monitor1.DepartureTime"));
|
||||
makeLabel(monitor2, zug1);
|
||||
dat.put(monitor2);
|
||||
display.put(monitor2);
|
||||
|
||||
JSONObject monitor3 = new JSONObject();
|
||||
monitor3.put("label",conf.getString("monitors.monitor2.Title"));
|
||||
monitor3.put("labelColor","green");
|
||||
monitor3.put("fullDraw",true);
|
||||
int zug2 = data.get(conf.getString("monitors.monitor2.DepartureTime"));
|
||||
makeLabel(monitor3, zug2);
|
||||
dat.put(monitor3);
|
||||
display.put(monitor3);
|
||||
|
||||
JSONObject monitor4 = new JSONObject();
|
||||
monitor4.put("label",conf.getString("monitors.monitor3.Title"));
|
||||
monitor4.put("labelColor","green");
|
||||
monitor4.put("fullDraw",true);
|
||||
int zug3 = data.get(conf.getString("monitors.monitor3.DepartureTime"));
|
||||
makeLabel(monitor4, zug3);
|
||||
dat.put(monitor4);
|
||||
display.put(monitor4);
|
||||
|
||||
JSONObject monitor5 = new JSONObject();
|
||||
monitor5.put("label",conf.getString("monitors.monitor4.Title"));
|
||||
monitor5.put("labelColor","green");
|
||||
monitor5.put("fullDraw",true);
|
||||
int zug4 = data.get(conf.getString("monitors.monitor4.DepartureTime"));
|
||||
makeLabel(monitor5, zug4);
|
||||
dat.put(monitor5);
|
||||
|
||||
display.put(monitor5);
|
||||
displays.put("displays", display);
|
||||
dat.put(displays);
|
||||
return dat.toString();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue