From fb246a7a31edf171e4323bc1ddefd8938f0ddb4f Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期一, 09 九月 2024 10:46:40 +0800
Subject: [PATCH] 工单报检增加平板扫码
---
pages/CangKuManage/GS_WOBJ.html | 5 +++--
unpackage/release/H546D0BA6.wgt | 0
pages/CangKuManage/print_setting.html | 9 ++++++++-
js/CangKuManage_js/GS_WOBJ.js | 26 ++++++++++++++++++++++++++
manifest.json | 7 ++-----
5 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/js/CangKuManage_js/GS_WOBJ.js b/js/CangKuManage_js/GS_WOBJ.js
index b9e2321..c2f1bba 100644
--- a/js/CangKuManage_js/GS_WOBJ.js
+++ b/js/CangKuManage_js/GS_WOBJ.js
@@ -130,6 +130,32 @@
//fetchCYSData();
}
)
+
+
+document.getElementById('saomiaolb').addEventListener('tap', function() {
+ console.log(12);
+ var url = 'getScanCode1.html';
+ mui.openWindow({
+
+ url: url,
+ extras: {},
+ waiting: {
+ autoShow: true,
+ title: '鍔犺浇涓�'
+ }
+ });
+
+ }, false)
+
+
+ function scaned(t, r, f) {
+ console.log(r);
+ $("#DAB001").val(r);
+
+ GetBJINFO();
+ }
+
+
function populateTable(data) {
diff --git a/manifest.json b/manifest.json
index fcb145e..e9d6552 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
"id" : "H546D0BA6", /*搴旂敤鐨勬爣璇�*/
"name" : "YKD_MES", /*搴旂敤鍚嶇О锛岀▼搴忔闈㈠浘鏍囧悕绉�*/
"version" : {
- "name" : "3.64", /*搴旂敤鐗堟湰鍚嶇О*/
+ "name" : "3.65", /*搴旂敤鐗堟湰鍚嶇О*/
"code" : "100"
},
"description" : "", /*搴旂敤鎻忚堪淇℃伅*/
@@ -152,10 +152,7 @@
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_ADVERTISE\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/>"
+ "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
diff --git a/pages/CangKuManage/GS_WOBJ.html b/pages/CangKuManage/GS_WOBJ.html
index cb33964..55e5ca7 100644
--- a/pages/CangKuManage/GS_WOBJ.html
+++ b/pages/CangKuManage/GS_WOBJ.html
@@ -36,8 +36,9 @@
<div class="mui-input-group mui-content">
<div class="mui-input-row" id="row001">
- <label>鏉＄爜</label>
- <input id="DAB001" type="text" value="" class="mui-input-clear text-color" placeholder="璇锋壂鎻忔潯鐮�" onkeypress="GetBJINFO()" />
+
+ <label id="saomiaolb" style="color:#0062CC">鐐瑰嚮鍚姩鎵弿</label>
+ <input id="DAB001" type="text" value="" class="mui-input-clear text-color" placeholder="璇锋壂鎻忔潯鐮�" onkeypress="GetBJINFO()" />
</div>
<div class="mui-input-row" id="row001">
<label>鎸囦护鍗曞彿</label>
diff --git a/pages/CangKuManage/print_setting.html b/pages/CangKuManage/print_setting.html
index 8cb2df1..320655a 100644
--- a/pages/CangKuManage/print_setting.html
+++ b/pages/CangKuManage/print_setting.html
@@ -118,11 +118,18 @@
var address_mac = api_localStorageGet("printMac") ? api_localStorageGet("printMac") :
"DC:1D:30:3F:D2:50";
device = BAdapter.getRemoteDevice(address_mac);
-
+
+
+ plus.android.requestPermissions(['android.permission.BLUETOOTH_SCAN','android.permission.BLUETOOTH_CONNECT']);
+
+ console.log(231);
+
plus.android.importClass(device);
bluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(uuid);
+ console.log(231);
+
console.log(JSON.stringify(bluetoothSocket, null, 2));
plus.android.importClass(bluetoothSocket);
diff --git a/unpackage/release/H546D0BA6.wgt b/unpackage/release/H546D0BA6.wgt
index 7e8a8f3..f25a87c 100644
--- a/unpackage/release/H546D0BA6.wgt
+++ b/unpackage/release/H546D0BA6.wgt
Binary files differ
--
Gitblit v1.9.3