Merge branch 'lw_test' into gyq_test

common/bluetooth.js

@@ -22,6 +22,7 @@ const bluetoothDevices = {
 };
 //初始化蓝牙
 function initBluetooth() {
+	console.log('initBluetooth');
     //监听蓝牙适配器状态变化事件
     uni.onBluetoothAdapterStateChange((res) => {
         console.log(res);
@@ -29,6 +30,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;
@@ -39,6 +41,7 @@ function initBluetooth() {
     });
     //监听低功耗蓝牙设备的特征值变化事件。必须先启用 notifyBLECharacteristicValueChange 接口才能接收到设备推送的 notification
     uni.onBLECharacteristicValueChange((res) => {
+		// console.log(res,'restest1111');
         if (app.globalData.connectionState[res.deviceId]) {
             const device = app.globalData.connectionState[res.deviceId].device;
 			if (
@@ -413,7 +416,7 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
                                                 // 判断设备是否有alterConnect方法
                                                 if (bluetoothDeviceConfig(device).alterConnect) {
                                                     var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-													console.log(data,'data111111');
+													console.log(data[0],'data111111');
                                                     // 判断alterConnect方法是否返回数据
                                                     if (data) {
                                                         // 写入数据
@@ -564,6 +567,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
     // 将数据转换为ArrayBuffer类型
     var buffer;
     buffer = common.toArrayBuffer(data.shift());
+	// console.log(buffer,'buffer111');
     // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
     uni.writeBLECharacteristicValue({
         deviceId: deviceId,
@@ -572,7 +576,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
         value: buffer,
         // 成功回调函数
         success(res) {
-            console.log('writeData 写入成功');
+            // console.log('writeData 写入成功');
             // 如果数据长度为0，则调用回调函数
             if (data.length == 0) {
                 callback(res);
@@ -929,7 +933,7 @@ function sendSwitchNormalCommand(macid, callback = () => {}, fail = () => {}) {
     return false;
 }
 
-async function sendOTACommand(macid, value, callback = () => {}, fail = () => {}) {
+function sendOTACommand(macid, callback = () => {}, fail = () => {}) {
 	
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
@@ -938,14 +942,28 @@ async function sendOTACommand(macid, value, callback = () => {}, fail = () => {}
     }
     const device = app.globalData.connectionState[deviceId].device;
 	
-    if ( await !bluetoothDeviceConfig(device).otaUpgrade) {
+    if ( !bluetoothDevices[device.device_type].otaUpgrade) {
         fail();
         return false;
     }
-    var data = await bluetoothDeviceConfig(device).otaUpgrade(value - 0, device);
+    var data = bluetoothDevices[device.device_type].otaUpgrade(device,deviceId);
     if (data) {
-        writeData(device, deviceId, data, callback, fail);
-        return true;
+		
+		data.then(result => {
+			    writeData(device, deviceId, [result[0]], callback, fail);
+				// const testData=result.slice(0,3)
+				// const testData=result
+				// for(let i = 0; i < testData.length; i++){
+				// 	if(i==(testData.length-1)){
+				// 		console.log('发送升级文件结束');
+				// 	}
+				// 	console.log(testData[i],'[testData[i]]');
+				// 	writeData(device, deviceId, [testData[i]], callback, fail);
+				// }
+			}).catch(error => {
+				console.error(error); // 如果Promise被拒绝，这将打印出错误信息
+			});
+       return true;
     }
     fail();
     return false;

common/bluetooth/ZXCar.js

@@ -9,6 +9,8 @@ const writeID = '000036F5-0000-1000-8000-00805F9B34FB';
 const MTU = 115;
 const app = getApp();
 let subIndex = -1
+let commands = []; // 升级包指令数组，每个指令是一个 ArrayBuffer
+let currentCommandIndex = 1;
 
 function acceptDevice(device) {
 	return device.btid ? true : false;
@@ -27,7 +29,7 @@ function haveBms() {
 function isDevice(device, data) {
 	// console.log(device,data,'device111');
 	const advertisData = new Uint8Array(data.advertisData);
-	console.log(advertisData,'判断返回第几个字段是正常模式还是升级模式');
+	// console.log(advertisData,'判断返回第几个字段是正常模式还是升级模式');
 	//打印返回广播 判断返回字段是正常模式还是升级模式
 	// console.log(advertisData.slice(4, 10).toString(),'device2222');
 	const mac = device.btid
@@ -49,16 +51,23 @@ function isDevice(device, data) {
 function alterConnect(device, deviceId) {
 	//登录 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  16:00:05
+	//时间戳 0x67AC53E7 0x65,0xB3,0xED,0x6F 16:00:05
 	//切换正常，工厂下发指令 [[0x22,0x22,0x54,0x01,0x01,0x12,0xAA,0xAA]]
 	//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,
-	// 	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]
-	const crc_data = crc8Ieee8023(data)
-	console.log(crc_data, 111);
+	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
@@ -67,56 +76,56 @@ function alterConnect(device, deviceId) {
 	//return [sendCommand(0x01, [0xAB, 0xCD, 0xAB, 0xCD])]
 }
 
+function crc8IEEE8023(data) {
+    const poly = 0x07; // IEEE 802.3 polynomial x^8 + x^2 + x + 1
+    let crc = 0x00;
 
-function crc8Ieee8023(data) {
-	let crc = 0x00; // 初始化CRC为0
-	const polynomial = 0x07; // CRC-8 IEEE 802.3 多项式
-	// 遍历数据数组中的每个字节
-	for (let byte of data) {
-		crc ^= byte; // 将当前字节与CRC寄存器进行异或操作
-		// 对CRC寄存器的每一位进行8次迭代
-		for (let i = 0; i < 8; i++) {
-			if (crc & 0x80) { // 检查最高位是否为1
-				crc = (crc << 1) ^ polynomial; // 左移一位并与多项式异或
-			} else {
-				crc <<= 1; // 仅左移一位
-			}
-		}
-		// 截断CRC到8位（在JavaScript中这一步是多余的，因为位运算会自动处理溢出）
-		crc &= 0xFF;
-	}
-
-	// 返回CRC校验码的最低8位，并转换为十六进制字符串
-	return '0x' + crc.toString(16).toUpperCase().padStart(2, '0'); // 使用padStart确保结果始终是两位十六进制数
+    for (let i = 0; i < data.length; i++) {
+        crc ^= data[i];
+        for (let j = 0; j < 8; j++) {
+            if (crc & 0x80) {
+                crc = ((crc << 1) ^ poly) & 0xFF;
+            } else {
+                crc = (crc << 1) & 0xFF;
+            }
+        }
+    }
+    return crc;
 }
 
-//connectDevice 打开连接  findDevice 查找设备
+
 
 //收到硬件方向软件方发送的数据
 function readData(device, value, data) {
 	// console.log(value, 'test1111');
 	var value = new Uint8Array(value);
-	console.log(value, 'value**************************');
-	switch (value[0]) {
-			case 0:
-				//登陆成功准备
-				switchFactory(device)
-				break;
-		}
-	// switch(value[2]){
-	// 	case 0x66:
+	
+	const normalArray = Array.from(value); // 或 [...uint8Array]
+	console.log(normalArray, 'value**************************');
+	// switch (value[0]) {
+	// 		case 0:
+	// 			//登陆成功准备
+	// 			switchFactory(device)
+	// 			break;
+	// 	}
+	switch(normalArray[3]){
+		case 0x00:
+		sendNextCommand(device.mac_id)
+		break;
 		
-	// 	break;
-	// }
+		case 0x01:
+		test()
+		break;
+	}
 
 	return data;
 }
-
-function parseOTAData(){
-	//解析是否成功&&第几个包
-	//如果是第一个包成功 发送第二个包的数据 //otaUpgrade
+function test(){
+	currentCommandIndex=1
+	console.log(commands[currentCommandIndex],'test');
 }
 
+
 function sendCommand(cmd, data = []) {
 	const startCmd = [0x02, 0x02]
 	const endCmd = [0xAA, 0xAA]
@@ -145,55 +154,166 @@ function switchFactory(device, deviceId) {
 	return [[0x22,0x22,0x54,0x01,0x01,0x12,0xAA,0xAA]]
 	// return [sendCommand([0x54, 0x01, 0x01, 0x12])];
 }
+//升级按钮
+function otaUpgrade(device){
+	
+	const data = readBinBinarayToCommand()
+	data.then(result=>{commands=result})
+	
+	// console.log(data,'datatest111');
+	return data
+}
+async function readBinBinarayToCommand() {
+	let res =await uni.request({
+	  url: 'https://opt.bms16.com/ota.BIN', // 文件的网络地址
+	  method: 'GET',
+	  responseType: 'arraybuffer', // 指定响应类型为 arraybuffer
+	});
+	const arrayBuffer=res[1].data
+	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
+}
 
-//升级OTA
-async function otaUpgrade(device, deviceId) {
-	//return [sendCommand([0x54,0x01,0x01,0x12])];
-	//第一步先读取BIN文件的二进制流
-	const subPackage = await readBinBinarayToCommand()
-	// console.log(dataRecursion(subPackage,subIndex))
-	return dataRecursion(subPackage)
-	// //提取分包数据
-	// var subPackage = []
-	// for(var i=0;Math.ceil(fileCommandList.length/80) >i;i++){
-	// 	//提取数组的分割数据
-	// 	var subCmd = []
-	// 	subCmd = [0x22,0x22,]
-	// 	//[[0x01,0x02,0x23],[0x04,0x05,0x06]] subPackage
-	// 	subPackage.push(subCmd) //提取80个数据 0-80 81-160 
-	// }
-	// return [subPackage[2]] 
+function sendNextCommand(mac_id) {
+	console.log(commands[currentCommandIndex],'command');
+    if (currentCommandIndex >= commands.length) {
+        console.log('所有指令发送完成');
+        return;
+    }
+	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == mac_id);
+    if (deviceId == undefined) {
+		console.log('deviceId == undefined');
+        return ;
+    }
+    const command = [commands[currentCommandIndex]];
+	
+	if(command.length==0){
+		return
+	}
+	// 将数据转换为ArrayBuffer类型
+	var buffer;
+	buffer = common.toArrayBuffer(command.shift());
+	// console.log(command,'command');
+    uni.writeBLECharacteristicValue({
+        deviceId: deviceId, // 替换为实际的设备 ID
+        serviceId: writeServiceID, // 替换为实际的服务 ID
+        characteristicId: writeID, // 替换为可写入的特征值 ID
+        value: buffer,
+        success() {
+            // console.log('指令发送成功，等待设备响应');
+        },
+        fail(err) {
+            console.error('指令发送失败', err);
+        }
+    });
+    currentCommandIndex++;
 }
 
+function splitArrayIntoChunks(array, chunkSize) {
+    const numChunks = Math.ceil(array.length / chunkSize);
+    return Array.from({ length: numChunks }, (_, i) => {
+        return array.slice(i * chunkSize, (i + 1) * chunkSize);
+    });
+}
+
+
+// 处理分割后的数组
+function makeArr(array) {
+    const result = [];
+    for (let i = 0; i < array.length; i ++) {
+       
+		let endPackage = 0x00
+		if((i + 1) >= array.length){
+			//当前是最后一次循环
+			endPackage = 0x01
+		}
+		//协议号 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]
+		startArray.push(packageLen,...totalPackageSize)
+		 //软件包id
+		const ids=splitNumber(i)  // 0x00,0x01
+		startArray.push(...ids)
+		 //是否为最后一个包
+		startArray.push(endPackage)
+		 //软件数据包
+		const formattedChunk = array[i].map(byte => `0x${byte.toString(16).padStart(2, '0')}`); // 转换为 0xXX 格式 
+		startArray.push(...formattedChunk)
+		// if(i==2){
+		// 	console.log(startArray,'startArraystartArray');
+		// }
+		
+		//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);
+    }
+	// result.push([0x22,0x22,0x30,0x58,0x00,0x00,0x00,0xE9,0xD4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2C,0xAA,0xAA])
+    return result;
+}
+
+
+
+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;
+}
+
+
 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 = [0x22,0x22,0x30, 0x30,0x00, 0x58,0x00]
+	let startArray = [0x00,0x58,0x00]
+	//包长度 固件类型到前一位 0x00,0x58  0x00
+	//crc  包长度到crc前一位
+	//升级包大小
 	 startArray = startArray.concat(decimalToHexBytes(subPackage.size,4))
-	 console.log(222222)
+	 //软件包id
 	 startArray = startArray.concat(decimalToHexBytes(subIndex + 1,2))
+	 //是否为最后一个包
 	 startArray.push(endPackage)
+	 //软件数据包
 	startArray = startArray.concat(subPackage.groupedArray[subIndex])
-	startArray.push(0xCB)
-	console.log(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
+	// console.log(startArray)
+	return [startArray]
 }
 
-async function readBinBinarayToCommand() {
-	let res = await uni.request({
-	  url: 'https://opt.bms16.com/ota.BIN', // 文件的网络地址
-	  method: 'GET',
-	  responseType: 'arraybuffer', // 指定响应类型为 arraybuffer
-	});
-	
-	return arrayBufferToHexWithPrefix(res[1].data)
-}
 function arrayBufferToHexWithPrefix(buffer,groupSize = 80) {
 	 const uint8Array = new Uint8Array(buffer);
 	  const groupedArray = [];

common/config.js

@@ -166,5 +166,9 @@ var config = {
 	API_FLK_ORDER_INFO: api_web_url + '?r=flk/order/info',
 	//申请还车
 	API_FLK_CAR_RETURN_CAR: api_web_url + '?r=flk/car/return-car',
+	//添加用车人
+	API_FLK_ADD_SHARE_USER: api_web_url + '?r=flk/car/add-share-user',
+	//删除用车人
+	API_FLK_REMOVE_SHARE_USER: api_web_url + '?r=flk/car/remove-share-user',
 };
 module.exports = config;

pages/bluetoothUnlock/bluetoothPair.vue

@@ -19,7 +19,7 @@
 			<view class="text">使用感应解锁功能时，请务必保证手机蓝牙功能开启，在蓝牙列表中忽略此设备会导致感应解锁失败</view>
 		</view>
 
-		<view class="pair-btn" style="bottom: 240rpx;" @tap="switchNormal">切换正常 工厂模式</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" />
@@ -57,9 +57,30 @@
 			this.bluetoothClose()
 		},
 		methods: {
-			async otaUpgrade(){
-				this.initiateBluetoothPairing()
-				
+			otaUpgrade(){
+				common.loading()
+				console.log('开始升级');
+				bluetooth.sendOTACommand('900000996', (res) => {
+						uni.hideLoading();
+						// console.log('结束？？？？？');
+						bluetooth.onConnectionStateChange('900000996', 'index', (res) => {
+							uni.hideLoading();
+							if (!res.connected) {
+								// 蓝牙未连接
+								console.log('蓝牙连接断开11111');
+								// common.simpleToast('蓝牙连接断开1111', 2000)
+							} else {
+								console.log('蓝牙连接成功2222');
+								// common.simpleToast('蓝牙连接成功2222', 2000)
+							}
+						});
+						// if (!res.connected) {
+						// 	// 蓝牙未连接
+						// 	common.simpleToast('蓝牙连接断开1111', 2000)
+						// } else {
+						// 	common.simpleToast('蓝牙连接成功2222', 2000)
+						// }
+					});
 			},
 			 initiateBluetoothPairing() {
 				const deviceName = '电动车蓝牙';
@@ -70,8 +91,8 @@
     //             想与您配对，请确保显示的配对密钥为
     //             <span style="color:#060809;font-weight:bold">${pairingCode}</span>`
 				// });
-				
 				this.loadBluetooth()
+				
 			},
 			bluetoothClose: function() {
 			console.log(11112222);
@@ -90,12 +111,13 @@
 			},
 			switchNormal(){
 				const me=this
+				app.globalData.connectionState={}
 				bluetooth.sendSwitchNormalCommand('900000996', (res) => {
 						// uni.hideLoading();
 						console.log(res,'sendSwitchNormalCommand 切换正常工厂模式');
 						//切换工厂模式以后蓝牙断开 重新连接蓝牙
 						console.log(app.globalData,'app.globalData');
-						app.globalData.connectionState={}
+						
 						me.loadBluetooth()
 						// if (!res.connected) {
 						// 	// 蓝牙未连接
@@ -133,6 +155,8 @@
 							// 		}
 							// 	});
 							console.log('test');
+							console.log(app.globalData.connectionStateChangeFunc,'app.globalData.connectionStateChangeFunc');
+							//监听蓝牙特征值状态变化事件
 							// 	bluetooth.onCharacteristicStateChange(device.mac_id, 'index', (data) => {
 							// 		console.log(data,'datatest');
 							// 		if (JSON.stringify(data) != '{}') {
@@ -144,15 +168,18 @@
 							// 			}
 							// 		}
 							// 	});
-								// 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) {
+										// 蓝牙未连接
+										console.log('蓝牙连接断开11111');
+										// common.simpleToast('蓝牙连接断开1111', 2000)
+									} else {
+										console.log('蓝牙连接成功2222');
+										// common.simpleToast('蓝牙连接成功2222', 2000)
+									}
+								});
 							// 	bluetooth.sendGetCabinetInfoCommand(
 							// 		device.mac_id,
 							// 		device,

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<block v-if="car_list.length != 0">
+		<block >
 			<view class="container-view">
 			<view class="flex-row flex-between align-center padding_about_40">
 				<view class="car-name-view" @tap="navSwitchCar">
@@ -28,7 +28,7 @@
 				<img src="https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX" style="width: 100%;height: 526rpx;" alt="">
 				<view class="flex-row align-center update-time-view" >
 					<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
-					<text style="margin-right: 10rpx;">{{$t("更新于")}} 11-25 23:05 </text>
+					<text style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time}}11-25 23:05 </text>
 					<img src="https://qiniu.bms16.com/FsL6XWGoIhfsVB7jRg6EGFVsuaTZ" style="width: 24rpx;height: 32rpx;" alt="">
 				</view>
 			</view>
@@ -84,7 +84,7 @@
 			<view style="height: 264rpx;"></view>
 			</view>
 		</block>
-		<block v-else>
+		<block v-if="false">
 			<UnleasedPages :model_list="model_list" :img_list="img_list" />
 		</block>
 		<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />

pages/powerSetting/powerSetting.vue

@@ -44,9 +44,8 @@
 				<view class="setting-list-text flex-row">感应解锁</view>
 			</view>
 		</view>
-		
-		<view v-if="!target_user_id" @click="submit" class="check-btn add-btn">确认添加</view>
-		<view v-else @click="delSubmit" class="check-btn del-btn">删除成员</view>
+		<view v-if="!isSet" @tap="addUserBtn" class="check-btn add-btn">确认添加</view>
+		<view v-else @tap="delUserBtn" class="check-btn del-btn">删除成员</view>
 	</view>
 </template>