Merge branch 'main' of http://47.107.152.87:3000/dyf/APP

pages/100J/HBY100-J.vue

@@ -243,6 +243,7 @@
 		deviceUpdateVolume,
 		deviceVoiceBroadcast,
 		updateBleStatus,
+		getBleStatus,
 		parseBleData,
 		fetchBlePowerStatus,
 		fetchBleLocation
@@ -714,16 +715,17 @@
 					}
 				})
 			},
-			// 语音管理
+			// 语音管理（传递蓝牙状态，确保子页走蓝牙优先）
 			audioManager(item) {
 				if (this.Status.apiType !== 'listA') {}
+				const ble = getBleStatus();
 				uni.navigateTo({
 					url: '/pages/100J/audioManager/AudioList',
 					events: {},
 					success: (res) => {
-						// 页面跳转成功后的回调函数
 						res.eventChannel.emit('deviceData', {
-							data: item
+							data: item,
+							ble
 						});
 					},
 				});

pages/100J/audioManager/AudioList.vue

@@ -104,7 +104,8 @@
 		deviceVoliceList,
 		videRenameAudioFile,
 		deviceDeleteAudioFile,
-		deviceUpdateVoice
+		deviceUpdateVoice,
+		updateBleStatus
 	} from '@/api/100J/HBY100-J.js'
 	import { baseURL } from '@/utils/request.js'
 	import {
@@ -218,6 +219,10 @@
 				console.log(rec, 'ressss');
 				this.blue = rec.ble;
 				this.device = rec.data;
+				// 同步蓝牙状态，确保语音上传走蓝牙优先
+				if (rec.ble && (rec.ble.isConnected || rec.ble.bleDeviceId)) {
+					updateBleStatus(!!rec.ble.isConnected, rec.ble.bleDeviceId || '', rec.data?.deviceId || '');
+				}
 				this.getinitData(rec.data.deviceId, true)
 			});
 
@@ -496,16 +501,20 @@
 				this.isUpdating = true;
 				// 本地项优先用 localPath；云端项用 fileUrl（兼容多种字段名），相对路径补全 baseURL
 				let fileUrl = '';
+				let localPath = (item.localPath && typeof item.localPath === 'string') ? item.localPath : '';
 				if (!item._isLocal) {
 					const raw = item.fileUrl || item.url || item.filePath || item.audioUrl || item.ossUrl || '';
 					fileUrl = (typeof raw === 'string' && raw) ? (raw.startsWith('/') ? (baseURL + raw) : raw) : '';
+				} else {
+					// 本地项：localPath 优先，无则用 fileUrl（mergeLocal 中可能只有 fileUrl 存路径）
+					if (!localPath && item.fileUrl) localPath = item.fileUrl;
 				}
-				const localPath = (item.localPath && typeof item.localPath === 'string') ? item.localPath : '';
 				const data = {
 					id: item.id,
 					fileUrl,
 					localPath,
-					onProgress: (p) => { this.updateProgress = p; }
+					onProgress: (p) => { this.updateProgress = p; },
+					onWaiting: () => { uni.showToast({ title: '等待蓝牙连接中...', icon: 'none', duration: 2000 }); }
 				};
 				// 整体超时 60 秒（仅影响蓝牙上传，4G HTTP 很快返回）
 				const overallTimer = setTimeout(() => {
@@ -518,11 +527,6 @@
 				deviceUpdateVoice(data).then((RES) => {
 					clearTimeout(overallTimer);
 					if (RES.code == 200) {
-						// 更新列表选中状态：当前项设为使用中，其他项取消
-						const targetId = item.id || item.Id;
-						this.dataListA.forEach(it => {
-							it.useStatus = ((it.id || it.Id) === targetId) ? 1 : 0;
-						});
 						// 蓝牙上传：进度已由 onProgress 更新，直接完成
 						if (RES._channel === 'ble') {
 							uni.showToast({ title: '音频上传成功', icon: 'success', duration: 2000 });
@@ -549,11 +553,6 @@
 										this.updateProgress = progress;
 										if (progress === 100) {
 											clearTimeout(this.upgradeTimer);
-											// 更新列表选中状态（4G 成功时）
-											const targetId = item.id || item.Id;
-											this.dataListA.forEach(it => {
-												it.useStatus = ((it.id || it.Id) === targetId) ? 1 : 0;
-											});
 											uni.showToast({ title: '音频上传成功', icon: 'success', duration: 2000 });
 											this.isUpdating = false;
 											setTimeout(() => { uni.navigateBack(); }, 1500);