From 85bc74ca61892758597c0e3056258a5b5b24c607 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期五, 26 七月 2024 11:09:21 +0800
Subject: [PATCH] test

---
 App.vue |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/App.vue b/App.vue
index 82eb297..643a16c 100644
--- a/App.vue
+++ b/App.vue
@@ -15,28 +15,33 @@
 				let that = this;
 				var main = plus.android.runtimeMainActivity(), //鑾峰彇activity
 				IntentFilter = plus.android.importClass('android.content.IntentFilter'),//寮曞叆杩囨护鍣�-				Intent = plus.android.importClass('android.content.Intent'),
+				// Intent = plus.android.importClass('android.content.Intent'),
 				filter = new IntentFilter(),
 				receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
 					onReceive: function(context, intent){//瀹炵幇onReceiver鍥炶皟鍑芥暟
-						console.log('onReceive');
+						//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,
-							decodelabeltype
+							decodedata :decodedata || data,
+							decodelabeltype,
+							
 						};
+						console.log('onReceive',scanResult);
 						uni.$emit("scanresult",scanResult);
 					}
 				});
 				
-				filter.addAction("com.pda.formobox");//鐩戝惉鎵爜骞挎挱
+				 filter.addAction("com.pda.formobox"); //鐩戝惉鎵爜骞挎挱
+				 filter.addAction('com.rfid.scan') //
 				main.registerReceiver(receiver, filter); //娉ㄥ唽鐩戝惉
 			},
 			onScan(callback){
+				console.log('onScan');
 				uni.$off("scanresult");
 				uni.$on("scanresult",(result)=>{
 					callback(result);
@@ -48,10 +53,18 @@
 
 <style lang="scss">
 	/*姣忎釜椤甸潰鍏叡css */
+	/*Mobox2鍥炬爣 */
 	@import '@/uni_modules/uni-scss/index.scss';
 	@import '@/fonts/font-awesome/css/font-awesome.css';
 	@import '@/fonts/font-mobox-user/fu.css';
 	@import '@/fonts/font-mobox/fm.css';	
 	@import '@/fonts/font-sys/fs.css';
+	/*Mobox3鍥炬爣 */
+	@import '@/fonts/mobox-dms/style.css';
+	@import '@/fonts/mobox-normal/style.css';
+	@import '@/fonts/mobox-org/style.css';
+	@import '@/fonts/mobox-plm/style.css';
+	@import '@/fonts/mobox-sys/style.css';
+	@import '@/fonts/mobox-wms/style.css';
 		
 </style>

--
Gitblit v1.9.1