Bläddra i källkod

修复之前对接设备列表后进入设备页面蓝牙断开重新连接问题

liyuliangjiazai 5 månader sedan
förälder
incheckning
b2fe5d68d0

+ 24 - 12
code/ajyApp/pages/device/list/list.nvue

@@ -12,8 +12,8 @@
 			<!-- 设备卡片 -->
 			<view class="device-card" v-for="(item, index) in list" :key="index" @click="goDeviceInfo(item)">
 				<image class="device-icon" src="/static/device/device1.png" mode="heightFix"></image>
-				<text class="device-name">{{item.deviceName}}</text>
-				
+				<text class="device-name">{{item.deviceName || item.name}}</text>
+
 			</view>
 			<!-- 添加设备卡片 -->
 			<view class="device-card add-card" @click="goAddDevice">
@@ -33,7 +33,7 @@
 <script>
 import ayToast from '@/components/ay-toast/ay-toast.nvue'
 import { useBleStore } from '@/stores/ble'
-import { getDeviceList } from '@/utils/api/device.js'
+import { getDeviceList } from '@/utils/api/device'
 
 export default {
 	components: {
@@ -56,18 +56,21 @@ export default {
 		this.init()
 	},
 	methods: {
-		/** 从后端获取设备列表 */
 		async init() {
 			try {
-				const data = await getDeviceList()
-				if (data && data.length > 0) {
-					this.list = data
-				} else {
-					this.list = []
+				const  deviceList= await getDeviceList()
+				console.log("后台返回列表list",deviceList)
+				if(deviceList&&deviceList.length>0){
+					for (var index = 0; index < deviceList.length; index++) {
+						deviceList[index].deviceId=deviceList[index].deviceCode;
+					}
+					console.log("后台返回列表list有值")
+					this.list = deviceList
 				}
+				// 同步到本地缓存,供其他页面使用
+				uni.setStorageSync('deviceList', this.list)
 			} catch (e) {
-				console.error('获取设备列表失败', e)
-				this.list = []
+				console.log('获取设备列表失败:', e)
 			}
 		},
 		goAddDevice() {
@@ -77,7 +80,7 @@ export default {
 		},
 		goDeviceInfo(item) {
 			uni.navigateTo({
-				url: '/pages/device/deviceInfo/deviceInfo?name=' + encodeURIComponent(item.deviceName || '') + '&deviceId=' + encodeURIComponent(item.deviceCode || '') + '&rssi='
+				url: '/pages/device/deviceInfo/deviceInfo?name=' + encodeURIComponent(item.deviceName || item.name || '') + '&deviceId=' + encodeURIComponent(item.deviceId || '') + '&deviceCode=' + encodeURIComponent(item.deviceCode || '') + '&rssi=' + encodeURIComponent(item.RSSI || '')
 			})
 		},
 		/** 如果设备已连接,实时获取RSSI并更新缓存 */
@@ -89,6 +92,15 @@ export default {
 				deviceId: connectedDeviceId,
 				success: (res) => {
 					console.log('实时RSSI更新:', res.RSSI)
+					// 更新列表中对应设备的RSSI
+					const idx = this.list.findIndex(item => item.deviceId === connectedDeviceId)
+					if (idx !== -1) {
+						this.list[idx].RSSI = res.RSSI
+						// 同步更新到本地缓存
+						try {
+							uni.setStorageSync('deviceList', this.list)
+						} catch (e) {}
+					}
 				},
 				fail: (err) => {
 					console.log('获取RSSI失败:', err)

+ 30 - 10
code/ajyApp/pages/device/search/search.nvue

@@ -74,6 +74,7 @@ export default {
 			return this.bleStore.searching
 		},
 		deviceList() {
+			console.log("scannedDevices	",this.bleStore.scannedDevices)
 			return this.bleStore.scannedDevices
 		},
 		scanThrottled() {
@@ -151,25 +152,44 @@ export default {
 			return 1
 		},
 		async onSelectDevice(device) {
-			console.log("要添加的设备",device)
-			const deviceCode = device.name || ''
-			if (!deviceCode) {
-				this.$refs.ayToast.error('无法识别设备编号')
+			console.log("要操作的设备",device)
+			let deviceList = []
+			try {
+				const data = uni.getStorageSync('deviceList')
+				console.log("deviceList",data)
+				if (data && data.length > 0) {
+					deviceList = data
+				}
+			} catch (e) {}
+
+			const exists = deviceList.find(item => item.deviceId === device.deviceId)
+			if (exists) {
+				this.$refs.ayToast.show('该设备已添加')
 				return
 			}
+
 			try {
-				const data = await bindDeviceByCode(deviceCode)
-				
-				console.log("绑定设备返回数据",data)
-				this.$refs.ayToast.success('设备绑定成功')
+				// 调用后端接口绑定设备,deviceId作为deviceCode传递
+				const res = await bindDeviceByCode(device.deviceId)
+				console.log('绑定设备成功', res)
+
+				// 后端绑定成功后,保存到本地
+				deviceList.push({
+					deviceId: device.deviceId,
+					name: device.name || '艾灸椅',
+					RSSI: device.RSSI
+				})
+				uni.setStorageSync('deviceList', deviceList)
+				this.$refs.ayToast.success('设备添加成功')
+
 				setTimeout(() => {
 					uni.redirectTo({
-						url: `/pages/device/deviceInfo/deviceInfo?deviceId=${encodeURIComponent(device.deviceId)}&name=${encodeURIComponent(data.deviceName || deviceCode)}&rssi=${device.RSSI || ''}`
+						url: `/pages/device/deviceInfo/deviceInfo?deviceId=${encodeURIComponent(device.deviceId)}&name=${encodeURIComponent(device.name || '艾灸椅')}&rssi=${device.RSSI || ''}`
 					})
 				}, 1000)
 			} catch (e) {
-				// http 模块已统一 toast 提示错误信息,此处无需重复提示
 				console.error('绑定设备失败', e)
+				// 错误提示由http模块统一处理,这里不再重复提示
 			}
 		}
 	}

+ 1 - 0
code/ajyApp/pages/login/login.nvue

@@ -215,6 +215,7 @@ export default {
 			toast.loading('登录中...')
 			try {
 				const data = await login(this.phone, this.code)
+				console.log("获取到的token",data.token)
 				// 存储 Token
 				http.setToken(data.token)
 				// 存储用户基本信息