Merge branch 'lw_test' into gyq_test

common/bluetooth.js

@@ -31,6 +31,7 @@ function initBluetooth() {
     //监听低功耗蓝牙连接状态的改变事件。包括开发者主动连接或断开连接，设备丢失，连接异常断开等等
     uni.onBLEConnectionStateChange((res) => {
 		console.log('蓝牙状态变化/可能是断开连接',res);
+		
         if (app.globalData.connectionState[res.deviceId]) {
             app.globalData.connectionState[res.deviceId].connected = res.connected;
             const device = app.globalData.connectionState[res.deviceId].device;
@@ -219,7 +220,7 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                     console.log(res);
                     // 遍历搜索到的蓝牙设备
                     res.devices.forEach((data) => {
-                        console.log(data);
+                        // console.log(data,'data***************');
                         // 判断设备是否为指定设备
                         if (bluetoothDeviceConfig(device).isDevice(device, data)) {
                             // uni.offBluetoothDeviceFound();
@@ -230,6 +231,7 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                             } else {
                                 app.globalData.connectionState[deviceId] = {
                                     device: device,
+									deviceName:data.name,
                                     deviceId: deviceId,
                                     connected: false,
                                     data: {}
@@ -273,13 +275,17 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                         if (app.globalData.connectionState[deviceId]) {
                             app.globalData.connectionState[deviceId].device = device;
                         } else {
+							
                             // 如果不存在，创建新的设备状态对象
                             app.globalData.connectionState[deviceId] = {
                                 device: device,
+								deviceName:data.name,
                                 deviceId: deviceId,
                                 connected: false,
                                 data: {}
                             };
+							console.log(app.globalData.connectionState[deviceId],'datatest--------');
+							
                         }
                         callback(deviceId);
                     }
@@ -302,7 +308,7 @@ 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');
+	console.log(deviceId,'连接函数connectDevice deviceId');
 	// 判断设备是否已经连接
     if (deviceId == undefined) {
         // 如果设备未连接，则查找设备
@@ -325,14 +331,16 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
             return;
         }
     }
+	const device_name=app.globalData.connectionState[deviceId].deviceName
     // 创建蓝牙连接
     uni.createBLEConnection({
         deviceId: deviceId,
         success: (res) => {
-			console.log('蓝牙连接成功');
+			console.log(res,'蓝牙连接成功');
             // 更新连接状态
             app.globalData.connectionState[deviceId] = {
                 device: device,
+				deviceName: device_name,
                 deviceId: deviceId,
                 connected: true,
                 data: {}
@@ -576,7 +584,6 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
         value: buffer,
         // 成功回调函数
         success(res) {
-            // console.log('writeData 写入成功');
             // 如果数据长度为0，则调用回调函数
             if (data.length == 0) {
                 callback(res);
@@ -950,6 +957,7 @@ function sendOTACommand(macid, callback = () => {}, fail = () => {}) {
     if (data) {
 		
 		data.then(result => {
+			console.log(result[0],'result');
 			    writeData(device, deviceId, [result[0]], callback, fail);
 				// const testData=result.slice(0,3)
 				// const testData=result
@@ -968,6 +976,43 @@ function sendOTACommand(macid, callback = () => {}, fail = () => {}) {
     fail();
     return false;
 }
+function executeDeviceCommand(macid, commandName, 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 (!bluetoothDeviceConfig(device)[commandName]) {
+        fail();
+        return false;
+    }
+    var data = bluetoothDeviceConfig(device)[commandName](device, deviceId);
+    if (data) {
+        writeData(device, deviceId, data, callback, fail);
+        return true;
+    }
+    fail();
+    return false;
+}
+function turnOnCar(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'turnOnCar', callback, fail);
+}
+function turnOffCar(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'turnOffCar', callback, fail);
+}
+function findCarCmd(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'findCarCmd', callback, fail);
+}
+function openCarSeat(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'openCarSeat', callback, fail);
+}
+function openCarTrunk(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'openCarTrunk', callback, fail);
+}
+function getCarPressure(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'getCarPressure', callback, fail);
+}
 
 module.exports = {
     initBluetooth: initBluetooth,
@@ -1015,7 +1060,15 @@ module.exports = {
 	sendSwitchNormalCommand,
 	
 	//蓝牙中控
-	sendOTACommand
+	sendOTACommand,
+    // 执行设备命令
+    executeDeviceCommand,
+    turnOnCar,
+    turnOffCar,
+	findCarCmd,
+	openCarSeat,
+	openCarTrunk,
+	getCarPressure,
 	
 	
 };

common/bluetooth/ZXCar.js

@@ -40,8 +40,11 @@ function isDevice(device, data) {
 	// if ( advertisData.slice(4, 10).toString() == "095A5832") {
 	//     return true;
 	// }
-	// if (data.name === "ZX2202220000000") {
-	if (data.name === "865416038002201") {
+		//判断是否是智寻的蓝牙
+	const result = data.name.startsWith("ZX");
+	// if (data.name === "865416038002201") {
+	// if (data.name === "ZX2503140000000") {
+	if (result) {
 		return true
 	}
 
@@ -49,6 +52,7 @@ function isDevice(device, data) {
 }
 
 function alterConnect(device, deviceId) {
+	// console.log(device,app.globalData.connectionState[deviceId],'deviceliuwei');
 	//登录 crc[0x1F,0x0F,0x5A,0x58,0x32,0x32,0x30,0x32,0x32,0x32,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x08,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x67,0xAC,0x53,0xE7,0x08,0x00]
 	//登录 [[0x22,0x22,0x01,0x1F,0x0F,0x5A,0x58,0x32,0x32,0x30,0x32,0x32,0x32,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x08,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x67,0xAC,0x53,0xE7,0x08,0x00,crc_data,0xAA,0xAA]]
 	//时间戳 0x67AC53E7 0x65,0xB3,0xED,0x6F 16:00:05
@@ -56,24 +60,18 @@ function alterConnect(device, deviceId) {
 	//OTA 升级指令 [[0x22,0x22,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,n,0xCB,0xAA,0xAA]]
 
 	// const data = [0x1F, 0x0F, ,0x5A,0x58, 0x35, 0x32, 0x30, 0x32, 0x32, 0x32, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-	
-	const data=[ 0x1F, 0x0F,0x38, 0x36, 0x35, 0x34, 0x31, 0x36, 0x30, 0x33, 0x38, 0x30, 0x30, 0x32, 0x32, 0x30, 0x31,0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00]
+	let data=[ 0x1F, 0x0F]
+	const device_name=app.globalData.connectionState[deviceId].deviceName
+	const device_sn=stringToHexArray(device_name)
+	data.push(...device_sn)
+	data.push(0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00)
+	// const data=[ 0x1F, 0x0F,0x38, 0x36, 0x35, 0x34, 0x31, 0x36, 0x30, 0x33, 0x38, 0x30, 0x30, 0x32, 0x32, 0x30, 0x31,0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00]
 	// console.log(data,'datatest');
-	const crc_data = crc8IEEE8023(data)
-	// console.log(crc_data, 111);
-	// 示例数据（16进制字符串转换为字节数组）
-	// const hexString = "1F0F38363534313630333830303232303108313233343536373867AC53E70800";
-	// const byteArray = hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16));
-	// console.log(byteArray,'byteArray');
-	// 计算 CRC-8 IEEE 802.3 校验值
-	// const crcResult = crc8IEEE8023(byteArray).toString(16).toUpperCase();
-	// console.log("CRC-8 IEEE 802.3 Checksum:", crcResult.toString(16).toUpperCase());
-	return [
-		[0x22, 0x22, 0x01, 0x1F, 0x0F, 0x38, 0x36, 0x35, 0x34, 0x31, 0x36, 0x30, 0x33, 0x38, 0x30, 0x30, 0x32, 0x32, 0x30, 0x31, 0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00,
-			crc_data, 0xAA, 0xAA
-		]
-	]
-	//return [sendCommand(0x01, [0xAB, 0xCD, 0xAB, 0xCD])]
+	const crc_data = '0x'+crc8IEEE8023(data).toString(16).toUpperCase()
+	data.push(crc_data,0xAA,0xAA)
+	data.unshift(0x22,0x22,0x01)
+	
+	return [data]
 }
 
 function crc8IEEE8023(data) {
@@ -93,58 +91,105 @@ function crc8IEEE8023(data) {
     return crc;
 }
 
+function stringToHexArray(str) {
+  const result = [];
+  for (let i = 0; i < str.length; i++) {
+    const charCode = str.charCodeAt(i); // 获取字符的 ASCII 码值
+	const hexValue=`0x${charCode.toString(16).toUpperCase()}`
+	const hexDataValue=parseInt(hexValue,16)
+    result.push(hexDataValue);
+  }
+  return result;
+}
+
 
 
 //收到硬件方向软件方发送的数据
 function readData(device, value, data) {
 	// console.log(value, 'test1111');
-	var value = new Uint8Array(value);
-	
-	const normalArray = Array.from(value); // 或 [...uint8Array]
-	console.log(normalArray, 'value**************************');
-	// switch (value[0]) {
-	// 		case 0:
-	// 			//登陆成功准备
-	// 			switchFactory(device)
-	// 			break;
-	// 	}
+	var test = new Uint8Array(value);
+	const normalArray = Array.from(test); // 或 [...uint8Array]
+	// console.log(normalArray,'normalArray---------------');
+	// console.log(normalArray,currentCommandIndex-1,commands[currentCommandIndex],commands[currentCommandIndex-1], 'value**************************');
+	if((normalArray[0]==0x00) && (normalArray[1]==0x01) && normalArray.length==2){
+		switch (normalArray[1]) {
+			case 0x01:
+				uni.showModal({
+					title: '提示',
+					confirmText: '开始升级',
+					content: '登陆成功，当前处于升级模式是否开始升级',
+					success: function(res) {
+						if (res.confirm) {
+							currentCommandIndex=0
+							otaUpgrade().then(()=>{
+								//登陆成功  且当前为升级模式可以发送升级文件
+								sendNextCommand(device.mac_id)
+							})
+						} else {}
+					}
+				});
+				break;
+		}
+	}
 	switch(normalArray[3]){
 		case 0x00:
 		sendNextCommand(device.mac_id)
 		break;
 		
+		
 		case 0x01:
-		test()
+		uni.hideLoading();
+		console.log(normalArray,commands.length,currentCommandIndex-1,commands[currentCommandIndex-3],commands[currentCommandIndex-2],commands[currentCommandIndex-1], 'value**************************');
+		common.simpleToast('升级文件回复失败', 2000)
+		// test() 升级文件回复失败
 		break;
 	}
 
+
+	
+	
+		
+
+
 	return data;
 }
-function test(){
-	currentCommandIndex=1
-	console.log(commands[currentCommandIndex],'test');
-}
 
 
+//发送指令封装
 function sendCommand(cmd, data = []) {
-	const startCmd = [0x02, 0x02]
-	const endCmd = [0xAA, 0xAA]
-	data = startCmd.concat(cmd).concat(endCmd)
-	console.log(data,'打印是否切换正常模式');
-	return data
+	let cmdData = [0x22, 0x22]
+	// cmdData.push(cmd)
+	//协议号 cmd
+	//包长度 data.length
+	const dataLen=parseInt(data.length.toString(16).toUpperCase(), 16)
+	//信息内容 cmd
+	//crc校验
+	const pData=[dataLen,cmd]
+	const crcData='0x'+crc8IEEE8023(pData).toString(16).toUpperCase()
+	cmdData.push(cmd,dataLen,cmd,crcData,0xAA, 0xAA)
+	// console.log(cmdData,'cmdDatacmdData');
+	return cmdData
 }
 
-function stateUpdate(device, deviceId) {
-	return [sendCommand(0x04), sendCommand(0x02, FMBMS
-.BMSRead())]; //return [[0x02,0x00,0x15,0x15,0x00,0x4e,0x57,0x00,0x13,0x00,0x00,0x00,0x00,0x06,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x00,0x00,0x01,0x27,0x7b]]
-}
 
-function turnOn(device, deviceId) {
-	return [sendCommand(0x02, FMBMS.BMSTurnOn())];
+function turnOnCar(device, deviceId) {
+	return [sendCommand(0x02,[0x02])];
 }
 
-function turnOff(device, deviceId) {
-	return [sendCommand(0x02, FMBMS.BMSTurnOff())];
+function turnOffCar(device, deviceId) {
+	return [sendCommand(0x03,[0x03])];
+}
+function findCarCmd(device, deviceId) {
+	return [sendCommand(0x06,[0x06])];
+}
+function openCarSeat(device, deviceId) {
+	return [sendCommand(0x07,[0x07])];
+}
+function openCarTrunk(device, deviceId) {
+	return [sendCommand(0x08,[0x08])];
+}
+function getCarPressure(device, deviceId) {
+	return [sendCommand(0x4A,[0x4A])];
 }
 
 function switchFactory(device, deviceId) {
@@ -173,16 +218,15 @@ async function readBinBinarayToCommand() {
 	const uint8Array = new Uint8Array(arrayBuffer); // 转换为 Uint8Array
 	const test = splitArrayIntoChunks(uint8Array, 80); // 分割成长度为 80 的数组
 	const data =makeArr(test)
-	// const tests=data.slice(data.length-3)
-	// console.log(data.length,tests[0],'testtest数组');
-	// console.log(tests,'tests');
 	return data
 }
 
 function sendNextCommand(mac_id) {
-	console.log(commands[currentCommandIndex],'command');
-    if (currentCommandIndex >= commands.length) {
-        console.log('所有指令发送完成');
+	console.log('开始发送指令');
+	// console.log(commands[currentCommandIndex],'command');
+    if (currentCommandIndex >= commands.length-1) {
+		uni.hideLoading();
+		common.simpleToast('所有指令发送完成', 2000)
         return;
     }
 	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == mac_id);
@@ -191,7 +235,6 @@ function sendNextCommand(mac_id) {
         return ;
     }
     const command = [commands[currentCommandIndex]];
-	
 	if(command.length==0){
 		return
 	}
@@ -205,7 +248,7 @@ function sendNextCommand(mac_id) {
         characteristicId: writeID, // 替换为可写入的特征值 ID
         value: buffer,
         success() {
-            // console.log('指令发送成功，等待设备响应');
+            // console.log('指令发送成功，等待设备响应',currentCommandIndex,commands[currentCommandIndex]);
         },
         fail(err) {
             console.error('指令发送失败', err);
@@ -225,19 +268,20 @@ function splitArrayIntoChunks(array, chunkSize) {
 // 处理分割后的数组
 function makeArr(array) {
     const result = [];
+	let endPackage;
     for (let i = 0; i < array.length; i ++) {
-       
-		let endPackage = 0x00
+			endPackage = 0x00
 		if((i + 1) >= array.length){
 			//当前是最后一次循环
 			endPackage = 0x01
 		}
+		// if(i==2) return
 		//协议号 30 包长度未固定array.length+8 转16进制  固件类型0x00 升级包大小(总包大小) 125396字节-》0x00,0x01,0xE9,0xD4
 		let startArray = []
 		const packageLen=parseInt((array[i].length+8).toString(16).toUpperCase(), 16)
 		
 		// const totalPackageSize=[0x00,0x00,0x01,0xE9,0xD4]
-		const totalPackageSize=[0x00,0x00,0x01,0xE9,0xac]
+		const totalPackageSize=[0x00,0x00,0x01,0xeb,0xfc]
 		startArray.push(packageLen,...totalPackageSize)
 		 //软件包id
 		const ids=splitNumber(i)  // 0x00,0x01
@@ -245,19 +289,16 @@ function makeArr(array) {
 		 //是否为最后一个包
 		startArray.push(endPackage)
 		 //软件数据包
-		const formattedChunk = array[i].map(byte => `0x${byte.toString(16).padStart(2, '0')}`); // 转换为 0xXX 格式 
+		const formattedChunk = array[i].map(byte => `0x${byte.toString(16).toUpperCase()}`); // 转换为 0xXX 格式 
 		startArray.push(...formattedChunk)
-		// if(i==2){
-		// 	console.log(startArray,'startArraystartArray');
+		// if(i>95&& i<105){
+		// 	console.log(startArray,'startArray-------');
 		// }
-		
 		//crc检验
 		const crcStr='0x'+crc8IEEE8023(startArray).toString(16).toUpperCase()
 		const testCrc=parseInt(crcStr,16)
+		
 		startArray.push(crcStr)
-		// if(i==2){
-		// 	console.log(startArray,crcStr,testCrc,'crcStr');
-		// }
 		startArray.push(0xAA,0xAA)
 		startArray.unshift(0x22,0x22,0x30)
         result.push(startArray);
@@ -269,82 +310,21 @@ function makeArr(array) {
 
 
 function splitNumber(num) {
-    // 将数字转换为字符串
-    const numStr = num.toString();
-
-    // 使用正则表达式分割字符串为两位一组
-    const parts = numStr.match(/.{1,2}/g) || [];
-
-    // 将字符串数组转换为数字数组
-    let result = parts.map(part => parseInt(part, 10));
-
-    // 如果数组长度为 1，前面补一个 0
-    if (result.length === 1) {
-        result = [0, ...result];
-    }
-
-    return result;
+	let highByte = (num >> 8) & 0xFF; // 对于0-255的数字，结果总是0
+	// 低字节
+	let lowByte = num & 0xFF;
+  
+	// 将每个字节转换为两位的十六进制字符串，并添加'0x'前缀
+	let highHex = highByte.toString(16).toUpperCase().padStart(2, '0'); // 确保是两位十六进制数
+	let lowHex = lowByte.toString(16).toUpperCase().padStart(2, '0');  // 确保是两位十六进制数
+  
+	// 返回结果数组（这里实际上可以返回一个对象或字符串，根据需求调整）
+	return ['0x' + highHex, '0x' + lowHex];
 }
 
 
-function dataRecursion(subPackage){
-	subIndex += 1
-	let endPackage = 0x00
-	if(subPackage.groupedArray.length - 1 == subIndex){
-		endPackage = 0x01
-	}
-	// let startArray = [0x22,0x22,0x30, 0x30,0x00, 0x58,0x00]
-	let startArray = [0x00,0x58,0x00]
-	//包长度 固件类型到前一位 0x00,0x58  0x00
-	//crc  包长度到crc前一位
-	//升级包大小
-	 startArray = startArray.concat(decimalToHexBytes(subPackage.size,4))
-	 //软件包id
-	 startArray = startArray.concat(decimalToHexBytes(subIndex + 1,2))
-	 //是否为最后一个包
-	 startArray.push(endPackage)
-	 //软件数据包
-	startArray = startArray.concat(subPackage.groupedArray[subIndex])
-	//crc检验
-	const crcStr=crc8IEEE8023(startArray)
-	startArray.push(crcStr)
-	startArray.unshift(0x22,0x22,0x30)
-	startArray = startArray.concat([0xAA,0xAA])
-	// console.log(startArray)
-	return [startArray]
-}
 
-function arrayBufferToHexWithPrefix(buffer,groupSize = 80) {
-	 const uint8Array = new Uint8Array(buffer);
-	  const groupedArray = [];
-	  const size = uint8Array.length
-	  // 遍历数据，每 groupSize 个字节为一组
-	  for (let i = 0; i < size; i += groupSize) {
-	    const group = Array.from(uint8Array.slice(i, i + groupSize)) // 获取当前分组
-	      // .map(byte => '0x' + byte.toString(16).padStart(2, 0)); // 添加 0x 前缀
-	    groupedArray.push(group); // 将分组添加到结果中
-	  }
-	
-	  return {
-		  size,
-		  groupedArray
-	  };
-}
 
-//进制转化
-function decimalToHexBytes(decimal,bytes){
-	const maxValue = Math.pow(2, 8 * bytes) - 1;
-	 // 创建一个数组来存储字节
-	    const byteArray = new Array(bytes);
-	    // 将十进制数分解为字节
-	    for (let i = 0; i < bytes; i++) {
-	        // 每次取最低的8位（一个字节）
-	        byteArray[bytes - 1 - i] = decimal & 0xff;
-	        // 右移8位，处理下一个字节
-	        decimal >>>= 8;
-	    }
-	    return byteArray;
-}
 
 module.exports = {
 	readServiceID: readServiceID,
@@ -356,12 +336,14 @@ module.exports = {
 	isDevice: isDevice,
 	alterConnect: alterConnect,
 	readData: readData,
-	stateUpdate: stateUpdate,
-	turnOn: turnOn,
-	turnOff: turnOff,
+	turnOffCar: turnOffCar,
 	isSingleBt: isSingleBt,
 	haveBms: haveBms,
 	switchFactory: switchFactory,
-	otaUpgrade
+	otaUpgrade,
+	findCarCmd,
+	turnOffCar,
+	turnOnCar,
+	getCarPressure
 
 };

locale/zh.json

@@ -14,12 +14,14 @@
 	"设备信息":"设备信息",
 	"软件版本":"软件版本",
 	"开机":"开机",
+	"开启车辆":"开启车辆",
+	"关闭车辆":"关闭车辆",
 	"闪灯鸣笛":"闪灯鸣笛",
 	"打开座桶":"打开座桶",
 	"打开尾箱":"打开尾箱",
 	"更多功能":"更多功能",
 	"开启车辆":"开启车辆",
-	"确定打开":"确定打开",
+	"您确认":"您确认",
 	"取消":"取消",
 	"确定":"确定",
 	"更多功能":"更多功能",

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "名师傅换电",
-    "appid" : "__UNI__111A022",
+    "name" : "弗兰克app",
+    "appid" : "__UNI__E67DD80",
     "description" : "",
     "versionName" : "1.3.0",
     "versionCode" : 130,
@@ -127,9 +127,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        // "appid" : "wx868f4e5130ef2636", //小众出行
-        "appid" : "wxefa2810018787a41", //智寻小租
-
+        "appid" : "wxefa2810018787a41",
         // "appid": "wxfa47ec20c664ad3e", //可人智行
         // "appid" : "wx56681a7f2fe324ed",//名师傅出行
         "setting" : {

pages/bluetoothUnlock/bluetoothPair.vue

@@ -40,7 +40,6 @@
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
-	var ZXCar = require('@/common/bluetooth/ZXCar.js');
 	export default {
 		components: {
 			CenterDialog,
@@ -58,20 +57,34 @@
 		},
 		methods: {
 			otaUpgrade(){
+				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) {
 								// 蓝牙未连接
 								console.log('蓝牙连接断开11111');
+								if(!res.connected){
+									uni.showModal({
+										title: '提示',
+										confirmText: '重新连接',
+										content: '蓝牙连接中断，是否重新连接？',
+										success: function(res) {
+											if (res.confirm) {
+												me.loadBluetooth();
+											} else {}
+										}
+									});
+								}
 								// common.simpleToast('蓝牙连接断开1111', 2000)
 							} else {
 								console.log('蓝牙连接成功2222');
-								// common.simpleToast('蓝牙连接成功2222', 2000)
+								common.simpleToast('蓝牙连接成功', 2000)
 							}
 						});
 						// if (!res.connected) {
@@ -98,7 +111,7 @@
 			console.log(11112222);
 				bluetooth.closeBluetoothAdapter();
 				bluetooth.closeDevice(
-					"900000996",
+					"900000997",
 					() => {
 						// this.setData({
 						// 	bt_loading: false
@@ -106,13 +119,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 切换正常工厂模式');
 						//切换工厂模式以后蓝牙断开 重新连接蓝牙
@@ -130,9 +143,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"
 				};
@@ -143,7 +156,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();
@@ -168,18 +190,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,
@@ -202,14 +213,14 @@
 							
 							},
 							(res) => {
-								console.log('观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限');
+								console.log('观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限',res,res.errCode);
 								uni.hideLoading();
 								// var showContent = ""
 								// if (res && ("errCode" in res)) {
 								// 	if (res.errCode == 9000001) {
 								// 		var showContent = "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
 								// 	} else {
-								// 		var showContent = "连接失败，请尝试重新连接44444"
+								// 		var showContent = "连接失败，请尝试重新连接44444"+res.errCode
 								// 	}
 								// } else {
 								// 	var showContent = "连接失败，请尝试重新连接55555"
@@ -226,18 +237,18 @@
 								// });
 							}, 
 							(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

@@ -105,14 +105,14 @@ export default {
       }
     },
     linkTo() {
-		uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-      // const allPermissionsGranted = Object.values(this.permisionCheckObj).every(value => value === true);
-      // if (allPermissionsGranted) {
-      //   this.close()
-      //   uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-      // } else {
-      //   permision.gotoAppPermissionSetting()
-      // }
+		// uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+      const allPermissionsGranted = Object.values(this.permisionCheckObj).every(value => value === true);
+      if (allPermissionsGranted) {
+        this.close()
+        uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+      } else {
+        permision.gotoAppPermissionSetting()
+      }
     },
     close() {
       this.$emit('input', false)
@@ -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/components/control/control.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="container-view-contril">
 		<scroll-view class="scroll-view flex-row" scroll-x="true">
-			<view @tap="tapOpen" v-for="(item,index) of contrilList" :key="index" class="contril-item flex-row">
+			<view @tap="tapOpen" v-for="(item,index) of contrilList" :key="index" :data-item="item" class="contril-item flex-row">
 				<img class="contril-item-img"  :src="item.iconUrl" alt="">
 				<text>{{item.name}}</text>
 			</view>
@@ -12,11 +12,11 @@
 		</scroll-view>
 		<view v-if="popupShow" class="show-modal">
 			<view class="modal-info">
-				<view class="popup-title">{{$t("开启车辆")}}</view>
-				<view class="popup-content">{{$t("确定打开")}}</view>
+				<view class="popup-title">{{$t(popText)}}</view>
+				<view class="popup-content">{{$t("您确认")+$t(popText)}}</view>
 				<view class="flex-row modal-footer">
 					<view class="show-btn cencel-btn-pop" @tap="closePopup">{{$t("取消")}}</view>
-					<view class="show-btn ok-btn-pop" >{{$t("确定")}}</view>
+					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>
 				</view>
 			</view>
 		</view>
@@ -62,8 +62,8 @@
 </template>
 
 <script>
-// component/nomore/nomore.js
-
+	var app = getApp();
+	var bluetooth = require('@/common/bluetooth.js');
 export default {
 	props:{
 		contrilList: {
@@ -74,6 +74,7 @@ export default {
 	
     data() {
         return {
+			popText:'',
 			popupShow:false,
 			controlType:null,//选择的车辆控制
 			isShowMore:false
@@ -87,8 +88,40 @@ export default {
      * 组件的方法列表
      */
     methods: {
-		tapOpen(){
-			this.popupShow=true
+		tapOpen(e){
+			const {name} = e.currentTarget.dataset.item;
+			this.setData({
+				popText:name,
+				popupShow:true
+			})
+		},
+		tapBlueToothCmd(){
+			// const isLock=this.contrilList.map(i=>i.isLock||false)
+			if(this.popText=='开机'){
+				bluetooth.turnOnCar('900000997',()=>{
+					console.log('发送开机指令结束');
+				})
+			}else if(this.popText=='闪灯鸣笛'){
+				bluetooth.findCarCmd('900000997',()=>{
+					console.log('发送闪灯鸣笛指令结束');
+				})
+			}else if(this.popText=='打开座桶'){
+				bluetooth.openCarSeat('900000997',()=>{
+					console.log('发送打开座桶指令结束');
+				})
+			}else if(this.popText=='打开尾箱'){
+				bluetooth.openCarTrunk('900000997',()=>{
+					console.log('发送打开尾箱指令结束');
+				})
+			}else if(this.popText=='关机'){
+				bluetooth.turnOffCar('900000997',()=>{
+					console.log('发送关机指令结束');
+				})
+			}else if(this.popText=='胎压'){
+				bluetooth.getCarPressure('900000997',()=>{
+					console.log('发送胎压指令结束');
+				})
+			}
 		},
 		closePopup(){
 			this.popupShow=false

pages/index/index.vue

@@ -190,9 +190,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"
 				};