蓝牙调试

common/bluetooth.js

@@ -109,7 +109,7 @@ function getAdapterState(callback = () => {}, fail = () => {}) {
 function openBluetoothAdapter(callback = () => {}, fail = () => {}) {
     uni.openBluetoothAdapter({
         success: (res) => {
-            console.log(res);
+            console.log('初始化蓝牙模块成功');
             callback(res);
         },
         fail: (res) => {
@@ -195,6 +195,7 @@ function haveBMSForBT(device) {
 }
 // 定义一个函数，用于查找蓝牙设备
 function findDevice(device, callback = () => {}, fail = () => {}) {
+	console.log('走到了findDevice fun');
     // 定义一个变量，用于存储设备ID
     var deviceId = '';
     // 判断设备是否为蓝牙设备
@@ -298,7 +299,8 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
     }
     // 获取设备ID
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == device.mac_id);
-    // 判断设备是否已经连接
+    console.log(deviceId,'连接函数connectDevice deviceId');
+	// 判断设备是否已经连接
     if (deviceId == undefined) {
         // 如果设备未连接，则查找设备
         findDevice(
@@ -324,6 +326,7 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
     uni.createBLEConnection({
         deviceId: deviceId,
         success: (res) => {
+			console.log('蓝牙连接成功');
             // 更新连接状态
             app.globalData.connectionState[deviceId] = {
                 device: device,
@@ -336,11 +339,11 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
                 device,
                 deviceId,
                 (res) => {
-                    console.log(res);
+                    console.log('uni.createBLEConnection');
                     callback(res);
                 },
                 (res) => {
-                    console.log(res);
+                    console.log(' uni.createBLEConnection');
                     // 关闭设备连接
                     closeDevice(deviceId);
                     // 失败回调
@@ -569,7 +572,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
         value: buffer,
         // 成功回调函数
         success(res) {
-            console.log(res);
+            console.log('writeData 写入成功');
             // 如果数据长度为0，则调用回调函数
             if (data.length == 0) {
                 callback(res);
@@ -904,6 +907,28 @@ function sendCancelCommand(macid, serialNum, callback = () => {}, fail = () => {
     return false;
 }
 
+//切换正常工厂模式
+function sendSwitchNormalCommand(macid, callback = () => {}, fail = () => {}) {
+    const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
+    if (deviceId == undefined) {
+        fail();
+        return false;
+    }
+    const device = app.globalData.connectionState[deviceId].device;
+    if (!bluetoothDevices[device.device_type].switchFactory) {
+        fail();
+        return false;
+    }
+    var data = bluetoothDevices[device.device_type].switchFactory(device,deviceId);
+    if (data) {
+		console.log(data,'写入data');
+        writeData(device, deviceId, data, callback, fail);
+        return true;
+    }
+    fail();
+    return false;
+}
+
 async function sendOTACommand(macid, value, callback = () => {}, fail = () => {}) {
 	
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
@@ -968,6 +993,8 @@ module.exports = {
     sendGetCabinetInfoCommand: sendGetCabinetInfoCommand,
     sendConfirmCommand: sendConfirmCommand,
     sendCancelCommand: sendCancelCommand,
+	//切换正常工厂模式写入
+	sendSwitchNormalCommand,
 	
 	//蓝牙中控
 	sendOTACommand

common/bluetooth/ZXCar.js

@@ -27,6 +27,8 @@ function haveBms() {
 function isDevice(device, data) {
 	// console.log(device,data,'device111');
 	const advertisData = new Uint8Array(data.advertisData);
+	console.log(advertisData,'判断返回第几个字段是正常模式还是升级模式');
+	//打印返回广播 判断返回字段是正常模式还是升级模式
 	// console.log(advertisData.slice(4, 10).toString(),'device2222');
 	const mac = device.btid
 		.split('')
@@ -87,27 +89,24 @@ function crc8Ieee8023(data) {
 	return '0x' + crc.toString(16).toUpperCase().padStart(2, '0'); // 使用padStart确保结果始终是两位十六进制数
 }
 
+//connectDevice 打开连接  findDevice 查找设备
+
 //收到硬件方向软件方发送的数据
 function readData(device, value, data) {
-	console.log(value, 'test1111');
+	// console.log(value, 'test1111');
 	var value = new Uint8Array(value);
-	console.log(value, 'value***************************');
-	// switch (value[0]) {
-	// 		case 0x01:
-	// 			//登陆成功准备
-	// 			switchFactory(device)
-	// 			break;
-
-	// 		case 0x42:
-	// 			//data = FMBMS.BMSReply(value.slice(2, 2 + value[1]), data)
-	// 			packBmsData(device, value, data);
-	// 			break;
-	// 	}
-	switch(value[2]){
-		case 0x66:
+	console.log(value, 'value**************************');
+	switch (value[0]) {
+			case 0:
+				//登陆成功准备
+				switchFactory(device)
+				break;
+		}
+	// switch(value[2]){
+	// 	case 0x66:
 		
-		break;
-	}
+	// 	break;
+	// }
 
 	return data;
 }
@@ -121,6 +120,7 @@ function sendCommand(cmd, data = []) {
 	const startCmd = [0x02, 0x02]
 	const endCmd = [0xAA, 0xAA]
 	data = startCmd.concat(cmd).concat(endCmd)
+	console.log(data,'打印是否切换正常模式');
 	return data
 }
 
@@ -138,7 +138,11 @@ function turnOff(device, deviceId) {
 }
 
 function switchFactory(device, deviceId) {
-	return [sendCommand([0x54, 0x01, 0x01, 0x12])];
+	//切换正常，工厂模式指令
+	//切换工厂模式 [[0x22,0x22,0x54,0x01,0x01,0x12,0xAA,0xAA]]
+	//切换正常模式 [[0x22,0x22,0x54,0x01,0x00,0x15,0xAA,0xAA]]
+	return [[0x22,0x22,0x54,0x01,0x01,0x12,0xAA,0xAA]]
+	// return [sendCommand([0x54, 0x01, 0x01, 0x12])];
 }
 
 //升级OTA
@@ -236,6 +240,7 @@ module.exports = {
 	turnOff: turnOff,
 	isSingleBt: isSingleBt,
 	haveBms: haveBms,
+	switchFactory: switchFactory,
 	otaUpgrade
 
 };

locale/zh.json

@@ -76,5 +76,10 @@
 	"意见反馈":"意见反馈",
 	"客服中心":"客服中心",
 	"设置":"设置",
-	"支付成功":"支付成功"
+	"隐私政策":"隐私政策",
+	"邮箱密码登录":"邮箱密码登录",
+	"打开应用锁":"打开应用锁",
+	"后台运行":"后台运行",
+	"电池优化":"电池优化",
+	"位置权限":"位置权限"
 }

pages/bluetoothUnlock/bluetoothPair.vue

@@ -19,6 +19,7 @@
 			<view class="text">使用感应解锁功能时，请务必保证手机蓝牙功能开启，在蓝牙列表中忽略此设备会导致感应解锁失败</view>
 		</view>
 
+		<view class="pair-btn" style="bottom: 240rpx;" @tap="switchNormal">切换正常 工厂模式</view>
 		<view class="pair-btn" style="bottom: 140rpx;" @tap="otaUpgrade">OTA升级</view>
 		<view class="pair-btn" @tap="initiateBluetoothPairing">开始配对</view>
 		<CenterDialog confirmText="配对" ref="centerDialog" />
@@ -51,6 +52,10 @@
 				showNotice: false
 			}
 		},
+		created(){
+			bluetooth.initBluetooth()
+			this.bluetoothClose()
+		},
 		methods: {
 			async otaUpgrade(){
 				this.initiateBluetoothPairing()
@@ -65,8 +70,41 @@
     //             想与您配对，请确保显示的配对密钥为
     //             <span style="color:#060809;font-weight:bold">${pairingCode}</span>`
 				// });
+				
 				this.loadBluetooth()
 			},
+			bluetoothClose: function() {
+			console.log(11112222);
+				bluetooth.closeBluetoothAdapter();
+				bluetooth.closeDevice(
+					"095A5832",
+					() => {
+						// this.setData({
+						// 	bt_loading: false
+						// });
+					},
+					() => {}
+				);
+				bluetooth.offCharacteristicStateChange("095A5832", 'home');
+				bluetooth.offConnectionStateChange("095A5832", 'home');	 
+			},
+			switchNormal(){
+				const me=this
+				bluetooth.sendSwitchNormalCommand('900000996', (res) => {
+						// uni.hideLoading();
+						console.log(res,'sendSwitchNormalCommand 切换正常工厂模式');
+						//切换工厂模式以后蓝牙断开 重新连接蓝牙
+						console.log(app.globalData,'app.globalData');
+						app.globalData.connectionState={}
+						me.loadBluetooth()
+						// if (!res.connected) {
+						// 	// 蓝牙未连接
+						// 	common.simpleToast('蓝牙连接断开1111', 2000)
+						// } else {
+						// 	common.simpleToast('蓝牙连接成功2222', 2000)
+						// }
+					});
+			},
 			loadBluetooth() {
 				const me = this;
 				var device = {
@@ -76,21 +114,24 @@
 					bt_type: "ZXCAR",
 					device_type: "ZXCAR"
 				};
+				//bluetooth.acceptDevice(device) 是否是蓝牙类型列表里面的
 				if (bluetooth.acceptDevice(device)) {
 					// 打开蓝牙连接
 					bluetooth.openBluetoothAdapter((res) => {
 						common.loading()
-						bluetooth.connectDevice(device, async () => {
-							uni.hideLoading()
-							await bluetooth.sendOTACommand(device.mac_id, 'index', (res) => {
-									uni.hideLoading();
-									if (!res.connected) {
-										// 蓝牙未连接
-										common.simpleToast('蓝牙连接断开1111', 2000)
-									} else {
-										common.simpleToast('蓝牙连接成功2222', 2000)
-									}
-								});
+						bluetooth.connectDevice(device, () => {
+							uni.hideLoading();
+							
+							// uni.hideLoading()
+							// await bluetooth.sendOTACommand(device.mac_id, 'index', (res) => {
+							// 		uni.hideLoading();
+							// 		if (!res.connected) {
+							// 			// 蓝牙未连接
+							// 			common.simpleToast('蓝牙连接断开1111', 2000)
+							// 		} else {
+							// 			common.simpleToast('蓝牙连接成功2222', 2000)
+							// 		}
+							// 	});
 							console.log('test');
 							// 	bluetooth.onCharacteristicStateChange(device.mac_id, 'index', (data) => {
 							// 		console.log(data,'datatest');
@@ -103,15 +144,15 @@
 							// 			}
 							// 		}
 							// 	});
-							// 	bluetooth.onConnectionStateChange(device.mac_id, 'index', (res) => {
-							// 		uni.hideLoading();
-							// 		if (!res.connected) {
-							// 			// 蓝牙未连接
-							// 			common.simpleToast('蓝牙连接断开1111', 2000)
-							// 		} else {
-							// 			common.simpleToast('蓝牙连接成功2222', 2000)
-							// 		}
-							// 	});
+								// bluetooth.onConnectionStateChange(device.mac_id, 'index', (res) => {
+								// 	uni.hideLoading();
+								// 	if (!res.connected) {
+								// 		// 蓝牙未连接
+								// 		common.simpleToast('蓝牙连接断开1111', 2000)
+								// 	} else {
+								// 		common.simpleToast('蓝牙连接成功2222', 2000)
+								// 	}
+								// });
 							// 	bluetooth.sendGetCabinetInfoCommand(
 							// 		device.mac_id,
 							// 		device,
@@ -134,53 +175,56 @@
 							
 							},
 							(res) => {
+								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');
 								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 {}
+								// 	}
+								// });
 							}
 						);
 					}, );
 				} else {
 					//蓝牙连接未成功
+					console.log('当前机柜未找到符合的蓝牙类型');
 					uni.hideLoading();
-					uni.showModal({
-						confirmText: '我知道了',
-						content: '当前机柜未找到符合的蓝牙类型',
-						showCancel: false,
-						title: '提示',
-						complete: (res) => {}
-					});
+					// uni.showModal({
+					// 	confirmText: '我知道了',
+					// 	content: '当前机柜未找到符合的蓝牙类型',
+					// 	showCancel: false,
+					// 	title: '提示',
+					// 	complete: (res) => {}
+					// });
 				}
 			},
 			reportCabintInfo(dev_id, list){

pages/bluetoothUnlock/components/AndroidUnlockAuth.vue

@@ -38,8 +38,8 @@ export default {
     }
   },
 	created(){
-		bluetooth.initBluetooth()
-		this.bluetoothClose()
+		// bluetooth.initBluetooth()
+		// this.bluetoothClose()
 	},
   data() {
     return {
@@ -51,10 +51,10 @@ export default {
     authStepList() {
       const lang = v => this.$t(v)
       return [
-        { title: lang('位置权限'), type: 'location', desc: '打开手机定位，并运行APP始终使用' },
-        { title: lang('电池优化'), type: 'battery', desc: '打开电池优化设置， 将弗兰克APP加入保护名单' },
-        { title: lang('后台运行'), type: 'backstage', desc: '打开后台运行权限 清选择手动控制' },
-        { title: lang('打开应用锁'), type: 'appLock', desc: '打开应用权限锁' }
+        { title: ('位置权限'), type: 'location', desc: '打开手机定位，并运行APP始终使用' },
+        { title: ('电池优化'), type: 'battery', desc: '打开电池优化设置， 将弗兰克APP加入保护名单' },
+        { title: ('后台运行'), type: 'backstage', desc: '打开后台运行权限 清选择手动控制' },
+        { title: ('打开应用锁'), type: 'appLock', desc: '打开应用权限锁' }
       ]
     }
   },

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<block v-if="false">
+		<block >
 			<view class="container-view">
 				
 			
@@ -86,7 +86,7 @@
 			<view style="height: 264rpx;"></view>
 			</view>
 		</block>
-		<block >
+		<block v-if="false">
 			<UnleasedPages :model_list="model_list" :img_list="img_list" />
 		</block>
 		<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
@@ -197,7 +197,7 @@
 				});
 			},
 			inductiveUnlockHandle() {
-				// this.$refs.bluetoothUnlockAuth.open();
+				this.$refs.bluetoothUnlockAuth.open();
 			},
 			loadModelList() {
 				const me = this

pages/mileageStatistics/index.vue

@@ -73,7 +73,7 @@
 </template>
 
 <script>
-import * as echarts from 'echarts';
+// import * as echarts from 'echarts';
 export default {
   data() {
     return {