蓝牙升级文件

common/bluetooth/ZXCar.js

@@ -43,6 +43,7 @@ function isDevice(device, data) {
 		//判断是否是智寻的蓝牙
 	const result = data.name.startsWith("ZX");
 	// if (data.name === "865416038002201") {
+	// if (data.name === "ZX2503140000000") {
 	if (result) {
 		return true
 	}
@@ -108,16 +109,23 @@ function readData(device, value, data) {
 	// console.log(value, 'test1111');
 	var value = new Uint8Array(value);
 	const normalArray = Array.from(value); // 或 [...uint8Array]
-	console.log(normalArray, 'value**************************');
+	console.log(normalArray,currentCommandIndex-1,commands[currentCommandIndex-1], 'value**************************');
 	switch (normalArray[1]) {
 		case 0x01:
-			currentCommandIndex=0
-			otaUpgrade().then(()=>{
-				console.log(currentCommandIndex, '开始升级');
-				//登陆成功  且当前为升级模式可以发送升级文件
-				sendNextCommand(device.mac_id)
-			})
-			
+			uni.showModal({
+				title: '提示',
+				confirmText: '开始升级',
+				content: '登陆成功，当前处于升级模式是否开始升级',
+				success: function(res) {
+					if (res.confirm) {
+						currentCommandIndex=0
+						otaUpgrade().then(()=>{
+							//登陆成功  且当前为升级模式可以发送升级文件
+							sendNextCommand(device.mac_id)
+						})
+					} else {}
+				}
+			});
 			break;
 	}
 	switch(normalArray[3]){
@@ -127,7 +135,8 @@ function readData(device, value, data) {
 		
 		
 		case 0x01:
-		console.log(currentCommandIndex,commands.length,commands[currentCommandIndex-2],commands[currentCommandIndex-1],commands[currentCommandIndex], '升级文件失败');
+		uni.hideLoading();
+		common.simpleToast('升级文件回复失败', 2000)
 		// test() 升级文件回复失败
 		break;
 	}
@@ -152,7 +161,6 @@ function sendCommand(cmd, data = []) {
 	const pData=[dataLen,cmd]
 	const crcData='0x'+crc8IEEE8023(pData).toString(16).toUpperCase()
 	cmdData.push(cmd,dataLen,crcData,0xAA, 0xAA)
-	console.log(cmdData,'打印下发指令');
 	return cmdData
 }
 //转成16进制
@@ -206,7 +214,8 @@ async function readBinBinarayToCommand() {
 function sendNextCommand(mac_id) {
 	// console.log(commands[currentCommandIndex],'command');
     if (currentCommandIndex >= commands.length) {
-        console.log('所有指令发送完成');
+		uni.hideLoading();
+		common.simpleToast('所有指令发送完成', 2000)
         return;
     }
 	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == mac_id);

pages/bluetoothUnlock/bluetoothPair.vue

@@ -61,11 +61,11 @@
 				const me=this
 				common.loading()
 				console.log('开始升级');
-				bluetooth.sendOTACommand('900000996', (res) => {
-						uni.hideLoading();
+				bluetooth.sendOTACommand('900000997', (res) => {
+						// uni.hideLoading();
 						// console.log('结束？？？？？');
 						
-						bluetooth.onConnectionStateChange('900000996', 'index', (res) => {
+						bluetooth.onConnectionStateChange('900000997', 'index', (res) => {
 							uni.hideLoading();
 							if (!res.connected) {
 								// 蓝牙未连接
@@ -85,7 +85,7 @@
 								// common.simpleToast('蓝牙连接断开1111', 2000)
 							} else {
 								console.log('蓝牙连接成功2222');
-								// common.simpleToast('蓝牙连接成功2222', 2000)
+								common.simpleToast('蓝牙连接成功', 2000)
 							}
 						});
 						// if (!res.connected) {
@@ -112,7 +112,7 @@
 			console.log(11112222);
 				bluetooth.closeBluetoothAdapter();
 				bluetooth.closeDevice(
-					"900000996",
+					"900000997",
 					() => {
 						// this.setData({
 						// 	bt_loading: false
@@ -120,13 +120,13 @@
 					},
 					() => {}
 				);
-				bluetooth.offCharacteristicStateChange("900000996", 'home');
-				bluetooth.offConnectionStateChange("900000996", 'home');	 
+				bluetooth.offCharacteristicStateChange("900000997", 'home');
+				bluetooth.offConnectionStateChange("900000997", 'home');	 
 			},
 			switchNormal(){
 				const me=this
 				app.globalData.connectionState={}
-				bluetooth.sendSwitchNormalCommand('900000996', (res) => {
+				bluetooth.sendSwitchNormalCommand('900000997', (res) => {
 						// uni.hideLoading();
 						console.log(res,'sendSwitchNormalCommand 切换正常工厂模式');
 						//切换工厂模式以后蓝牙断开 重新连接蓝牙
@@ -144,9 +144,9 @@
 			loadBluetooth() {
 				const me = this;
 				var device = {
-					mac_id: "900000996",
-					btid: "900000996",
-					btkey: "900000996",
+					mac_id: "900000997",
+					btid: "900000997",
+					btkey: "900000997",
 					bt_type: "ZXCAR",
 					device_type: "ZXCAR"
 				};
@@ -157,7 +157,16 @@
 						common.loading()
 						bluetooth.connectDevice(device, () => {
 							uni.hideLoading();
-							
+							//监听蓝牙设备连接状态变化事件
+							bluetooth.onConnectionStateChange(device.mac_id, 'index', (res) => {
+								uni.hideLoading();
+								if (!res.connected) {
+									// 蓝牙未连接
+									common.simpleToast('蓝牙连接断开')
+								} else {
+									common.simpleToast('蓝牙连接成功')
+								}
+							});
 							// uni.hideLoading()
 							// await bluetooth.sendOTACommand(device.mac_id, 'index', (res) => {
 							// 		uni.hideLoading();
@@ -182,18 +191,7 @@
 							// 			}
 							// 		}
 							// 	});
-								//监听蓝牙设备连接状态变化事件
-								bluetooth.onConnectionStateChange(device.mac_id, 'index', (res) => {
-									uni.hideLoading();
-									if (!res.connected) {
-										// 蓝牙未连接
-										console.log('蓝牙连接断开11111');
-										// common.simpleToast('蓝牙连接断开1111', 2000)
-									} else {
-										console.log('蓝牙连接成功2222');
-										// common.simpleToast('蓝牙连接成功2222', 2000)
-									}
-								});
+								
 							// 	bluetooth.sendGetCabinetInfoCommand(
 							// 		device.mac_id,
 							// 		device,
@@ -216,42 +214,42 @@
 							
 							},
 							(res) => {
-								console.log('观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限');
+								// console.log('观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限');
 								uni.hideLoading();
-								// var showContent = ""
-								// if (res && ("errCode" in res)) {
-								// 	if (res.errCode == 9000001) {
-								// 		var showContent = "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
-								// 	} else {
-								// 		var showContent = "连接失败，请尝试重新连接44444"
-								// 	}
-								// } else {
-								// 	var showContent = "连接失败，请尝试重新连接55555"
-								// }
-								// uni.showModal({
-								// 	title: '提示',
-								// 	confirmText: '重新连接',
-								// 	content: showContent,
-								// 	success: function(res) {
-								// 		if (res.confirm) {
-								// 			me.loadBluetooth();
-								// 		} else {}
-								// 	}
-								// });
+								var showContent = ""
+								if (res && ("errCode" in res)) {
+									if (res.errCode == 9000001) {
+										var showContent = "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
+									} else {
+										var showContent = "连接失败，请尝试重新连接44444"
+									}
+								} else {
+									var showContent = "连接失败，请尝试重新连接55555"
+								}
+								uni.showModal({
+									title: '提示',
+									confirmText: '重新连接',
+									content: showContent,
+									success: function(res) {
+										if (res.confirm) {
+											me.loadBluetooth();
+										} else {}
+									}
+								});
 							}, 
 							(res) => {
-								console.log('蓝牙未打开或请在右上角设置授权小程序使用蓝牙66666');
+								// console.log('蓝牙未打开或请在右上角设置授权小程序使用蓝牙66666');
 								uni.hideLoading();
-								// uni.showModal({
-								// 	title: '提示',
-								// 	confirmText: '我知道了',
-								// 	content: '蓝牙未打开或请在右上角设置授权小程序使用蓝牙66666',
-								// 	success: function(res) {
-								// 		if (res.confirm) {
-								// 			me.loadBluetooth();
-								// 		} else {}
-								// 	}
-								// });
+								uni.showModal({
+									title: '提示',
+									confirmText: '我知道了',
+									content: '蓝牙未打开或请在右上角设置授权小程序使用蓝牙66666',
+									success: function(res) {
+										if (res.confirm) {
+											me.loadBluetooth();
+										} else {}
+									}
+								});
 							}
 						);
 					}, );

pages/bluetoothUnlock/components/AndroidUnlockAuth.vue

@@ -121,7 +121,7 @@ export default {
 		console.log(11112222);
 			bluetooth.closeBluetoothAdapter();
 			bluetooth.closeDevice(
-				"900000996",
+				"900000997",
 				() => {
 					// this.setData({
 					// 	bt_loading: false
@@ -129,8 +129,8 @@ export default {
 				},
 				() => {}
 			);
-			bluetooth.offCharacteristicStateChange("900000996", 'home');
-			bluetooth.offConnectionStateChange("900000996", 'home');	 
+			bluetooth.offCharacteristicStateChange("900000997", 'home');
+			bluetooth.offConnectionStateChange("900000997", 'home');	 
 		},
   }
 }

pages/index/index.vue

@@ -192,9 +192,9 @@ import {
 			},
 			connectBluetooth(){
 				var device = {
-					mac_id: "900000996",
-					btid: "900000996",
-					btkey: "900000996",
+					mac_id: "900000997",
+					btid: "900000997",
+					btkey: "900000997",
 					bt_type: "ZXCar",
 					device_type: "ZXCar"
 				};