From 619b47962e41f506baf7ce2b535b2de1fecc719e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 19 六月 2025 10:58:49 +0800
Subject: [PATCH] rfid扫描添加原生插件
---
nativeplugins/rfid/package.json | 24 +++
pages/modal/3018_2.vue | 42 -----
libs/mobox.api.js | 2
pages/modal/5602.vue | 4
pages/modal/5601.vue | 4
pages/modal/3037_2.vue | 8
pages/modal/3202.vue | 4
pages/modal/ms_classAttr.vue | 26 +-
pages/index/index.vue | 7 -
App.vue | 154 +++++++++++++--------
nativeplugins/rfid/android/rfid-release.aar | 0
pages/modal/form/index.vue | 4
pages/modal/3018.vue | 13 -
.hbuilderx/launch.json | 29 ++--
components/oi-form/list/input/index.vue | 10 +
pages/modal/3037.vue | 24 +-
pages/modal/3200.vue | 4
manifest.json | 24 ++
pages/modal/5600.vue | 4
pages/modal/classAttr.vue | 14 +-
20 files changed, 219 insertions(+), 182 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 2521efd..48192b1 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -4,23 +4,24 @@
"version" : "0.0",
"configurations" : [
{
- "app-plus" :
- {
- "launchtype" : "local"
- },
- "default" :
- {
- "launchtype" : "local"
- },
- "h5" :
- {
- "launchtype" : "local"
- },
- "type" : "uniCloud"
+ "app-plus" : {
+ "launchtype" : "local"
+ },
+ "default" : {
+ "launchtype" : "local"
+ },
+ "h5" : {
+ "launchtype" : "local"
+ },
+ "type" : "uniCloud"
+ },
+ {
+ "playground" : "custom",
+ "type" : "uni-app:app-android"
},
{
"playground" : "standard",
- "type" : "uni-app:app-android"
+ "type" : "uni-app:app-ios"
}
]
}
diff --git a/App.vue b/App.vue
index 66024d6..c4feda8 100644
--- a/App.vue
+++ b/App.vue
@@ -3,6 +3,8 @@
showModal,
showToast,
} from "@/js/Page.js"
+ const rfidModule = uni.requireNativePlugin('RFIDModule');
+ var main
export default {
globalData: {
largeMode: false,
@@ -33,13 +35,19 @@
onLaunch: function() {
console.log('App Launch');
this.deviceInfo = uni.getSystemInfoSync();
- this.initscan();
+ this.init();
},
onUnload() {
- // // 姹夊痉闇嶅皵 PDA rfid鎵爜椤甸潰鍗歌浇鏃堕噴鏀捐祫婧�- // const rfidModule = uni.requireNativePlugin('HandheldRFID');
- // rfidModule.closeModule();
+ if (this.deviceInfo?.brand.includes('alps')) { // 姹夊痉闇嶅皵璁惧鐗瑰緛
+ // 姹夊痉闇嶅皵 PDA rfid鎵爜椤甸潰鍗歌浇鏃堕噴鏀捐祫婧�+ if (rfidModule) {
+ rfidModule.closeModule();
+ }
+ } else {
+ main.unregisterReceiver(receiver); // 鍋滄鐩戝惉骞挎挱
+ }
+
},
onShow: function() {
@@ -48,67 +56,95 @@
onHide: function() {
console.log('App Hide')
},
+ onError(err) {
+ console.error('[UniApp Error]', err)
+ // 鍙笂鎶ュ埌鏈嶅姟鍣�+ },
methods: {
- initscan() {
- let that = this;
- console.log("deviceInfo", this.deviceInfo)
- if (this.deviceInfo?.brand.includes('alps')) { // 姹夊痉闇嶅皵璁惧鐗瑰緛
-
- // const rfidModule = uni.requireNativePlugin('HandheldRFID');
- // console.log("rfidModule",rfidModule)
- // rfidModule.initModule((res) => {
- // console.log("rfid initModule", res)
- // })
- } else {
- var main = plus.android.runtimeMainActivity() //鑾峰彇activity
- var IntentFilter = plus.android.importClass('android.content.IntentFilter') //寮曞叆杩囨护鍣�- // Intent = plus.android.importClass('android.content.Intent'),
- var filter = new IntentFilter()
- var receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
- onReceive: function(context, intent) { //瀹炵幇onReceiver鍥炶皟鍑芥暟
- //console.log('onReceive',intent);
- plus.android.importClass(intent);
- var decodesource = intent.getStringExtra("com.symbol.datawedge.source");
- var decodedata = intent.getStringExtra("com.symbol.datawedge.data_string");
- var data = intent.getStringExtra("data");
- var decodelabeltype = intent.getStringExtra("com.symbol.datawedge.label_type");
- var scanResult = {
- decodesource,
- decodedata: decodedata || data,
- decodelabeltype,
- };
- console.log('onReceive', scanResult);
- uni.$emit("scanresult", scanResult);
- }
- });
- filter.addAction("com.pda.formobox"); //鐩戝惉鎵爜骞挎挱
- filter.addAction('com.rfid.scan') //
- main.registerReceiver(receiver, filter); //娉ㄥ唽鐩戝惉
+ init() {
+ let that = this;
+
+ if (this.deviceInfo?.brand.includes('alps')) { // 姹夊痉闇嶅皵璁惧鐗瑰緛
+
+ rfidModule.initModule((res) => {
+ console.log("rfid initModule", res)
+ if (res.code < 0) {
+ showToast(res.msg);
+ }
+
+ })
+ } else if (this.deviceInfo?.brand.includes('mobiwire') || this.deviceInfo?.deviceBrand.includes(
+ 'mobiwire')) { // 闇嶅凹闊﹀皵
+
+ this.initMobiwireScan()
+ } else {
+
+ this.initScan()
}
},
+ initMobiwireScan() {
+ main = plus.android.runtimeMainActivity(); // 鑾峰彇涓�activity
+ var IntentFilter = plus.android.importClass("android.content.IntentFilter");
+ var filter = new IntentFilter();
+ const action = "com.rfid.scan" //榛樿骞挎挱 com.honeywell.scan.broadcast
+ const stringExtra = "data"
+ filter.addAction(action); // 娣诲姞骞挎挱鍔ㄤ綔
+
+ receiver = plus.android.implements("io.dcloud.feature.internal.reflect.BroadcastReceiver", {
+ onReceive: function(context, intent) {
+ plus.android.importClass(intent);
+ let code = intent.getStringExtra(stringExtra); // 鑾峰彇骞挎挱涓殑瀛楃涓查澶栧弬鏁�+ uni.$emit("scanresult", code);
+ },
+ });
+ main.registerReceiver(receiver, filter); // 寮�鐩戝惉骞挎挱
+
+ },
+
+ initScan() {
+ main = plus.android.runtimeMainActivity() //鑾峰彇activity
+ var IntentFilter = plus.android.importClass('android.content.IntentFilter') //寮曞叆杩囨护鍣�+ // Intent = plus.android.importClass('android.content.Intent'),
+ var filter = new IntentFilter()
+ var receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
+ onReceive: function(context, intent) { //瀹炵幇onReceiver鍥炶皟鍑芥暟
+ //console.log('onReceive',intent);
+ plus.android.importClass(intent);
+ // var decodesource = intent.getStringExtra("com.symbol.datawedge.source");
+ var decodedata = intent.getStringExtra("com.symbol.datawedge.data_string");
+ var data = intent.getStringExtra("data");
+ // var decodelabeltype = intent.getStringExtra("com.symbol.datawedge.label_type");
+ var scanResult = decodedata || data
+ console.log('onReceive', scanResult);
+ uni.$emit("scanresult", scanResult);
+ }
+ });
+
+ filter.addAction("com.pda.formobox"); //鐩戝惉鎵爜骞挎挱
+ filter.addAction('com.rfid.scan') //
+ main.registerReceiver(receiver, filter); //娉ㄥ唽鐩戝惉
+ },
onScan(callback) {
- console.log('onScan');
if (this.deviceInfo?.brand.includes('alps')) { // 姹夊痉闇嶅皵璁惧鐗瑰緛
- // const rfidModule = uni.requireNativePlugin('HandheldRFID');
- // rfidModule.startScan((res) => {
- // if (res.code) {
- // console.log(res)
- // let data = res.data || ""
- // if (Array.isArray(data)) {
- // data = data.map((a) => a.epc).join(",")
- // }
- // var scanResult = {
- // decodesource: "epc",
- // decodedata: data,
- // decodelabeltype: "",
- // };
- // console.log(scanResult)
- // callback(scanResult);
- // } else {
- // console.log("rfid startScan", res)
- // }
- // })
+ if (!rfidModule)
+ return
+ rfidModule.startScan((ret) => {
+ console.log("startScan", ret)
+ let text = ""
+ if (ret.code < 0) {
+ showToast(ret.msg);
+ } else {
+ const data = ret.data || []
+ if (Array.isArray(data)) {
+ if (data.length > 0)
+ text = data[0].epc
+ } else {
+ text = data.epc || ""
+ }
+ callback(text);
+ }
+ })
} else {
uni.$off("scanresult");
uni.$on("scanresult", (result) => {
diff --git a/components/oi-form/list/input/index.vue b/components/oi-form/list/input/index.vue
index 47c85ff..c6b029d 100644
--- a/components/oi-form/list/input/index.vue
+++ b/components/oi-form/list/input/index.vue
@@ -8,7 +8,7 @@
@blur="onChange" @confirm="onConfirm" @click="onClick" :disabled="data.disabled" :maxlength="-1"></input>
<input v-else class="oi-input" :class="data.disabled?'input-disabled':''"
:style="{'padding-left':data.setting.prefix?0 : '8rpx','right':data.setting.suffix?0 : '8rpx'}"
- v-model="data.value" :focus="focus" :placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm"
+ v-model="data.value" :focus="focus" :placeholder="data.placeholder" @focus="onFocus" @blur="onChange" @confirm="onConfirm"
@click="onClick" :disabled="data.disabled"></input>
<text v-if="data.setting.suffix&& !viewMode" class="form-input-icon" :class="[data.setting.suffix]"
@click="onSuffixButton"></text>
@@ -55,6 +55,14 @@
this.$emit("on-click", e)
},
onFocus(e) {
+ // getApp().onScan((result) => {
+ // if (!this.viewMode && !this.data.disabled) {
+ // if (this.model)
+ // this.model[data.fieldId] = result
+ // else
+ // this.data.value = result
+ // }
+ // })
this.$emit("on-focus", e)
},
onPrefixButton() {
diff --git a/libs/mobox.api.js b/libs/mobox.api.js
index aa3f6bd..3ef2617 100644
--- a/libs/mobox.api.js
+++ b/libs/mobox.api.js
@@ -12,7 +12,7 @@
options.method = options.method || this.common.method;
options.dataType = options.dataType || this.common.dataType;
return new Promise((resolve, reject) => {
- //console.log("request:", options);
+ console.log("request:", options);
const app = getApp()
let url = options.url
let sessionID = app.globalData.sessionId || ""
diff --git a/manifest.json b/manifest.json
index 71004fd..d53110a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.59",
- "versionCode" : 1159,
+ "versionName" : "1.1.61",
+ "versionCode" : 1161,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -40,7 +40,8 @@
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NOTIFICATION_POLICY\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
"schemes" : "wmspda"
@@ -55,7 +56,22 @@
"ad" : {}
}
},
- "nativePlugins" : {}
+ "nativePlugins" : {
+ "rfid" : {
+ "__plugin_info__" : {
+ "name" : "rfid",
+ "description" : "My rfid Plugin",
+ "platforms" : "Android",
+ "url" : "",
+ "android_package_name" : "",
+ "ios_bundle_id" : "",
+ "isCloud" : false,
+ "bought" : -1,
+ "pid" : "",
+ "parameters" : {}
+ }
+ }
+ }
},
/* 蹇簲鐢ㄧ壒鏈夌浉鍏�*/
"quickapp" : {},
diff --git a/nativeplugins/rfid/android/rfid-release.aar b/nativeplugins/rfid/android/rfid-release.aar
new file mode 100644
index 0000000..183b888
--- /dev/null
+++ b/nativeplugins/rfid/android/rfid-release.aar
Binary files differ
diff --git a/nativeplugins/rfid/package.json b/nativeplugins/rfid/package.json
new file mode 100644
index 0000000..29f991b
--- /dev/null
+++ b/nativeplugins/rfid/package.json
@@ -0,0 +1,24 @@
+{
+ "name": "rfid",
+ "id": "rfid",
+ "version": "1.0.0",
+ "description": "My rfid Plugin",
+ "_dp_type": "nativeplugin",
+ "_dp_nativeplugin": {
+ "android": {
+ "plugins": [{
+ "type": "module",
+ "name": "RFIDModule",
+ "class": "com.handheld.rfid.RFIDModule"
+ }],
+ "resources": [
+ "res/raw/barcodebeep",
+ "res/raw/beeps",
+ "res/raw/beeps"
+ ],
+ "integrateType": "aar",
+ "minSdkVersion": 21
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 65923ce..05e6f38 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -256,13 +256,6 @@
// url:'../index/index?args=9999999999'
// });
},
- ontap(e) { //鎵爜鍔熻兘
- // console.log(e.target)
- getApp().onScan((result) => {
- // console.log(result.decodedata);
- this.data[e.target.dataset['key']] = result.decodedata;
- })
- },
translate(t) {
if (typeof this.$t == "function") return this.$t(`page.${t}`)
else return t;
diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index 005fed8..b6cb0e0 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1002,12 +1002,9 @@
//console.log(e.target)
getApp().onScan((result) => {
console.log(result);
- this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
- 'iindex']]
- .Value =
- result.decodedata;
+ this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =result;
uni.hideKeyboard();
- this.onevent($ele, result.decodedata);
+ this.onevent($ele, result);
})
},
onarrow(index, open) {
@@ -1137,14 +1134,14 @@
},
- onevent(e, decodedata) {
+ onevent(e, value) {
// console.log(e.target);
var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
'iindex']];
- // console.log(decodedata);
+ // console.log(value);
if (e.detail.value != data_attr.Value) {
this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
- decodedata ? decodedata : e.detail.value;
+ value ? value : e.detail.value;
var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
if (eventid) {
// self.event_no_sub = 1;
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 2565b03..7431959 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -544,50 +544,12 @@
ontap(item) { //鎵爜鍔熻兘
- // console.log("ontap",item);
- // 鎵撳紑钃濈墮閫傞厤鍣�- // uni.openBluetoothAdapter({
- // success: function() {
- // // 寮�鎼滅储钃濈墮璁惧
- // uni.startBluetoothDevicesDiscovery({
- // success: function() {
- // // 鐩戝惉鎵惧埌鏂拌澶囩殑浜嬩欢
- // uni.onBluetoothDeviceFound(function(devices) {
- // // 杩欓噷鍙互杩囨护鍑篟FID鑺墖锛岃繛鎺ュ苟璇诲彇鏁版嵁
- // console.log(devices[0].deviceId);
- // })
- // }
- // })
- // }
- // });
- // 鐩戝惉NFC鍔熻兘鏄惁鍙敤
- // uni.getNFCAdapterState({
- // success: function(res) {
- // console.log(res);
- // if (res.errCode === 0) {
- // // NFC鍔熻兘鍙敤锛屽紑濮嬬洃鍚�- // uni.onNFCStart((res) => {
- // if (res.errCode === 0) {
- // // 寮�NFC鏍囩妫�祴
- // uni.makeNFCReaderStart({
- // success: function() {
- // // 鐩戝惉NFC鏍囩
- // uni.onNFCTagDiscovered(function(res) {
- // console.log(res);
- // // 杩欓噷鍙互澶勭悊NFC鏍囩鏁版嵁
- // })
- // }
- // })
- // }
- // })
- // }
- // }
- // })
+
this.focusOldFieldId = item.fieldId
getApp().onScan((result) => {
console.log(result);
// uni.hideKeyboard();
- this.onScanValue(item, result.decodedata)
+ this.onScanValue(item, result)
})
},
onScanValue(item, value) {
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index 8705578..b576fd2 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -1552,18 +1552,18 @@
ontap(e) { //鎵爜鍔熻兘
//console.log(e.target)
getApp().onScan((result) => {
- //console.log(result.decodedata);
+ //console.log(result);
var isVal = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
'iindex']].Value;
// if(!isVal){
- // this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+ // this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result;
// var isVald =this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
// return;
// }
//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
- if (isVal != result.decodedata) {
+ if (isVal != result) {
this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
- 'iindex']].Value = result.decodedata;
+ 'iindex']].Value = result;
uni.hideKeyboard();
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈� var eventid = this.param.Scan_Code.Input_Change_Event.ID;
@@ -1590,7 +1590,7 @@
mast_attr: [],
inputParamter: [{
attr: 'mast_input_3037',
- value: result.decodedata
+ value: result
}]
}
@@ -1602,13 +1602,13 @@
subontap(e) { //鎵爜鍔熻兘
//console.log(e.target)
getApp().onScan((result) => {
- //console.log(result.decodedata);
+ //console.log(result);
var isVal = this.subClassAttrList[e.target.dataset['index']].Attr[e
.target.dataset['iindex']].Value;
//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
- if (isVal != result.decodedata) {
+ if (isVal != result) {
this.subClassAttrList[e.target.dataset['index']].Attr[e.target
- .dataset['iindex']].Value = result.decodedata;
+ .dataset['iindex']].Value = result;
uni.hideKeyboard();
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈� var eventid = this.param.Scan_Code.Input_Change_Event.ID;
@@ -1635,7 +1635,7 @@
mast_attr: [],
inputParamter: [{
attr: 'mast_input_3037',
- value: result.decodedata
+ value: result
}]
}
@@ -1647,16 +1647,16 @@
scan_ontap(e) { //鎵爜鍖烘壂鐮佸姛鑳� //console.log(e.target)
getApp().onScan((result) => {
- console.log(result.decodedata);
+ console.log(result);
var isflag = true;
for (var i in this.subPanelList) {
- if (this.subPanelList[i].scanCodeVal == result.decodedata)
+ if (this.subPanelList[i].scanCodeVal == result)
isflag = false;
}
//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
if (isflag) {
uni.hideKeyboard();
- this.scanCodeVal = result.decodedata;
+ this.scanCodeVal = result;
var eventid = this.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
var mast_req = [];
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index d75271d..69b6392 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -622,11 +622,11 @@
ontap(item) { //鎵爜鍔熻兘
//console.log(e.target)
getApp().onScan((result) => {
- //console.log(result.decodedata);
+ //console.log(result);
uni.hideKeyboard();
var $this = this;
console.log(item);
- item.value = result.decodedata
+ item.value = result
let newVal = item.value.trim()
if (newVal) {
item.oldvalue = newVal;
@@ -1117,8 +1117,8 @@
scan_ontap(e) { //鎵爜鍖烘壂鐮佸姛鑳� //console.log(e.target)
getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata
+ console.log(result);
+ item.value = result
let newVal = item.value
if (typeof item.value == "string") {
newVal = item.value.trim()
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 189d64b..7f2c728 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -1219,8 +1219,8 @@
// var $ele = e;
//console.log(e.target)
getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ console.log(result);
+ item.value = result;
uni.hideKeyboard();
var $this = this;
console.log(item);
diff --git a/pages/modal/3202.vue b/pages/modal/3202.vue
index ee5792e..3aa01ce 100644
--- a/pages/modal/3202.vue
+++ b/pages/modal/3202.vue
@@ -590,8 +590,8 @@
// var $ele = e;
//console.log(e.target)
getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ console.log(result);
+ item.value = result;
uni.hideKeyboard();
var $this = this;
console.log(item);
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 6eeecee..c5a26f2 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -582,8 +582,8 @@
//console.log(e.target)
this.focusOldFieldId = item.fieldId
getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ console.log(result);
+ item.value = result;
// uni.hideKeyboard();
var $this = this;
if (item.oldvalue != item.value && item.value.trim() != "") {
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 2d83d01..9545276 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -644,8 +644,8 @@
//console.log(e.target)
this.focusOldFieldId = item.fieldId
getApp().onScan(async (result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ console.log(result);
+ item.value = result;
var $this = this;
let newVal = item.value.trim()
if (newVal) {
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 2214147..7212542 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -573,8 +573,8 @@
// var $ele = e;
this.focusOldFieldId = item.fieldId
getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ console.log(result);
+ item.value = result;
//uni.hideKeyboard();
var $this = this;
diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index b3066d4..ea596ac 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -560,12 +560,12 @@
//console.log(e.target)
this.focusOldField = `${e.target.dataset['index']}-${e.target.dataset['iindex']}`
getApp().onScan((result) => {
- //console.log(result.decodedata);
+ //console.log(result);
this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
- result.decodedata;
+ result;
uni.hideKeyboard();
- this.onevent($ele, result.decodedata);
- if (result.decodedata) { //绗竴涓緭鍏ユ涓嶄负绌�+ this.onevent($ele, result);
+ if (result) { //绗竴涓緭鍏ユ涓嶄负绌� //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
const attrs = this.classAttrList[e.target.dataset['index']].Attr || []
var findd = false
@@ -759,13 +759,13 @@
},
- onevent(e, decodedata) {
+ onevent(e, value) {
// console.log(e.target);
var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
- // console.log(decodedata);
+ // console.log(value);
if (e.detail.value != data_attr.Value) {
this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
- decodedata ? decodedata : e.detail.value;
+ value ? value : e.detail.value;
var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
.action;
if (eventid) {
diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index 2d008d7..bb650e4 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -549,8 +549,8 @@
//console.log(e.target)
this.focusOldFieldId = item.fieldId
getApp().onScan((result) => {
- console.log(result.decodedata);
- item.value = result.decodedata;
+ console.log(result);
+ item.value = result;
var $this = this;
let newVal = item.value.trim()
if (newVal) {
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 9aefc3d..838f9c0 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -1132,19 +1132,19 @@
//console.log(e.target)
this.focusOldField = `${e.target.dataset['index']}-${e.target.dataset['iindex']}`
getApp().onScan((result) => {
- //console.log(result.decodedata);
+ //console.log(result);
var isVal = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
'iindex']].Value;
// if(!isVal){
- // this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+ // this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result;
// var isVald =this.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
// return;
// }
//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
- if (isVal != result.decodedata) {
+ if (isVal != result) {
this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
'iindex']]
- .Value = result.decodedata;
+ .Value = result;
uni.hideKeyboard();
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈� var eventid = this.param.Scan_Code.Input_Change_Event.ID;
@@ -1172,13 +1172,13 @@
mast_attr: req,
inputParamter: [{
attr: 'mast_input_3037',
- value: result.decodedata
+ value: result
}]
}
this.scan_DataObjRunCustomEvent(info, "");
}
- if (result.decodedata) { //绗竴涓緭鍏ユ涓嶄负绌�+ if (result) { //绗竴涓緭鍏ユ涓嶄负绌� //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
const attrs = this.classAttrList[e.target.dataset['index']].Attr || []
var findd = false
@@ -1257,15 +1257,15 @@
subontap(e) { //鎵爜鍔熻兘
//console.log(e.target)
getApp().onScan((result) => {
- //console.log(result.decodedata);
+ //console.log(result);
var isVal = this.subClassAttrList[e.target.dataset['index']].Attr[e.target
.dataset[
'iindex']].Value;
//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
- if (isVal != result.decodedata) {
+ if (isVal != result) {
this.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset[
'iindex']]
- .Value = result.decodedata;
+ .Value = result;
uni.hideKeyboard();
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈� var eventid = this.param.Scan_Code.Input_Change_Event.ID;
@@ -1292,7 +1292,7 @@
mast_attr: [],
inputParamter: [{
attr: 'mast_input_3037',
- value: result.decodedata
+ value: result
}]
}
@@ -1304,16 +1304,16 @@
scan_ontap(e) { //鎵爜鍖烘壂鐮佸姛鑳� //console.log(e.target)
getApp().onScan((result) => {
- console.log(result.decodedata);
+ console.log(result);
var isflag = true;
for (var i in this.subPanelList) {
- if (this.subPanelList[i].scanCodeVal == result.decodedata)
+ if (this.subPanelList[i].scanCodeVal == result)
isflag = false;
}
//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
if (isflag) {
uni.hideKeyboard();
- this.scanCodeVal = result.decodedata;
+ this.scanCodeVal = result;
var eventid = this.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
var mast_req = [];
--
Gitblit v1.9.1