安卓配对

App.vue

@@ -72,7 +72,9 @@
 			reponseData: {},
 			bluetoothConfig: {},
 			deviceBTBMSBuf: {} ,// 用于分包组包
-			permissionArr:[]
+			permissionArr:[],
+			nearLockInfo:{},//蓝牙配对信息
+			sensitivityType:0,//车辆灵敏度存储
 		}
 	};
 </script>

common/bluetooth.js

@@ -25,19 +25,20 @@ function initBluetooth() {
 	console.log('initBluetooth');
     //监听蓝牙适配器状态变化事件
     uni.onBluetoothAdapterStateChange((res) => {
-        console.log(res);
+        console.log(res,'onBluetoothAdapterStateChange');
         Object.keys(app.globalData.adapterStateChangeFunc).forEach((n) => app.globalData.adapterStateChangeFunc[n](res));
     });
     //监听低功耗蓝牙连接状态的改变事件。包括开发者主动连接或断开连接，设备丢失，连接异常断开等等
     uni.onBLEConnectionStateChange((res) => {
 		console.log('蓝牙状态变化/可能是断开连接',res);
-		
+		// console.log(app.globalData.connectionState,'app.globalData.connectionState');
         if (app.globalData.connectionState[res.deviceId]) {
             app.globalData.connectionState[res.deviceId].connected = res.connected;
             const device = app.globalData.connectionState[res.deviceId].device;
             if (app.globalData.connectionStateChangeFunc[device.mac_id]) {
                 Object.keys(app.globalData.connectionStateChangeFunc[device.mac_id]).forEach((p) => app.globalData.connectionStateChangeFunc[device.mac_id][p](res));
             }
+			// console.log(app.globalData.connectionStateChangeFunc[device.mac_id],'app.globalData.connectionStateChangeFunc');
         }
     });
     //监听低功耗蓝牙设备的特征值变化事件。必须先启用 notifyBLECharacteristicValueChange 接口才能接收到设备推送的 notification
@@ -45,18 +46,21 @@ function initBluetooth() {
 		// console.log(res,'restest1111');
         if (app.globalData.connectionState[res.deviceId]) {
             const device = app.globalData.connectionState[res.deviceId].device;
+			// console.log(res.serviceId.toUpperCase() == bluetoothDeviceConfig(device).readServiceID.toUpperCase(),'00000');
 			if (
                 res.serviceId.toUpperCase() == bluetoothDeviceConfig(device).readServiceID.toUpperCase() &&
                 res.characteristicId.toUpperCase() == bluetoothDeviceConfig(device).readID.toUpperCase()
             ) {
                 var data = bluetoothDeviceConfig(device).readData(device, res.value, app.globalData.connectionState[res.deviceId].data);
+				// console.log(data,'data--------');
 				if (data) {
                     app.globalData.connectionState[res.deviceId].data = data;
                     if (app.globalData.characteristicStateChangeFunc[device.mac_id]) {
                         Object.keys(app.globalData.characteristicStateChangeFunc[device.mac_id]).forEach((p) =>
                             app.globalData.characteristicStateChangeFunc[device.mac_id][p](data)
                         );
-                        console.log(app.globalData.connectionState[res.deviceId].data);
+						common.simpleToast(app.globalData.connectionState[res.deviceId].data)
+                        // console.log(app.globalData.connectionState[res.deviceId].data);
                     }
                 }
             }
@@ -569,7 +573,8 @@ function bmsSet(macid, name, vars, callback = () => {}, fail = () => {}) {
 // 定义一个函数，用于向蓝牙设备写入数据
 function writeData(device, deviceId, data, callback = () => {}, fail = () => {}) {
     // 如果数据长度为0，则直接返回
-    if (data.length == 0) {
+    console.log(data,'data');
+	if (data.length == 0) {
         return;
     }
     // 将数据转换为ArrayBuffer类型
@@ -977,7 +982,8 @@ function sendOTACommand(macid, callback = () => {}, 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);
+    console.log('test');
+	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
         return false;
@@ -995,24 +1001,55 @@ function executeDeviceCommand(macid, commandName, callback = () => {}, fail = ()
     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);
 }
+//打开接近解锁
+function nearUnlock(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'nearUnlock', callback, fail);
+}
+//关闭接近解锁
+function nearCloseUnlock(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'nearCloseUnlock', callback, fail);
+}
+//获取灵敏度设置
+function getSensitivity(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'getSensitivity', callback, fail);
+}
+//设置灵敏度
+function setSensitivity(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'setSensitivity', callback, fail);
+}
+//
+function setNearUnlock(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'setNearUnlock', callback, fail);
+}
+//获取靠近解锁设置
+function getNearUnlockSet(macid, callback = () => {}, fail = () => {}) {
+    return executeDeviceCommand(macid, 'getNearUnlockSet', callback, fail);
+}
+
 
 module.exports = {
     initBluetooth: initBluetooth,
@@ -1069,6 +1106,12 @@ module.exports = {
 	openCarSeat,
 	openCarTrunk,
 	getCarPressure,
+	nearUnlock,
+	nearCloseUnlock,
+	getSensitivity,
+	setSensitivity,
+	getNearUnlockSet,
+	setNearUnlock,
 	
 	
 };

common/bluetooth/ZXCar.js

@@ -1,6 +1,7 @@
 const common = require('../common.js');
 
 const FMBMS = require('./FMBMS.js');
+var bluetooth = require('@/common/bluetooth.js');
 
 const readServiceID = '0000FEE7-0000-1000-8000-00805F9B34FB';
 const readID = '000036F6-0000-1000-8000-00805F9B34FB';
@@ -11,6 +12,9 @@ const app = getApp();
 let subIndex = -1
 let commands = []; // 升级包指令数组，每个指令是一个 ArrayBuffer
 let currentCommandIndex = 1;
+var totalLength = 0 //总包长度
+var joinPack = []//接收到的数据包
+var readRepeatTime = 0 //读到完整数据包的时间戳
 
 function acceptDevice(device) {
 	return device.btid ? true : false;
@@ -52,6 +56,7 @@ function isDevice(device, data) {
 }
 
 function alterConnect(device, deviceId) {
+	readRepeatTime=0
 	// 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]]
@@ -104,46 +109,83 @@ function stringToHexArray(str) {
 
 
 
+
 //收到硬件方向软件方发送的数据
 function readData(device, value, data) {
 	// console.log(value, 'test1111');
 	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;
+	const bmsData=Array.from(test);
+	const normalArray =packBmsData(bmsData) 
+	
+	if(normalArray){
+		console.log(normalArray[2],'normalArray---------------');
+		switch(normalArray[2]){
+			case 0x60:
+			//登陆指令
+			loginCmd(device.mac_id,normalArray)
+			break;
+			
+			case 0x61||0x62||0x65:
+			//开机指令
+			trunCarCommand(device.mac_id,normalArray)
+			break;
+			
+			case 0x66:
+			//升级指令
+			checkSendNextCommand(device.mac_id,normalArray)
+			break;
+			
+			case 0x7C:
+			//接近解锁指令
+			nearCarCmd(device.mac_id,normalArray)
+			break;
+			case 0x7E:
+			//升级指令
+			getNearCarCmdInfo(device.mac_id,normalArray)
+			break;
 		}
 	}
-	switch(normalArray[3]){
-		case 0x00:
-		sendNextCommand(device.mac_id)
-		break;
-		
 		
-		case 0x01:
-		uni.hideLoading();
-		console.log(normalArray,commands.length,currentCommandIndex-1,commands[currentCommandIndex-3],commands[currentCommandIndex-2],commands[currentCommandIndex-1], 'value**************************');
-		common.simpleToast('升级文件回复失败', 2000)
-		// test() 升级文件回复失败
-		break;
-	}
+	// 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 {}
+	// 				}
+	// 			});
+	// 			return [1,1,2,3]
+	// 			break;
+	// 	}
+	// }else if(normalArray[0]==0x00&&normalArray.length==1){
+	// 	// common.simpleToast('开机成功', 2000)
+	// 	return '操作成功'
+	// }else{
+	// 	switch(normalArray[3]){
+	// 		case 0x00:
+	// 		sendNextCommand(device.mac_id)
+	// 		break;
+			
+			
+	// 		case 0x01:
+	// 		uni.hideLoading();
+	// 		console.log(normalArray,commands.length,currentCommandIndex-1,commands[currentCommandIndex-3],commands[currentCommandIndex-2],commands[currentCommandIndex-1], 'value**************************');
+	// 		common.simpleToast('升级文件回复失败', 2000)
+	// 		// test() 升级文件回复失败
+	// 		break;
+	// 	}
+	// }
+	
 
 
 	
@@ -154,9 +196,127 @@ function readData(device, value, data) {
 	return data;
 }
 
+function loginCmd(mac_id,data){
+	const len=data.length-4
+	if(data[len-1]==0x00 && data[len]==0x01){
+		uni.showModal({
+			title: '提示',
+			confirmText: '开始升级',
+			content: '登陆成功，当前处于升级模式是否开始升级',
+			success: function(res) {
+				if (res.confirm) {
+					currentCommandIndex=0
+					otaUpgrade().then(()=>{
+						//登陆成功  且当前为升级模式可以发送升级文件
+						sendNextCommand(device.mac_id)
+					})
+				} else {}
+			}
+		});
+	}else if(data[4]==0x00 && data[4]==0x00){
+		// uni.hideLoading();
+		//正常模式
+		console.log('登陆成功');
+		if('lockType' in app.globalData.nearLockInfo ){
+			if(app.globalData.nearLockInfo.lockType==0){
+				console.log('获取接近解锁指令为关闭');
+				
+			}else{
+				uni.hideLoading();
+				console.log('获取接近解锁指令为成功');
+			}
+		}else{
+			const getNearUnlockSetCmd=getNearUnlockSet()
+			console.log(getNearUnlockSetCmd,'getNearUnlockSetCmd');
+			writeData(mac_id,getNearUnlockSetCmd)
+		}
+	}
+}
+function checkSendNextCommand(mac_id,data){
+	const len=data.length-4
+	if(data[len]==0x00){
+		sendNextCommand(device.mac_id)
+	}else if(data[len]==0x01){
+		uni.hideLoading();
+		// console.log(normalArray,commands.length,currentCommandIndex-1,commands[currentCommandIndex-3],commands[currentCommandIndex-2],commands[currentCommandIndex-1], 'value**************************');
+		common.simpleToast('升级文件回复失败')
+	}
+}
+function trunCarCommand(mac_id,data){
+	uni.hideLoading();
+	const len=data.length-4
+	if(data[len]==0x00){
+		common.simpleToast('操作成功')
+	}else if(data[len]==0x01){
+		common.simpleToast('操作失败')
+	}
+}
+function nearCarCmd(mac_id,data){
+	uni.hideLoading();
+	const len=data.length-4
+	if(data[len]==0x00){
+		common.simpleToast('操作成功')
+	}else if(data[len]==0x01){
+		common.simpleToast('操作失败')
+	}
+}
+
+
+
+
+//处理蓝牙三段回复 综合成一个数组
+function packBmsData(value) {
+  if (value.length!=0) {
+	  console.log(endTime - readRepeatTime);
+    if (endTime - readRepeatTime > 8000) {//超过8秒，说明数据有问题，数据清空
+      readRepeatTime = endTime
+      joinPack = []
+    }
+	// console.log((value[0] == 0x22) && (value[1]== 0x22),joinPack,'000000');
+    if((value[0] == 0x22) && (value[1]== 0x22)){//当开始符为标志符 代表接收包开始
+      var endTime = new Date().getTime()
+		  totalLength = value[3]//包长度
+		  joinPack=value
+      // console.log(joinPack,value,'111111');
+    }else if(joinPack.length!=0 && (joinPack[0] == 0x22) && (joinPack[1]== 0x22)){
+		const len=joinPack.length-1
+		const diffJoinLength =joinPack.length-4
+		readRepeatTime = endTime
+		// console.log(totalLength,diffJoinLength,value,'2222222');
+		if(totalLength > diffJoinLength){//内容长度符合为完整包
+			joinPack.push(...value)
+			return joinPack
+		}else if(totalLength <= diffJoinLength){
+			joinPack = []
+		}
+	}
+    else{
+		readRepeatTime = endTime
+		joinPack = []
+		return joinPack
+    }
+  }
+}
+
+function mergeUint8Array(arr1, arr2) {
+    let len1 = arr1 ? arr1.length : 0;
+    let len2 = arr2.length;
+    let arr = new Uint8Array(len1 + len2);
+
+    for (let i = 0; i < len1; i++) {
+        arr[i] = arr1[i];
+    }
+
+    for (let i = 0; i < len2; i++) {
+        arr[len1 + i] = arr2[i];
+    }
+
+    return arr;
+}
 
 //发送指令封装
 function sendCommand(cmd, data = []) {
+	readRepeatTime=0
 	let cmdData = [0x22, 0x22]
 	// cmdData.push(cmd)
 	//协议号 cmd
@@ -164,9 +324,9 @@ function sendCommand(cmd, data = []) {
 	const dataLen=parseInt(data.length.toString(16).toUpperCase(), 16)
 	//信息内容 cmd
 	//crc校验
-	const pData=[dataLen,cmd]
+	const pData=[dataLen,...data]
 	const crcData='0x'+crc8IEEE8023(pData).toString(16).toUpperCase()
-	cmdData.push(cmd,dataLen,cmd,crcData,0xAA, 0xAA)
+	cmdData.push(cmd,dataLen,...data,crcData,0xAA, 0xAA)
 	// console.log(cmdData,'cmdDatacmdData');
 	return cmdData
 }
@@ -191,6 +351,52 @@ function openCarTrunk(device, deviceId) {
 function getCarPressure(device, deviceId) {
 	return [sendCommand(0x4A,[0x4A])];
 }
+function nearUnlock(device, deviceId) {
+	return [sendCommand(0x4B,[0x02])];
+}
+function nearCloseUnlock(device, deviceId) {
+	return [sendCommand(0x4B,[0x00])];
+}
+function getSensitivity(device, deviceId) {
+	return [sendCommand(0x4F,[0x4F])];
+}
+function setSensitivity(device, deviceId,type) {
+	return [sendCommand(0x4E,['0x4'+type])];
+}
+function setNearUnlock(device, deviceId,type) {
+	return [sendCommand(0x4D,[0x4D])];
+}
+function getNearUnlockSet(device, deviceId,type) {
+	return [sendCommand(0x4D,[0x4D])];
+}
+
+function getNearCarCmdInfo(mac_id,data){
+	const pData={
+		lockType:data[4],//接近解锁配置
+		level:data[5],//感应等级
+		status:data[6]//配对状态
+	}
+	console.log(pData,data,pData.status,'pData');
+	app.globalData.nearLockInfo=pData
+	if(pData.lockType==0x02||pData.lockType==0x01){
+		console.log('已开启配对');
+		common.simpleToast('感应解锁已开启,前往设置灵敏度页面')
+		uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockset' })
+		uni.hideLoading();
+		if( pData.status == 0x01){
+			common.simpleToast('配对成功')
+			return 
+		}else if(pData.status==0x00){
+			common.simpleToast('未配对')
+		}
+	}else if(pData.lockType==0x00){
+		console.log('未开启配对')
+		const nearUnlockCmd=nearUnlock()
+		console.log(nearUnlockCmd,'nearUnlockCmd');
+		writeData(mac_id,nearUnlockCmd)
+	}
+		
+}
 
 function switchFactory(device, deviceId) {
 	//切换正常，工厂模式指令
@@ -222,7 +428,8 @@ async function readBinBinarayToCommand() {
 }
 
 function sendNextCommand(mac_id) {
-	console.log(currentCommandIndex,commands.length,'开始发送指令');
+	readRepeatTime=0
+	// console.log(currentCommandIndex,commands.length,'开始发送指令');
 	// console.log(commands[currentCommandIndex],'command');
     if (currentCommandIndex >= commands.length) {
 		uni.hideLoading();
@@ -238,7 +445,7 @@ function sendNextCommand(mac_id) {
 	if(command.length==0){
 		return
 	}
-	// 将数据转换为ArrayBuffer类型
+	// // 将数据转换为ArrayBuffer类型
 	var buffer;
 	buffer = common.toArrayBuffer(command.shift());
 	// console.log(command,'command');
@@ -283,7 +490,8 @@ function makeArr(array) {
 		const packageLen=parseInt((array[i].length+8).toString(16).toUpperCase(), 16)
 		
 		// const totalPackageSize=[0x00,0x00,0x01,0xE9,0xD4]
-		const totalPackageSize=[0x00,0x00,0x01,0xeb,0xfc]
+		// const totalPackageSize=[0x00,0x00,0x01,0xeb,0xfc]
+		const totalPackageSize=[0x00,0x00,0x01,0xAB,0xFC]
 		startArray.push(packageLen,...totalPackageSize)
 		 //软件包id
 		const ids=splitNumber(i)  // 0x00,0x01
@@ -324,6 +532,45 @@ function splitNumber(num) {
 	return ['0x' + highHex, '0x' + lowHex];
 }
 
+// 定义一个函数，用于向蓝牙设备写入数据
+function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
+    const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == mac_id);
+    if (deviceId == undefined) {
+        return ;
+    }
+	// 如果数据长度为0，则直接返回
+	if (data.length == 0) {
+        return;
+    }
+    // 将数据转换为ArrayBuffer类型
+    var buffer;
+    buffer = common.toArrayBuffer(data.shift());
+    // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
+    uni.writeBLECharacteristicValue({
+        deviceId: deviceId,
+        serviceId: writeServiceID,
+        characteristicId: writeID,
+        value: buffer,
+        // 成功回调函数
+        success(res) {
+            // 如果数据长度为0，则调用回调函数
+            if (data.length == 0) {
+                callback(res);
+            } else {
+                // 否则，延时500毫秒后再次调用writeData函数
+                setTimeout(() => {
+                    writeData(device, deviceId, data, callback, fail);
+                }, 500);
+            }
+        },
+        // 失败回调函数
+        fail(res) {
+            console.log(res);
+            // 调用失败回调函数
+            fail(res);
+        }
+    });
+}
 
 
 
@@ -346,6 +593,13 @@ module.exports = {
 	findCarCmd,
 	turnOffCar,
 	turnOnCar,
-	getCarPressure
+	getCarPressure,
+	nearUnlock,
+	nearCloseUnlock,
+	getSensitivity,
+	setSensitivity,
+	getNearUnlockSet,
+	setNearUnlock,
+	
 
 };

common/storage.js

@@ -35,8 +35,9 @@ const ICONS = {
 }
 const activeTabs = [{
 		name: i18n.t('开机'),
-		type:'tronOnOrOff',
+		type:'turnOnOrOff',
 		iconUrl: `${QINIU_URL}Fp5T9lSNakoiioji6S7W4DmFQ_ys`,
+		offUrl: `${QINIU_URL}FqxGx0H169EOJN0__Ym2Ls8x2i03`,
 		isLock: true,
 		isTurnOn:1
 	},

js_sdk/wa-permission/permission.js

@@ -264,21 +264,58 @@ function checkSystemEnableLocation() {
 		return result
 	}
 }
+//获取ios手机权限
+// 判断位置权限是否始终开启
+function judgeIosPermissionLocationAlways() {
+    var result = false;
+    var cllocationManger = plus.ios.import("CLLocationManager");
+    var status = cllocationManger.authorizationStatus();
+    var enable = cllocationManger.locationServicesEnabled();
+    if (status == 3 && enable) {
+        result = true;
+        console.log("位置权限始终开启");
+    } else {
+        console.log("位置权限不是始终开启");
+    }
+    plus.ios.deleteObject(cllocationManger);
+    return result;
+}
 
+// 判断是否开启精准位置权限
+function judgeIosPermissionLocationAccuracy() {
+    var result = false;
+    var cllocationManger = plus.ios.import("CLLocationManager");
+    var status = cllocationManger.authorizationStatus();
+    if (status == 3 || status == 4) {
+        result = true;
+        console.log("精准位置权限已开启");
+    } else {
+        console.log("精准位置权限未开启");
+    }
+    plus.ios.deleteObject(cllocationManger);
+    return result;
+}
 
 //获取安卓手机权限
-function requestAndroidPermissions() {
-	const locationPermission=checkLocationPermission()
-	const optimizationStatus=checkBatteryOptimizationStatus()
-	// const runningPermission=checkBackgroundRunningPermission()
-	// const lockStatus=checkAppLockStatus()
-	const permissionArr=[
-		{type: 'location',state:locationPermission,title: ('位置权限'), desc: '打开手机定位，并运行APP始终使用'},
-		{type: 'battery',state:optimizationStatus,title: ('电池优化'),  desc: '打开电池优化设置， 将弗兰克APP加入保护名单'},
-		// {type: 'appLock',state:lockStatus},
-		// {type: 'backstage',state:runningPermission},
-		// {type: 'appLock',state:lockStatus},
-	]
+function requestAndroidPermissions(type) {
+	let permissionArr=[]
+	if(type=='ios'){
+		// const awalysLocation=judgeIosPermissionLocationAlways()
+		// const preciseLocation=judgeIosPermissionLocationAccuracy()
+		const awalysLocation=true
+		const preciseLocation=true
+		permissionArr=[
+			{type: 'awalysLocation',state:awalysLocation,title: ('使用App期间'), desc: '允许访问位置信息'},
+			{type: 'preciseLocation',state:preciseLocation,title: ('精准位置'),  desc: '开启精准位置开关'},
+		]
+	}else if(type=='android'){
+		const locationPermission=checkLocationPermission()
+		const optimizationStatus=checkBatteryOptimizationStatus()
+		permissionArr=[
+			{type: 'location',state:locationPermission,title: ('位置权限'), desc: '打开手机定位，并运行APP始终使用'},
+			{type: 'battery',state:optimizationStatus,title: ('电池优化'),  desc: '打开电池优化设置， 将弗兰克APP加入保护名单'},
+		]
+	}
 	return permissionArr
 }
 
@@ -420,4 +457,7 @@ module.exports = {
 	checkBackgroundRunningPermission,
 	requestAndroidPermissions,
 	openAppLockSettings,//前往打开应用锁
+	judgeIosPermissionLocationAlways,
+	judgeIosPermissionLocationAccuracy
+
 }

mixin/index.js

@@ -0,0 +1,23 @@
+// mixins/countdownMixin.js
+var bluetooth = require('@/common/bluetooth.js');
+export default {
+  data() {
+    return {
+      testCountdown: 10, // 倒计时初始值
+    };
+  },
+  methods: {
+    startCountdown(t) {
+      this.testCountdown=20
+	  console.log('test-----',t,this.testCountdown);
+    },
+  },
+  created(){
+	  this.startCountdown(1)
+  },
+  mounted() {
+	  this.startCountdown(2)
+  },
+  beforeDestroy() {
+  },
+};

pages/bluetoothUnlock/bluetoothPair.vue

@@ -19,7 +19,8 @@
 			<view class="text">使用感应解锁功能时，请务必保证手机蓝牙功能开启，在蓝牙列表中忽略此设备会导致感应解锁失败</view>
 		</view>
 
-		<!-- <view class="pair-btn" style="bottom: 240rpx;" @tap="switchNormal">切换正常 升级模式</view> -->
+		<view class="pair-btn" style="bottom: 340rpx;" @tap="nearCloseUnlockBtn">关闭靠近解锁</view>
+		<view class="pair-btn" style="bottom: 240rpx;" @tap="nearUnlockBtn">靠近解锁</view>
 		<view class="pair-btn" style="bottom: 140rpx;" @tap="otaUpgrade">OTA升级</view>
 		<view class="pair-btn" @tap="initiateBluetoothPairing">开始配对</view>
 		<CenterDialog confirmText="配对" ref="centerDialog" />
@@ -53,6 +54,10 @@
 		},
 		created(){
 			bluetooth.initBluetooth()
+			//初始化 连接蓝牙  -下发配对指令 -会断开连接-直接再次连接 记得不要提示可以蓝牙断开连接
+			//点击配对-连接蓝牙-调用配对-确认配对  取消 断开蓝牙 不走逻辑
+			//
+			// this.loadBluetooth()
 			this.bluetoothClose()
 		},
 		methods: {
@@ -140,6 +145,25 @@
 						// }
 					});
 			},
+			nearUnlockBtn(){
+				bluetooth.nearUnlock('900000997', (res) => {
+						console.log('接近解锁下发成功');
+					});
+			},
+			nearCloseUnlockBtn(){
+				bluetooth.nearCloseUnlock('900000997', (res) => {
+						console.log('接近解锁下发成功');
+					});
+			},
+			isBluetoothLock(mac_id){
+				// if()
+				bluetooth.getNearUnlockSet(mac_id, 'index',(res)=>{
+					
+					//下发打开接近解锁指令
+					console.log('获取接近解锁下发成功');
+					// common.simpleToast('蓝牙连接断开')
+				})
+			},
 			loadBluetooth() {
 				const me = this;
 				var device = {
@@ -155,15 +179,22 @@
 					bluetooth.openBluetoothAdapter((res) => {
 						common.loading()
 						bluetooth.connectDevice(device, () => {
-							uni.hideLoading();
+							
+							// bluetooth.getNearUnlockSet(device.mac_id,)
+							// uni.hideLoading();
 							//监听蓝牙设备连接状态变化事件
 							bluetooth.onConnectionStateChange(device.mac_id, 'index', (res) => {
-								uni.hideLoading();
+								
 								if (!res.connected) {
-									// 蓝牙未连接
-									common.simpleToast('蓝牙连接断开')
+									// 蓝牙连接断开
+									console.log('蓝牙连接断开');
+									me.loadBluetooth()
+									// common.simpleToast('蓝牙连接断开')
 								} else {
-									common.simpleToast('蓝牙连接成功')
+									console.log('蓝牙连接成功');
+									// uni.hideLoading();
+									me.isBluetoothLock(device.mac_id)
+									
 								}
 							});
 							// uni.hideLoading()
@@ -176,8 +207,8 @@
 							// 			common.simpleToast('蓝牙连接成功2222', 2000)
 							// 		}
 							// 	});
-							console.log('test');
-							console.log(app.globalData.connectionStateChangeFunc,'app.globalData.connectionStateChangeFunc');
+							// console.log('test');
+							// console.log(app.globalData.connectionStateChangeFunc,'app.globalData.connectionStateChangeFunc');
 							//监听蓝牙特征值状态变化事件
 							// 	bluetooth.onCharacteristicStateChange(device.mac_id, 'index', (data) => {
 							// 		console.log(data,'datatest');
@@ -265,30 +296,7 @@
 					// });
 				}
 			},
-			reportCabintInfo(dev_id, list){
-				 var pushList = []
-					for (var i = 0; list.length > i; i++) {
-					  var sublist = []
-					  for (var j = 0; list[i].length > j; j++) {
-						sublist.push(parseInt(list[i][j]))
-					  }
-					  pushList.push(sublist)
-					}
-					const pData = {
-					  dev_id: dev_id,
-					  data: JSON.stringify(pushList)
-					}
-					const me = this
-					http.postApi(config.API_CABINET_BLUETOOTH_INFO, pData, function (response) {
-					  if (response.data.code === 200) {
-						// me.setData({
-						//   cabinetInfo: response.data.data.cabinetInfo
-						// })
-					  } else {
-						simpleToast(response.data.msg)
-					  }
-					})
-			},
+			
 		}
 	}
 </script>

pages/bluetoothUnlock/bluetoothUnlockAuth.vue

@@ -1,19 +1,19 @@
 <template>
     <view>
-        <AndroidUnlockAuth v-model="show" v-if="platform === 'android'" />
-        <IosUnlockAuth v-model="show" v-else-if="platform === 'ios'" />
+<!--        <AndroidUnlockAuth v-model="show" v-if="platform === 'android'" />
+        <IosUnlockAuth v-model="show" v-else-if="platform === 'ios'" /> -->
     </view>
 </template>
 
 <script>
-import AndroidUnlockAuth from './components/AndroidUnlockAuth.vue'
-import IosUnlockAuth from './components/IosUnlockAuth.vue'
+// import AndroidUnlockAuth from './components/AndroidUnlockAuth.vue'
+// import IosUnlockAuth from './components/IosUnlockAuth.vue'
 var bluetooth = require('@/common/bluetooth.js');
 
 export default {
     components: {
-        AndroidUnlockAuth,
-        IosUnlockAuth
+        // AndroidUnlockAuth,
+        // IosUnlockAuth
     },
     data() {
         return {
@@ -22,17 +22,21 @@ export default {
         }
     },
     onLoad() {
-		
-		
         this._initPlatform();
 		
     },
+	onshow(){
+			const systemInfo = uni.getSystemInfoSync();
+			console.log(systemInfo.platform,'systemInfo.platform');
+			this.platform = systemInfo.platform;
+	},
     methods: {
         open() {
             this.show = true;
         },
         _initPlatform() {
             const systemInfo = uni.getSystemInfoSync();
+			console.log(systemInfo.platform,'systemInfo.platform');
             this.platform = systemInfo.platform;
         },
 		

pages/bluetoothUnlock/components/IosUnlockAuth.vue

@@ -1,94 +0,0 @@
-<template>
-    <u-popup v-model="showDialog" mode="bottom" border-radius="28" @close="close">
-        <view class="dialog-content">
-            IOS
-            <view class="title">清先开启位置授权</view>
-            <view class="tips">为保证 感应解锁 的正常使用，请 开启位置授权 并 打开精准位置 开关，可提高解锁成功率，且不会明显增加手机电量消耗。</view>
-            <view class="authorization-wrap">
-                <!-- <view class="corner-mark">授权引导</view> -->
-                 <view class="step-item">
-                    
-                 </view>
-            </view>
-            <view class="btn" @tap="close">我已开启</view>
-        </view>
-    </u-popup>
-</template>
-
-<script>
-export default {
-    props: {
-        value: {
-            type: Boolean,
-            default: false
-        }
-    },
-    data() {
-        return {
-            showDialog: this.value
-        }
-    },
-    watch: {
-        value(newValue) {
-            this.showDialog = newValue
-        }
-    },
-    methods: {
-        close() {
-            this.$emit('input', false)
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.dialog-content {
-    width: 100%;
-    height: 100%;
-    background: #F1F3F4;
-    padding: 40rpx 32rpx;
-    .title {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 600;
-        font-size: 40rpx;
-        color: #060809;
-    }
-    .tips {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
-        font-size: 24rpx;
-        color: #828DA2;
-        line-height: 40rpx;
-        margin: 32rpx 0 40rpx;
-    } 
-    .authorization-wrap {
-        background: #fff;
-        width: 100%;
-        height: 728rpx;
-        width: 100%;
-        border-radius: 40rpx;
-        padding: 30rpx 24rpx;
-        position: relative;
-        .corner-mark {
-
-        }
-    }
-    .btn {
-        margin-top: 40rpx;
-        width: 100%;
-        height: 80rpx;
-        background: #060809;
-        border-radius: 40rpx;
-        color: #fff;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 500;
-        font-size: 32rpx;
-        &:active {
-            opacity: 0.8;
-        }
-    }
-}
-</style>

pages/bluetoothUnlock/unlockSet.vue

@@ -10,7 +10,7 @@
                     <view class="sub-text">手机接近车辆后，长按Auto键即可解锁</view>
                 </view>
             </view>
-            <view class="sensitivity-set" @tap="showSensitivityDialog = true">
+            <view class="sensitivity-set" @tap="openSensitivityDialog">
                 <view class="txt">{{ $t('灵敏度设置') }}</view>
             </view>
         </view>
@@ -19,26 +19,44 @@
         <u-popup v-model="showSensitivityDialog" mode="bottom" border-radius="28" @close="close">
             <view class="popup-content">
                 <view class="title">灵敏度设置</view>
-                <view class="text">距离建议适中，设置过近会降低成功率，设置</view>
-                <u-slider v-model="sensitivityValue"></u-slider>
-
+                <view class="text">距离建议适中，设置过近会降低成功率，设置过远可能会有风险</view>
+				<u-slider v-model="sensitivityValue" :step="1" :min="0" :max="4" @end="changeValue"></u-slider>
+				<slider v-model="sensitivityValue" @change="changeValue"  height="16rpx" :step="1" :min="0" :max="4" activeColor="#060809" backgroundColor="#F1F3F4" block-color="#8A6DE9" block-size="20"></slider>
+                <!-- <u-slider v-model="sensitivityValue" height="16rpx" inactive-color="#F1F3F4" active-color="#060809" :step="1" :min="0" :max="4"></u-slider> -->
             </view>
         </u-popup>
     </view>
 </template>
 
 <script>
+	var bluetooth = require('@/common/bluetooth.js');
 export default {
     data () {
         return {
             showSensitivityDialog: true,
-            sensitivityValue: 50
+            sensitivityValue: 2
         }
     },
+	onLoad(){
+		bluetooth.getSensitivity('',()=>{
+			
+		})	
+	},
     methods: {
         close () {
             this.showSensitivityDialog = false
-        }
+        },
+		openSensitivityDialog(){
+			this.showSensitivityDialog = true
+			
+		},
+		changeValue(e){
+			const type=e.detail.value
+			bluetooth.setSensitivity('',type,()=>{
+				console.log('设置灵敏度指令成功');
+			})
+			
+		}
     }
 }
 </script>
@@ -131,6 +149,10 @@ export default {
     }
     .popup-content {
         padding: 40rpx 32rpx 164rpx;
+		
+		/deep/ .uni-slider-handle-wrapper {
+				height: 16rpx !important;
+		}
         .title {
             font-family: PingFangSC, PingFang SC;
             font-weight: bold;

pages/bluetoothUnlock/components/AndroidUnlockAuth.vue → pages/index/components/AndroidUnlockAuth.vue

@@ -29,10 +29,12 @@
 
 <script>
 	var app = getApp();
-	var bluetooth = require('@/common/bluetooth.js');
 	var common = require('@/common/common.js');
-import permision from "@/js_sdk/wa-permission/permission.js"
+	import permision from "@/js_sdk/wa-permission/permission.js"
+	// import mixin from '@/mixin/index.js'; // 引入 mixin
+
 export default {
+	// mixins:[mixin],
   props: {
     value: {
       type: Boolean,
@@ -43,6 +45,7 @@ export default {
 		// bluetooth.initBluetooth()
 		// this.bluetoothClose()
 	},
+	
   data() {
     return {
       showDialog: this.value,
@@ -102,31 +105,22 @@ export default {
       // }
     },
     linkTo() {
+		// let isOpenAllPermission=false
+		// app.globalData.permissionArr.map(item=>{
+		// 	if(!item.state) isOpenAllPermission=true
+		// })
+		// if (!isOpenAllPermission) {
+		//   this.close()
+		//   uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+		// } else {
+		//   permision.gotoAppPermissionSetting()
+		// }
 		uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-      // if (!this.isOpenAllPermission) {
-      //   this.close()
-      //   uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-      // } else {
-      //   permision.gotoAppPermissionSetting()
-      // }
+      
     },
     close() {
       this.$emit('input', false)
     },
-		bluetoothClose: function() {
-			bluetooth.closeBluetoothAdapter();
-			bluetooth.closeDevice(
-				"900000997",
-				() => {
-					// this.setData({
-					// 	bt_loading: false
-					// });
-				},
-				() => {}
-			);
-			bluetooth.offCharacteristicStateChange("900000997", 'home');
-			bluetooth.offConnectionStateChange("900000997", 'home');	 
-		},
   }
 }
 </script>

pages/index/components/IosUnlockAuth.vue

@@ -0,0 +1,253 @@
+<template>
+    <u-popup v-model="showDialog" mode="bottom" border-radius="28" @close="close">
+        <view class="dialog-content">
+            <view class="title">请先开启位置授权</view>
+            <view class="tips">为保证 感应解锁 的正常使用，请 开启位置授权 并 打开精准位置 开关，可提高解锁成功率，且不会明显增加手机电量消耗。</view>
+            <view class="authorization-wrap">
+                <view class="corner-mark">授权引导</view>
+                 <view class="step-item">
+                    <view class="address-title-view flex-row">
+                    	<image style="width: 62rpx;height: 84rpx;" src="https://qiniu.bms16.com/Fve-wxQ2MHOLXoQ3IZ7QdcKoLlwW" mode=""></image>
+						<view class="address-title">
+							<view>位置权限</view>
+							<view class="address-text-tip">打开手机定位，并允许APP <text style="color: #0A59F7;">「始终」</text>使用</view>
+						</view>
+					</view>
+					<view v-for="(item, idx) in authStepList" :key="idx" @tap="enablePermissions(item)" class="permission-set-view">
+					<!-- <view class="permission-set-view" style="margin-bottom: 42rpx;"> -->
+						<view class="icon-step"><image style="width: 160rpx;height: 78rpx;" src="https://qiniu.bms16.com/FvTiAtpG8QOlJxGrNquB-yI396Be" /></view>
+						<view class="step-text">第<text style="font-size: 40rpx; font-weight: 600;margin: 0 6rpx;"> {{ idx+1 }} </text>步</view>
+						<view class="permission-tip-view flex-row flex-between">
+							<view class="permission-tip flex-row">
+								{{ item.desc }}
+								<image style="width: 28rpx;height: 28rpx;" src="https://qiniu.bms16.com/FrLjB8R1kL_AQNJjWUaKcDkLC-8O" />
+							</view>
+							<view :class="['turn-on-switch', item.state && 'is-open']">
+								{{ item.state ? $t('已开启') : $t('未开启') }}
+							</view>
+						</view>
+						<view class="permission-top-view">{{ item.title }}</view>
+						<view v-if="item.type=='awalysLocation'" class="permission-one flex-row flex-between">
+							<text class="alaways-text">始终</text>
+							<image class="check-icon" src="https://qiniu.bms16.com/Fj595k1vS6PArDsvoPTkO8PcyqRc" mode=""></image>
+						</view>
+					</view>
+					<!-- <view class="permission-set-view">
+						<view class="icon-step"><image style="width: 160rpx;height: 78rpx;" src="https://qiniu.bms16.com/FvTiAtpG8QOlJxGrNquB-yI396Be" /></view>
+						<view class="step-text">第<text style="font-size: 40rpx; font-weight: 600;margin: 0 6rpx;"> 2 </text>步</view>
+						<view class="permission-tip-view flex-row flex-between">
+							<view class="permission-tip flex-row">
+								开启请准位置开关
+								<image style="width: 28rpx;height: 28rpx;" src="https://qiniu.bms16.com/FrLjB8R1kL_AQNJjWUaKcDkLC-8O" />
+							</view>
+							<view :class="['turn-on-switch', state && 'is-open']">
+								{{ state ? $t('已开启') : $t('未开启') }}
+							</view>
+						</view>
+						<view class="permission-top-view">精准位置</view>
+					</view> -->
+                 </view>
+            </view>
+            <view class="btn" @tap="linkTo" >我已开启</view>
+        </view>
+    </u-popup>
+</template>
+
+<script>
+	// import mixin from '@/mixin'; // 引入 mixin
+export default {
+	// mixins:[mixin],
+    props: {
+        value: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+			state:true,
+            showDialog: this.value,
+			authStepList:[],
+
+        }
+    },
+    watch: {
+        value(newValue) {
+			this.showDialog = newValue
+			if (newValue) {
+				this._initCheckdPermission()
+			}
+		}
+    },
+    methods: {
+		async _initCheckdPermission() {
+			this.authStepList=app.globalData.permissionArr
+		},
+        close() {
+            this.$emit('closePermission')
+        },
+		linkTo(){
+			// let isOpenAllPermission=false
+			// app.globalData.permissionArr.map(item=>{
+			// 	if(!item.state) isOpenAllPermission=true
+			// })
+			// if (!isOpenAllPermission) {
+			//   this.close()
+			//   uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+			// } else {
+			//   permision.gotoAppPermissionSetting()
+			// }
+			uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+		}
+		
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-content {
+    width: 100%;
+    height: 100%;
+    background: #F1F3F4;
+    padding: 40rpx 32rpx;
+    .title {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 600;
+        font-size: 40rpx;
+        color: #060809;
+    }
+    .tips {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #828DA2;
+        line-height: 40rpx;
+        margin: 32rpx 0 40rpx;
+    } 
+    .authorization-wrap {
+        background: #fff;
+        // height: 728rpx;
+        width: 100%;
+        border-radius: 40rpx;
+        // padding: 30rpx 24rpx;
+        position: relative;
+		.step-item{
+			padding: 30rpx 24rpx;
+		}
+        .corner-mark {
+          width: 224rpx;
+          height: 80rpx;
+          background: #0A59F7;
+          border-radius: 40rpx 0 0 0;
+          display: flex;
+          color: #fff;
+          line-height: 86rpx;
+          text-align: center;
+          justify-content: flex-end;
+        
+          &::after {
+            content: "";
+            width: 86rpx;
+            height: 80rpx;
+            background: url('https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi');
+            background-size: 100%;
+          }
+        }
+			.address-title-view{
+				margin-bottom: 26rpx;
+			}
+			.address-title{
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 600;
+				font-size: 32rpx;
+				margin-left: 26rpx;
+				color: #060809;
+			}
+			.address-text-tip{
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #060809;
+				margin-top: 16rpx;
+			}
+			.permission-set-view{
+				background: #F4F5F6;
+				border-radius: 24rpx;
+				padding: 48rpx 36rpx 32rpx;
+				position: relative;
+			}
+			.turn-on-switch {
+			          background: #FF791A;
+			          border-radius: 20rpx;
+			          font-size: 22rpx;
+			          color: #FFFFFF;
+			          display: flex;
+			          align-items: center;
+			          justify-content: center;
+			          padding: 8rpx 20rpx;
+			
+			          &.is-open {
+			            background: #2ADA62;
+			          }
+			        }
+			.icon-step{
+				position: absolute;
+				width: 160rpx;
+				top: -10rpx;
+				left: 0;
+				z-index: 10;
+				display: flex;
+				align-items: center;
+			}
+			.step-text{
+				position: absolute;
+				width: 160rpx;
+				top: -12rpx;
+				left: 30rpx;
+				z-index: 100;
+				display: flex;
+				align-items: center;
+			}
+			.permission-tip-view{
+				margin-bottom: 20rpx;
+			}
+			.permission-tip{
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #060809;
+			}
+			.permission-top-view{
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #060809;
+				margin-bottom: 20rpx;
+			}
+			.alaways-text{
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #0A59F7;
+			}
+			.check-icon{
+				width: 40rpx;
+				height: 40rpx;
+			}
+        
+    }
+    .btn {
+        margin-top: 40rpx;
+        width: 100%;
+        height: 80rpx;
+        background: #060809;
+        border-radius: 40rpx;
+        color: #fff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 500;
+        font-size: 32rpx;
+        &:active {
+            opacity: 0.8;
+        }
+    }
+}
+</style>

pages/index/components/control/control.vue

@@ -78,6 +78,10 @@ export default {
 			type: Array,
 			default: () => []
 		},
+		accState: {
+			type: Number,
+			default: 0
+		},
 	},
 	
     data() {
@@ -174,6 +178,7 @@ export default {
 				}
 			} else {
 				const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
+				console.log(isTurnOn,this.cmdType,this.contrilList);
 				const bluetoothCommands = {
 					'turnOnOrOff': isTurnOn?bluetooth.turnOnCar:bluetooth.turnOffCar,
 					'findCar': bluetooth.findCarCmd,
@@ -182,9 +187,11 @@ export default {
 					'tirePressure': bluetooth.getCarPressure
 				};
 				
+				common.loading();
 				const command = bluetoothCommands[this.cmdType];
 				if (command) {
 					command('900000997', () => {
+						uni.hideLoading();
 						console.log(`发送${this.popText}指令结束`);
 					});
 				}

pages/index/index.vue

@@ -34,7 +34,7 @@
 					<img src="https://qiniu.bms16.com/FmhdBxGmadYQYMjwdR9U61Gg-rfs" style="width: 24rpx;height: 32rpx;" alt="">
 				</view>
 			</view>
-			<Control :contrilList="contrilList" />
+			<Control :accState="car_info.acc_state-0" :contrilList="contrilList" />
 			
 			
 			<view v-if="car_info.exchange_package_info.activity_time" class="flex-row flex-between map-card-view" >
@@ -63,7 +63,7 @@
 				</view>
 			</view>
 			<view class="config-view">
-				<view @tap="navToPage"  class="flex-row config-car-view">
+				<view   class="flex-row config-car-view">
 					<view class="margin_r_20"><img class="icon_style_64" src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
 					<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
 						<view class="flex-row font_w_600">{{$t("感应解锁")}}</view>
@@ -96,6 +96,8 @@
 		</block>
 		<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
 		<CustomTabbar curt-tab="home"/>
+		<AndroidUnlockAuth :value="isShowPermission" @closePermission="closePermission" v-if="isShowPermission && (platform === 'android')" />
+		<IosUnlockAuth :value="isShowPermission" @closePermission="closePermission" v-else-if="isShowPermission && (platform === 'ios')" />
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -111,13 +113,15 @@
 	import UnleasedPages from './components/unleasedPages/unleasedPages'
 	import CustomTabbar from '@/component/customTabbar/index';
 	import BluetoothUnlockAuth from '../bluetoothUnlock/bluetoothUnlockAuth.vue'
+	import AndroidUnlockAuth from './components/AndroidUnlockAuth.vue'
+	import IosUnlockAuth from './components/IosUnlockAuth.vue'
 	import {
 		getFunctionTag,
 	} from '@/common/storage.js';
 	import permision from "@/js_sdk/wa-permission/permission.js"
+	var bluetooth = require('@/common/bluetooth.js');
 
 	export default {
-		
 		data() {
 			return {
 				contrilList:[],
@@ -142,7 +146,9 @@
 					exchange_package_info:{
 						activity_time:0
 					}
-				}
+				},
+				platform:'ios',//手机型号
+				isShowPermission:false,//是否打开权限弹窗
 			};
 		},
 		computed: {},
@@ -151,7 +157,9 @@
 			MapCard,
 			CustomTabbar,
 			UnleasedPages,
-			BluetoothUnlockAuth
+			BluetoothUnlockAuth,
+			AndroidUnlockAuth,
+			IosUnlockAuth
 		},
 		/**
 		 * 生命周期函数--监听页面加载
@@ -162,7 +170,12 @@
 					this.loadIsLogin()
 					return
 				}
+				const systemInfo = uni.getSystemInfoSync();
+				// this.platform = systemInfo.platform; //小程序获取不到
+				// bluetooth.initBluetooth()
+				// bluetooth.openBluetoothAdapter()
 			this.loadModelList()
+			
 		},
 		/**
 		 * 生命周期函数--监听页面显示
@@ -187,6 +200,7 @@
 			//     });
 			// }
 			// app.globalData.permissionArr=permissionArr
+			this.getBluetooth()
 			console.log(33333333)
 			console.log(getFunctionTag().activeTag)
 			this.contrilList = getFunctionTag().activeTag
@@ -205,6 +219,22 @@
 			}
 		},
 		methods: {
+			getBluetooth(){
+				uni.getConnectedBluetoothDevices({
+					services:['0000FEE7-0000-1000-8000-00805F9B34FB'],
+				  success(res) {
+				    console.log("当前已连接的蓝牙设备:", res.devices);
+				    if (res.devices.length > 0) {
+				      console.log("设备可能已经配对成功");
+				    } else {
+				      console.log("没有找到已连接的设备，可能未配对");
+				    }
+				  },
+				  fail(err) {
+				    console.log("获取连接设备失败", err);
+				  }
+				});
+			},
 			loadIsLogin(){
 				uni.showModal({
 					title: '提示',
@@ -242,20 +272,31 @@
 				});
 			},
 			inductiveUnlockHandle() {
-				this.isHideInduction=false
-				let isOpenAllPermission=false
-				app.globalData.permissionArr.map(item=>{
-					if(!item.state) isOpenAllPermission=true
+				const permissionArr=permision.requestAndroidPermissions(this.platform)
+				app.globalData.permissionArr=permissionArr
+				// let isOpenAllPermission=false
+				// app.globalData.permissionArr.map(item=>{
+				// 	if(!item.state) isOpenAllPermission=true
+				// })
+				// this.isShowPermission=true
+				this.setData({
+					isShowPermission:true
 				})
+				// this.$refs.bluetoothUnlockAuth.open();	
 				// console.log(this.isOpenAllPermission,'this.isOpenAllPermission');
-				if(!isOpenAllPermission){
-					common.simpleToast('所需权限开启成功,前往开启蓝牙配对...');
-					uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-				}else{
-					this.$refs.bluetoothUnlockAuth.open();	
-				}
+				// if(!isOpenAllPermission){
+				// 	common.simpleToast('所需权限开启成功,前往开启蓝牙配对...');
+				// 	uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+				// }else{
+				// 	this.$refs.bluetoothUnlockAuth.open();	
+				// }
 				
 			},
+			closePermission(){
+				this.setData({
+					isShowPermission:false
+				})
+			},
 			showInduction(){
 				this.isHideInduction=true
 			},

pages/my/my.vue

@@ -131,7 +131,7 @@
 				}
 			},
 			loginHandle() {
-				if (!userInfo.nickname) {
+				if (!this.userInfo.nickname) {
 					uni.navigateTo({
 						url: '/pages/loginRegister/login'
 					})