|
|
@@ -27,8 +27,8 @@ var _fqADDRESS = _ADDRESS + ":" + _PORT;
|
|
|
var BG_COLOR = "#f7f7f7";
|
|
|
var TEXT_COLOR = "#444444";
|
|
|
|
|
|
-var DIU_UI_VERSION = "0.1.8";
|
|
|
-var DIU_UI_VERSION_DATE = "2019-12-10";
|
|
|
+var DIU_UI_VERSION = "0.1.9";
|
|
|
+var DIU_UI_VERSION_DATE = "2020-01-30";
|
|
|
|
|
|
var g_snd = {
|
|
|
"reject_fare" : "",
|
|
|
@@ -326,9 +326,11 @@ function _verify_driver() {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-function _verify_driver_ok() { _switch_ui("ui_paddle"); }
|
|
|
-function _verify_driver_fail() { _switch_ui("ui_driverincorrect"); }
|
|
|
+function _verify_driver_ok() { console.log("driver ok"); _switch_ui("ui_paddle"); }
|
|
|
+function _verify_driver_fail() { console.log("driver fail"); _switch_ui("ui_driverincorrect"); }
|
|
|
function _driver_incorrect(inp) {
|
|
|
+ console.log("driver incorrect");
|
|
|
+
|
|
|
_clear_ui_driver();
|
|
|
_switch_ui("ui_driver");
|
|
|
}
|
|
|
@@ -415,10 +417,13 @@ function _verify_paddle() {
|
|
|
}
|
|
|
|
|
|
function _verify_paddle_ack() { console.log("got ack for push paddle message\n"); }
|
|
|
-function _verify_paddle_ok() { _switch_ui("ui_main"); }
|
|
|
-function _verify_paddle_fail() { _switch_ui("ui_paddleunknown"); }
|
|
|
+function _verify_paddle_ok() { console.log("verify paddle ok"); _switch_ui("ui_main"); }
|
|
|
+function _verify_paddle_fail() { console.log("verify paddle fail"); _switch_ui("ui_paddleunknown"); }
|
|
|
|
|
|
function _paddle_unknown(inp) {
|
|
|
+
|
|
|
+ console.log("paddle unknown...");
|
|
|
+
|
|
|
_clear_ui_paddle();
|
|
|
_switch_ui("ui_paddle");
|
|
|
}
|
|
|
@@ -839,6 +844,8 @@ function _main_message_add(msg, bg_color, text_color) {
|
|
|
|
|
|
function _ws_process(dat) {
|
|
|
|
|
|
+ console.log("_ws_process:", dat);
|
|
|
+
|
|
|
var tok = dat.split(" ");
|
|
|
|
|
|
if (tok.length < 2) { return; }
|
|
|
@@ -872,8 +879,15 @@ function _init_websocket() {
|
|
|
|
|
|
sock.onopen = function(e) { console.log("open", e); }
|
|
|
sock.onmessage = function(e) { _ws_process(e.data); }
|
|
|
- sock.onclose = function(e) { console.log("close", e); }
|
|
|
- sock.onerror = function(e) { console.log("error", e); }
|
|
|
+
|
|
|
+ sock.onclose = function(e) {
|
|
|
+ console.log("close", e);
|
|
|
+ setTimeout( function() { _init_websocket(); }, 1000);
|
|
|
+ }
|
|
|
+
|
|
|
+ sock.onerror = function(e) {
|
|
|
+ console.log("error", e);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//-------------
|
|
|
@@ -1122,7 +1136,7 @@ function init() {
|
|
|
document.getElementById('ui_login_login').onclick = _login;
|
|
|
document.getElementById('ui_login_configuration').onclick = _configuration;
|
|
|
document.getElementById('ui_driverincorrect_btn').onclick = _driver_incorrect;
|
|
|
- document.getElementById('ui_paddleunknown_btn').onclick = _paddle_unknown;;
|
|
|
+ document.getElementById('ui_paddleunknown_btn').onclick = _paddle_unknown;
|
|
|
|
|
|
// main menu buttons
|
|
|
//
|