修改服務啟動動作與QRCode產生按鈕

1.啟動時連接印表機
2.判斷是否要開啟藍芽
3.畫面加入QRCode產生按鈕,方便APP設定
This commit is contained in:
Jay
2017-09-07 23:40:51 +08:00
parent 593c017a08
commit a7f7653efa
10 changed files with 88 additions and 21 deletions
+42 -7
View File
@@ -1,5 +1,10 @@
<div class="ui container">
<div class="ui grid">
<div class="column sixteen wide t-right">
<div class="ui segment">
<button class="ui button mini" type="button" id="gen-qr">GenerateQR</button>
</div>
</div>
<div class="column eight wide">
<div class="segment ui">
<h4 class="ui header dividing">藍芽狀態</h4>
@@ -30,16 +35,16 @@
<div class="ui divided list">
<div class="item">
<div class="ui horizontal label basic">連線狀態</div>
<div class="description t-right" id="prt-con">Disconnect</div>
<div class="description t-right" id="prt-con">Disconnected</div>
</div>
<div class="item">
<div class="ui horizontal label basic">連接埠</div>
<div class="description t-right" id="prt-port">/dev/ttyUSB0</div>
</div>
<div class="item">
<div class="ui horizontal label basic">切紙前空行</div>
<div class="description t-right" id="prt-feed">8</div>
</div>
<div class="ui horizontal label basic">切紙前空行</div>
<div class="description t-right" id="prt-feed">8</div>
</div>
</div>
</div>
</div>
@@ -65,7 +70,19 @@
</div>
</div>
<div class="ui page dimmer" id="qr-dimmer">
<div class="content">
<div class="center" id="qr"></div>
</div>
</div>
<script>
var setting = {
mac: '',
service: '',
characteristic: ''
}
var ws = new WebSocket('ws://' + location.host)
ws.onmessage = msg => {
// console.log(msg)
@@ -76,16 +93,20 @@
return
}
switch(data.type) {
switch (data.type) {
case 'status':
console.log(data)
console.log(data)
let d = data.data
$('#en-ble').text(d.ble.enable ? 'On' : 'Off')
$('#ble-mac').text(d.ble.mac)
$('#ble-service').text(d.ble.service)
$('#ble-character').text(d.ble.characteristic)
$('#prt-con').text(d.printer.connect ? 'Connect' : 'Disconnect')
setting.mac = d.ble.mac
setting.service = d.ble.service
setting.characteristic = d.ble.characteristic
$('#prt-con').text(d.printer.connect ? 'Connected' : 'Disconnected')
$('#prt-port').text(d.printer.serial)
$('#prt-feed').text(d.printer.feed)
@@ -95,4 +116,18 @@
break
}
}
$('#gen-qr').click(function () {
let qrdiv = document.querySelector('div#qr')
qrdiv.innerHTML = ''
let qr = new QRCode(qrdiv, {
text: JSON.stringify(setting, null, 2),
colorDark: "#000000",
colorLight: "#ffffff",
correctLevel: QRCode.CorrectLevel.L
})
// qr.makeCode(JSON.stringify(setting, null, 2))
$('#qr-dimmer').dimmer('show')
})
</script>