优化蓝牙

pages/edit/edit.vue

@@ -154,16 +154,16 @@
 					case 10009:
 						this.errorToast('Android 系统特有，系统版本低于 4.3 不支持 BLE')
 						break
-					case 100010:
+					case 10010:
 						this.errorToast('已连接')
 						break
-					case 100011:
+					case 10011:
 						this.errorToast('配对设备需要配对码')
 						break
-					case 100012:
+					case 10012:
 						this.errorToast('连接超时')
 						break
-					case 100013:
+					case 10013:
 						this.errorToast('连接 deviceld 为空或者是格式不正确')
 						break
 				}
@@ -178,7 +178,10 @@
 			},
 			// -----------------返回蓝牙匹配
 			back() {
-				uni.navigateBack()
+				uni.$emit('updateData', true)
+				uni.navigateBack({
+					delta: 1
+				})
 			},
 			// ------------------获取设备数据列表
 			async getTypeList() {
@@ -188,7 +191,7 @@
 				// console.log(JSON.parse(JSON.stringify(res.data.list)), '获取的数据返回');
 				// 筛选出无创水光
 				for (let key in res.data.list) {
-					if (res.data.list[key].id != 1 && res.data.list[key].id != 15) {
+					if (res.data.list[key].id != 1 && res.data.list[key].id != 15 && res.data.list[key].id != 10) {
 						this.typeList.push(res.data.list[key])
 					}
 				}
@@ -206,7 +209,7 @@
 						this.selectModeIndexA = 99
 						this.equipmentNum = '' //重置探头
 						this.modeNum = '' //重置模式或强度
-						// console.log(item)
+						console.log(item)
 						//赋值哪个厂家的设备
 						if (item.type_sn.includes('ZK')) {
 							this.TYPE_SN = 'ZK'
@@ -221,7 +224,7 @@
 						this.equipmentNum = Number(item.detector_sn).toString(16) < 10 ? '0' + Number(item.detector_sn)
 							.toString(16) : Number(item.detector_sn).toString(16) //设备探头编号(16进制)
 						// console.log(this.equipmentNum)
-						// console.log(item)
+						console.log(item)
 						this.minClass = item.config.power.min //最小值
 						this.maxClass = item.config.power.max //最大值
 						this.incrementClass = item.config.power.increment //增幅

pages/home/home.vue

@@ -41,6 +41,8 @@
 				deviceId: '', //蓝牙设备ID
 				serviceId: '', //服务UUID
 				characteristicId: '', //特征值
+				connected: false, //是否连接
+				isUpdateData:false,//是否是返回蓝牙匹配
 			};
 		},
 		created() {
@@ -49,6 +51,29 @@
 			// 获取蓝牙监听
 			this.stateChange()
 		},
+		onShow() {
+			let that = this
+			uni.$on('updateData', function(data) {
+				if (data) {
+					this.isUpdateData = true
+					// console.log('触发了');
+					// 断开蓝牙
+					if (that.deviceId) {
+						that.closeBLEConnection(that.deviceId)
+					}
+					that.deviceId = ''
+					that.serviceId = ''
+					that.characteristicId = ''
+				}
+			})
+		},
+		onHide() {
+			// 移除监听事件
+			uni.$on('updateData', function(data) {
+				uni.$off('updateData');
+				this.isUpdateData = false
+			})
+		},
 		methods: {
 			// 蓝牙报错提示
 			blueError(code) {
@@ -83,16 +108,16 @@
 					case 10009:
 						this.errorToast('Android 系统特有，系统版本低于 4.3 不支持 BLE')
 						break
-					case 100010:
+					case 10010:
 						this.errorToast('已连接')
 						break
-					case 100011:
+					case 10011:
 						this.errorToast('配对设备需要配对码')
 						break
-					case 100012:
+					case 10012:
 						this.errorToast('连接超时')
 						break
-					case 100013:
+					case 10013:
 						this.errorToast('连接 deviceld 为空或者是格式不正确')
 						break
 				}
@@ -171,26 +196,37 @@
 			// 找到新设备就触发该方法
 			found(res) {
 				if (res.devices[0].name.includes('BT24')) {
-					this.blueDeviceList.push(res.devices[0])
+				this.blueDeviceList.push(res.devices[0])
+				}
+				// 判断是否连接
+				if (this.connected) {
+					return
 				}
 				// 检查本地是否有id
 				let deviceId = uni.getStorageSync('deviceId')
-				if(deviceId){
-					// 重置deviceId
-					this.deviceId = ''
-					let data = {
-						deviceId
+				if (deviceId) {
+					let list = []
+					this.blueDeviceList.forEach(item => {
+						list.push(item.deviceId)
+					})
+					if (list.includes(deviceId)) {
+						// 重置deviceId
+						this.deviceId = ''
+						let data = {
+							deviceId
+						}
+						this.connect(data)
 					}
-					this.connect(data)   
 				}
 			},
 			//监听蓝牙状态
 			stateChange() {
 				uni.onBLEConnectionStateChange(function(res) {
 					// 该方法回调中可以用于处理连接意外断开等异常情况
+					let connected = res.connected
 					console.log(`device ${res.deviceId} state has changed, connected: ${res.connected}`,
 						'监听到蓝牙设备变化')
-					if (!res.connected) {
+					if (!res.connected&&!this.isUpdateData) {
 						console.log(111111, '断开重连操作');
 						let data = {
 							deviceId: this.deviceId
@@ -235,7 +271,7 @@
 				that.deviceId = data.deviceId
 				uni.createBLEConnection({
 					deviceId: that.deviceId,
-					timeout: 30000,
+					timeout: 20000,
 					success(res) {
 						wx.hideLoading()
 						uni.showToast({
@@ -258,6 +294,7 @@
 						switch (err.errMsg) {
 							default:
 								that.blueError(err.errCode)
+								that.deviceId = ''
 						}
 						console.log('连接失败')
 						console.error(err)
@@ -377,7 +414,7 @@
 			}
 
 			.item:nth-child(2n) {
-				background-color: aqua;
+				background-color: #1e98d7;
 			}
 		}
 
@@ -393,4 +430,4 @@
 			justify-content: flex-end;
 		}
 	}
-</style>
+</style>