首页 发现
登录
clementinecomputing
/
popufare
1
0
派生 0
文件 工单管理 12 合并请求 0 Wiki
浏览代码

DIU UI updates

* start-kios.sh was having troubles starting without the 'su -c ...'
* positioning the brightness slider
* minor code cleanup and comments (diu_ui-ORG.js)
clementinecomputing 5 年之前
父节点
e13dac6bd1
当前提交
2b6c88ba79
共有 4 个文件被更改，包括 9 次插入 和 12 次删除
分列视图 显示文件统计
  1. 3 8
      busunit/DIUv2/html/index-ORG.html
  2. 2 1
      busunit/DIUv2/html/js/diu_ui-ORG.js
  3. 3 3
      busunit/rootfs/etc/rc.local
  4. 1 0
      busunit/scripts/start-kiosk.sh

+ 3 - 8
busunit/DIUv2/html/index-ORG.html
查看文件 

@@ -33,9 +33,7 @@
 
   <body id='body'>
 
     <div id='dim_overlay'></div>
 
 
-    <div id='ui_test'>
 
-      X
 
-    </div>
 
+    <div id='ui_test'>X</div>
 
 
     <!-- ************************* -->
 
     <!-- ******            ******* -->
 
@@ -125,7 +123,6 @@
 
 
       </div>
 
 
-      <br>
 
       <br>
 
 
       <div class='pure-g row4'>
 
@@ -144,8 +141,6 @@
 
         </div>
 
         <div class='pure-u-1-6 col'> <button class='bdisp' style='font-size:5vh;' id='ui_configuration_displayvolume'>100%</button> </div>
 
 
-
 
-
 
       </div>
 
 
       <br>
 
@@ -167,10 +162,10 @@
 
         </div>
 
         <div class='pure-u-1-6 col'> <button class='bdisp' style='font-size:5vh;' id='ui_configuration_displaybrightness'>100%</button> </div>
 
 
-
 
-
 
       </div>
 
 
+      <br>
 
+      <br>
 
 
       <div class='pure-g row4'>

+ 2 - 1
busunit/DIUv2/html/js/diu_ui-ORG.js
查看文件 

@@ -481,7 +481,6 @@ function _driver_login(inp) {
 
 
   var n = g_ctx[uvar].length;
 
 
-  //if (inp == 'cancel') { _switch_ui('ui_driver', 'ui_login'); }
 
   if (inp == 'cancel') { _switch_ui('ui_login'); }
 
   else if (inp == 'ok')     {
 
 
@@ -492,6 +491,8 @@ function _driver_login(inp) {
 
       ele = document.getElementById("ui_driver_driver");
 
       ele.style.background = "#aaaaaa";
 
 
+      // Show 'pin' box now that the 'driver' box has been filled
 
+      //
 
       ele = document.getElementById("ui_driver_pin");
 
       ele.style.display = "block";
 
       ele = document.getElementById("ui_driver_pin_text");

+ 3 - 3
busunit/rootfs/etc/rc.local
查看文件 

@@ -40,8 +40,8 @@ sleep 2
 
 vcgencmd force_audio hdmi 1 >> /tmp/audio.log 2>&1 &
 
 sleep 1
 
 
-#xinit /home/bus/bin/start-kiosk.sh >> /tmp/kiosk.log 2>&1 &
 
-#su -l pi -c /usr/bin/startx /home/bus/bin/start-kiosk.sh >> /tmp/kiosk.log 2>&1 &
 
-( sleep 5 && /usr/bin/startx /home/bus/bin/start-kiosk.sh >> /tmp/kiosk.log 2>&1 ) &
 
+# for some reason 'start-kiosk.sh' is having trouble starting without the 'su'
 
+#
 
+( sleep 5 && su -c " /usr/bin/startx /home/bus/bin/start-kiosk.sh >> /tmp/kiosk.log 2>&1"  ) &
 
 
 exit 0

+ 1 - 0
busunit/scripts/start-kiosk.sh
查看文件 

@@ -61,6 +61,7 @@ echo "XAUTHORITY=$XAUTHORITY" >> /tmp/kiosk.info
 
   --incognito \
 
   --disable-pinch \
 
   --overscroll-history-navigation=0 \
 
+  --disable-gpu \
 
   --kiosk \
 
   'http://localhost:60535'