From ade379c26e00929b7295b37d7c274ccbb0026b7d Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 12 六月 2025 12:27:26 +0800
Subject: [PATCH] test

---
 App.vue |   96 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/App.vue b/App.vue
index 6d5eefa..66024d6 100644
--- a/App.vue
+++ b/App.vue
@@ -1,4 +1,8 @@
 <script>
+	import {
+		showModal,
+		showToast,
+	} from "@/js/Page.js"
 	export default {
 		globalData: {
 			largeMode: false,
@@ -20,21 +24,25 @@
 			bindClasses: false,
 			classes: ""
 		},
+		data() {
+			//鑾峰彇鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�+			return {
+
+			}
+		},
 		onLaunch: function() {
 			console.log('App Launch');
+			this.deviceInfo = uni.getSystemInfoSync();
 			this.initscan();
 		},
+		onUnload() {
+
+			// // 姹夊痉闇嶅皵 PDA rfid鎵爜椤甸潰鍗歌浇鏃堕噴鏀捐祫婧�+			// const rfidModule = uni.requireNativePlugin('HandheldRFID');
+			// rfidModule.closeModule();
+		},
 		onShow: function() {
-			// const args = plus.runtime.arguments || ""
-			// if(args)
-			// {
-			// 	uni.showModal({
-			// 		title: "App鍙傛暟",
-			// 		content: args,
-			// 		showCancel: false,
-			// 		confirmText:"cancel"
-			// 	});
-			// }
+
 			console.log('App Show')
 		},
 		onHide: function() {
@@ -43,11 +51,20 @@
 		methods: {
 			initscan() {
 				let that = this;
-				var main = plus.android.runtimeMainActivity(), //鑾峰彇activity
-					IntentFilter = plus.android.importClass('android.content.IntentFilter'), //寮曞叆杩囨护鍣�+				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'),
-					filter = new IntentFilter(),
-					receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
+					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);
@@ -59,24 +76,48 @@
 								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); //娉ㄥ唽鐩戝惉
+					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);
-				});
-			}
+				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)
+					// 	}
+					// })
+				} else {
+					uni.$off("scanresult");
+					uni.$on("scanresult", (result) => {
+						callback(result);
+					});
+				}
+
+			},
+
 		}
 	}
 </script>
@@ -148,20 +189,23 @@
 
 		.uni-data-tree {
 			font-size: 24px !important;
+
 			.input-value {
 				height: 45px !important;
 				font-size: 24px !important;
 			}
+
 			.placeholder {
-			 font-size: 24px !important;
+				font-size: 24px !important;
 			}
 		}
+
 		.segmented-control__text {
 			font-size: 24px !important;
 			height: 45px;
-			
+
 		}
-		
+
 
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1