Bladeren bron

resolves #18

* if socket connection is closed, try to reconnect every second
* added better button aesthetics to 'verifying' screens
abram 5 jaren geleden
bovenliggende
commit
5b55a746b2
2 gewijzigde bestanden met toevoegingen van 55 en 10 verwijderingen
  1. 32 1
      busunit/DIUv2/html/index-ORG.html
  2. 23 9
      busunit/DIUv2/html/js/diu_ui-ORG.js

+ 32 - 1
busunit/DIUv2/html/index-ORG.html

@@ -327,6 +327,18 @@
 
     <div id='ui_driververify' style='display:none;'>
 
+      <div style='width:100%; height:100%;'>
+
+        <div class='pure-g row' style='width:100%; height:100%;' >
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
+            <button class='bstatus bkeyHuge' id='ui_driververify_btn'>Verifying Driver</button>
+          </div>
+        </div>
+
+      </div>
+
+      <!--
+
       <br>
       <div class='pure-g'> </div>
       <br> <br> <br>
@@ -338,6 +350,9 @@
       </div>
 
       <br> <br> <br> 
+
+      -->
+
     </div>
 
 
@@ -354,7 +369,9 @@
       <div style='width:100%; height:100%;'>
 
         <div class='pure-g row' style='width:100%; height:100%;' >
-          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '> <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_driverincorrect_btn'>Incorrect Login</button> </div>
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
+            <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_driverincorrect_btn'>Incorrect Login</button>
+          </div>
         </div>
 
       </div>
@@ -434,6 +451,18 @@
 
     <div id='ui_paddleverify' style='display:none;'>
 
+
+      <div style='width:100%; height:100%;'>
+
+        <div class='pure-g row' style='width:100%; height:100%;' >
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
+            <button class='bstatus bkeyHuge' id='ui_paddleverify_btn'>Verifying Paddle</button>
+          </div>
+        </div>
+
+      </div>
+
+      <!--
       <br>
       <div class='pure-g'> </div>
       <br> <br> <br>
@@ -445,6 +474,8 @@
       </div>
 
       <br> <br> <br> 
+      -->
+
     </div>
 
     <!-- ************************* -->

+ 23 - 9
busunit/DIUv2/html/js/diu_ui-ORG.js

@@ -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
   //