Merge branch 'lw_test' into gyq_test

common/bluetooth.js

@@ -4,7 +4,7 @@ import SystemInfoUtil from './SystemInfoUtil.js';
 // 蓝牙对应的权限名称
 // 蓝牙权限对应的中文名称
 
-const app = getApp();
+// var app = null;
 const bluetoothDevices = {
     ZX16D: require('./bluetooth/ZX16D.js'),
     FMBMS: require('./bluetooth/FMBMS.js'),
@@ -23,9 +23,10 @@ const bluetoothDevices = {
 //初始化蓝牙
 function initBluetooth() {
 	console.log('initBluetooth');
+	const app = getApp();
     //监听蓝牙适配器状态变化事件
     uni.onBluetoothAdapterStateChange((res) => {
-        console.log(res,'onBluetoothAdapterStateChange');
+        console.log(app,res,'onBluetoothAdapterStateChange');
         Object.keys(app.globalData.adapterStateChangeFunc).forEach((n) => app.globalData.adapterStateChangeFunc[n](res));
     });
     //监听低功耗蓝牙连接状态的改变事件。包括开发者主动连接或断开连接，设备丢失，连接异常断开等等
@@ -45,7 +46,7 @@ function initBluetooth() {
 	// uni.onBLEMTUChange((res) => {
 	//   console.log("MTU 变更:", res.mtu); // 实际生效的 MTU 大小
 	// });
-	console.log("监听值")
+	console.log(app,"监听值")
     //监听低功耗蓝牙设备的特征值变化事件。必须先启用 notifyBLECharacteristicValueChange 接口才能接收到设备推送的 notification
     uni.onBLECharacteristicValueChange((res) => {
 		console.log(res,'restest1111');
@@ -59,6 +60,7 @@ function initBluetooth() {
                 var data = bluetoothDeviceConfig(device).readData(device, res.value, app.globalData.connectionState[res.deviceId].data);
 				// console.log(data,'data--------');
 				if (data) {
+					const app = getApp();
                     app.globalData.connectionState[res.deviceId].data = data;
                     if (app.globalData.characteristicStateChangeFunc[device.mac_id]) {
                         Object.keys(app.globalData.characteristicStateChangeFunc[device.mac_id]).forEach((p) =>
@@ -74,14 +76,17 @@ function initBluetooth() {
 }
 // 监听蓝牙适配器状态变化事件
 function onAdapterStateChange(name, callback) {
+	const app = getApp();
     app.globalData.adapterStateChangeFunc[name] = callback;
 }
 // 移除蓝牙适配器状态变化事件的监听
 function offAdapterStateChange(name) {
+	const app = getApp();
     delete app.globalData.adapterStateChangeFunc[name];
 }
 // 监听蓝牙设备连接状态变化事件
 function onConnectionStateChange(macid, name, callback) {
+	const app = getApp();
     if (!app.globalData.connectionStateChangeFunc[macid]) {
         app.globalData.connectionStateChangeFunc[macid] = {};
     }
@@ -89,12 +94,14 @@ function onConnectionStateChange(macid, name, callback) {
 }
 // 移除蓝牙设备连接状态变化事件的监听
 function offConnectionStateChange(macid, name) {
+	const app = getApp();
     if (app.globalData.connectionStateChangeFunc[macid]) {
         delete app.globalData.connectionStateChangeFunc[macid][name];
     }
 }
 // 监听蓝牙特征值状态变化事件
 function onCharacteristicStateChange(macid, name, callback) {
+	const app = getApp();
     if (!app.globalData.characteristicStateChangeFunc[macid]) {
         app.globalData.characteristicStateChangeFunc[macid] = {};
     }
@@ -102,6 +109,7 @@ function onCharacteristicStateChange(macid, name, callback) {
 }
 // 移除蓝牙特征值状态变化事件的监听
 function offCharacteristicStateChange(macid, name) {
+	const app = getApp();
     if (app.globalData.characteristicStateChangeFunc[macid]) {
         delete app.globalData.characteristicStateChangeFunc[macid][name];
     }
@@ -136,6 +144,7 @@ function openBluetoothAdapter(callback = () => {}, fail = () => {}) {
 function closeBluetoothAdapter(callback = () => {}, fail = () => {}) {
     uni.closeBluetoothAdapter({
         success: (res) => {
+			const app = getApp();
             app.globalData.adapterStateChangeFunc = {};
             app.globalData.connectionStateChangeFunc = {};
             app.globalData.characteristicStateChangeFunc = {};
@@ -189,6 +198,7 @@ function isVoltageToEle(device) {
 }
 // 根据macid判断是否是单蓝牙设备
 function isSginleBtByMacid(macid) {
+	const app = getApp();
     // 根据macid查找设备id
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     // 打印全局连接状态
@@ -234,6 +244,7 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
 							// console.log(data,'data***************');
 							// 判断设备是否为指定设备
 							if (bluetoothDeviceConfig(device).isDevice(device, data)) {
+								const app = getApp();
 								// uni.offBluetoothDeviceFound();
 								uni.stopBluetoothDevicesDiscovery(); //查找到蓝牙设备停止搜索
 								deviceId = data.deviceId;
@@ -284,6 +295,7 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                         // 停止蓝牙设备搜索
                         uni.stopBluetoothDevicesDiscovery();
                         deviceId = data.deviceId;
+						const app = getApp();
                          // 检查全局状态中是否已经存在该设备
                         if (app.globalData.connectionState[deviceId]) {
                             app.globalData.connectionState[deviceId].device = device;
@@ -321,6 +333,8 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
     if (!bluetoothDeviceConfig(device) || !bluetoothDeviceConfig(device).acceptDevice(device)) {
         return;
     }
+	const app = getApp();
+	console.log(app,'连接函数connectDevice deviceId111111');
     // 获取设备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');
@@ -352,6 +366,7 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
         deviceId: deviceId,
         success: (res) => {
 			console.log(res,'蓝牙连接成功');
+			const app = getApp();
             // 更新连接状态
             app.globalData.connectionState[deviceId] = {
                 device: device,
@@ -530,7 +545,8 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
 }
 // 关闭设备连接
 function closeDevice(macid, callback = () => {}, fail = () => {}) {
-    // 获取设备ID
+    const app=getApp()
+	// 获取设备ID
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     // 如果设备ID不存在，则调用fail函数
     if (deviceId == undefined) {
@@ -550,6 +566,7 @@ function closeDevice(macid, callback = () => {}, fail = () => {}) {
         deviceId: deviceId,
         success: (res) => {
             console.log(res);
+			const app = getApp();
             // 如果设备连接状态存在，则将连接状态设置为false
             if (app.globalData.connectionState[deviceId]) {
                 app.globalData.connectionState[deviceId].connected = false;
@@ -652,6 +669,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
 	// }, 200);
 }
 function stateUpdate(macid, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -671,6 +689,7 @@ function stateUpdate(macid, callback = () => {}, fail = () => {}) {
     return false;
 }
 function voltageToEle(macid, value, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -690,6 +709,7 @@ function voltageToEle(macid, value, callback = () => {}, fail = () => {}) {
     return false;
 }
 function turnOn(macid, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -709,6 +729,7 @@ function turnOn(macid, callback = () => {}, fail = () => {}) {
     return false;
 }
 function turnOnBuzzer(macid, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -728,6 +749,7 @@ function turnOnBuzzer(macid, callback = () => {}, fail = () => {}) {
     return false;
 }
 function turnOffBuzzer(macid, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -747,6 +769,7 @@ function turnOffBuzzer(macid, callback = () => {}, fail = () => {}) {
     return false;
 }
 function turnOff(macid, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -766,6 +789,7 @@ function turnOff(macid, callback = () => {}, fail = () => {}) {
     return false;
 }
 function bmsChargingMOS(macid, value, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -785,6 +809,7 @@ function bmsChargingMOS(macid, value, callback = () => {}, fail = () => {}) {
     return false;
 }
 function bmsDischargeMOS(macid, value, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -804,6 +829,7 @@ function bmsDischargeMOS(macid, value, callback = () => {}, fail = () => {}) {
     return false;
 }
 function isConnected(macid) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         return false;
@@ -811,6 +837,7 @@ function isConnected(macid) {
     return app.globalData.connectionState[deviceId].connected;
 }
 function getData(macid) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         return false;
@@ -818,6 +845,7 @@ function getData(macid) {
     return app.globalData.connectionState[deviceId].data;
 }
 function getConnectionState(macid) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         return false;
@@ -841,6 +869,7 @@ function isUniversalBluetoothPlugin(device) {
     }
 }
 function sendHireCommand(macid, info, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -860,6 +889,7 @@ function sendHireCommand(macid, info, callback = () => {}, fail = () => {}) {
     return false;
 }
 function sendBackCommand(macid, info, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -879,6 +909,7 @@ function sendBackCommand(macid, info, callback = () => {}, fail = () => {}) {
     return false;
 }
 function sendExchangeCommand(macid, info, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -899,6 +930,7 @@ function sendExchangeCommand(macid, info, callback = () => {}, fail = () => {})
 }
 // 定义一个函数，用于发送获取柜子信息的命令
 function sendGetCabinetInfoCommand(macid, info, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     // 获取设备ID
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     console.log(deviceId,'deviceId0000');
@@ -929,6 +961,7 @@ function sendGetCabinetInfoCommand(macid, info, callback = () => {}, fail = () =
     return false;
 }
 function sendConfirmCommand(macid, value, serialNum, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -948,6 +981,7 @@ function sendConfirmCommand(macid, value, serialNum, callback = () => {}, fail =
     return false;
 }
 function sendCancelCommand(macid, serialNum, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -969,6 +1003,7 @@ function sendCancelCommand(macid, serialNum, callback = () => {}, fail = () => {
 
 //切换正常工厂模式
 function sendSwitchNormalCommand(macid, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -990,7 +1025,7 @@ function sendSwitchNormalCommand(macid, callback = () => {}, fail = () => {}) {
 }
 
 function sendOTACommand(macid, callback = () => {}, fail = () => {}) {
-	
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -1027,6 +1062,7 @@ function sendOTACommand(macid, callback = () => {}, fail = () => {}) {
 }
 function executeDeviceCommand(macid, commandName, callback = () => {}, fail = () => {}) {
     console.log('test');
+	const app = getApp();
 	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
     if (deviceId == undefined) {
         fail();
@@ -1039,7 +1075,9 @@ function executeDeviceCommand(macid, commandName, callback = () => {}, fail = ()
     }
     var data = bluetoothDeviceConfig(device)[commandName](device, deviceId);
     if (data) {
-        writeData(device, deviceId, data, callback, fail);
+		setTimeout(()=>{
+			writeData(device, deviceId, data, callback, fail);
+		},200)
         return true;
     }
     fail();
@@ -1083,6 +1121,7 @@ function getSensitivity(macid, callback = () => {}, fail = () => {}) {
 }
 //设置灵敏度
 function setSensitivity(macid,type, callback = () => {}, fail = () => {}) {
+	const app = getApp();
 	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
 	if (deviceId == undefined) {
 	    fail();

common/bluetooth/ZXCar.js

@@ -9,7 +9,6 @@ const readID = '000036F6-0000-1000-8000-00805F9B34FB';
 const writeServiceID = '0000FEE7-0000-1000-8000-00805F9B34FB';
 const writeID = '000036F5-0000-1000-8000-00805F9B34FB';
 const MTU = 115;
-const app = getApp();
 let subIndex = -1
 let commands = []; // 升级包指令数组，每个指令是一个 ArrayBuffer
 let currentCommandIndex = 1;
@@ -61,6 +60,7 @@ function isDevice(device, data) {
 
 //连接蓝牙后 发送登录指令
 function alterConnect(device, deviceId) {
+	const app = getApp();
 	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]
@@ -278,6 +278,7 @@ function trunCarCommand(mac_id,data){
 	}
 }
 function nearCarCmd(mac_id,data){
+	const app = getApp();
 	uni.hideLoading();
 	//测试
 	const len=data.length-4
@@ -288,10 +289,12 @@ function nearCarCmd(mac_id,data){
 	app.globalData.nearLockInfo=pData
 	
 	if(data[len]==0x00){
-		common.simpleToast(`请在系统通知中同意与${mac_id}配对`)
+		common.simpleToast('操作成功')
+		// common.simpleToast(`请在系统通知中同意与${mac_id}配对`)
 		
 	}else if(data[len]==0x01){
-		common.simpleToast('配对失败,请重新开始配对')
+		common.simpleToast('操作失败')
+		// common.simpleToast('配对失败,请重新开始配对')
 	}
 }
 
@@ -414,6 +417,7 @@ function getNearCarCmdInfo(macid,data){
 				lockType:data[4],//接近解锁配置
 				level:data[5],//感应等级
 			}
+		const app = getApp();
 		app.globalData.nearLockInfo=pData
 		
 		console.log('已开启配对');
@@ -430,7 +434,7 @@ function getNearCarCmdInfo(macid,data){
 		setTimeout(()=>{
 			checkUnlock(macid)
 		},300)
-	}else if(pData.lockType==0x00){
+	}else if(data[5]==0x00){
 		console.log('未开启配对')
 		const nearUnlockCmd=nearUnlock()
 		console.log(nearUnlockCmd,'nearUnlockCmd');
@@ -439,20 +443,27 @@ function getNearCarCmdInfo(macid,data){
 		
 }
 function checkUnlock(macid,type='get'){
+	const app = getApp();
 	let deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
-	let device = app.globalData.connectionState[deviceId].device
+	let device = app.globalData.connectionState[deviceId]
+	console.log(app.globalData.connectionState,'app.globalData.connectionState1111');
+	console.log(device,'device------------');
 	permision.getBondedDevices(deviceId).then(res=>{
 		if(res){
 			app.globalData.nearLockCheck=true
 			common.simpleToast('感应解锁已开启,前往设置灵敏度页面')
+			uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
+			console.log('test');
 			//redirectTo 关闭当前页面 防止用户重复操作
-			uni.redirectTo({ url: '/pages/bluetoothUnlock/unlockset' })
+			
 		}else{
 				if(type==='login'){
 							//下发接近解锁指令
 							// const nearUnlockCmd=nearUnlock()
-							// 		console.log(nearUnlockCmd,'nearUnlockCmd');
-							// 		writeData(mac_id,nearUnlockCmd)
+							// console.log(nearUnlockCmd,'nearUnlockCmd');
+							// setTimeout(() => {
+							//     writeData(macid,nearUnlockCmd)
+							// }, 500);
 							
 							// 获取接近解锁指令信息
 							const getNearUnlockSetCmd=getNearUnlockSet()
@@ -463,14 +474,14 @@ function checkUnlock(macid,type='get'){
 				}else{
 					uni.showModal({
 						title: '蓝牙配对确认',
-						content: '请在系统通知栏前往同意与'+device.name+'设备配对',
+						content: '请在系统通知栏前往同意与'+device.deviceName+'设备配对',
 						cancelText: '取消',
 						confirmText: '已同意',
 						success: function(res) {
 							if (res.confirm) {
 								checkUnlock(macid)
 							}else{
-								uni.redirectTo({ url: '/pages/index/index' })
+								// uni.redirectTo({ url: '/pages/index/index' })
 							}
 						},
 						fail: function(res) {},
@@ -514,6 +525,7 @@ async function readBinBinarayToCommand() {
 }
 
 function sendNextCommand(mac_id) {
+	const app = getApp();
 	readRepeatTime=0
 	// console.log(currentCommandIndex,commands.length,'开始发送指令');
 	// console.log(commands[currentCommandIndex],'command');
@@ -620,6 +632,7 @@ function splitNumber(num) {
 
 // 定义一个函数，用于向蓝牙设备写入数据
 function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
+	const app = getApp();
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == mac_id);
     if (deviceId == undefined) {
         return ;

component/customTabbar/index.vue

@@ -88,7 +88,7 @@
 		// },
 
 		mounted() {
-			console.log(uni.getSystemInfoSync().safeArea)
+			// console.log(uni.getSystemInfoSync().safeArea)
 		},
 		methods: {
 			routerPush(url) {

js_sdk/wa-permission/permission.js

@@ -444,7 +444,7 @@ function openGeneralSettings() {
     main.startActivity(intent);
 }
 
-async function getBondedDevices() {
+async function getBondedDevices(deviceId) {
   // #ifdef APP-PLUS
   try {
 	// 检查蓝牙是否可用
@@ -470,9 +470,10 @@ async function getBondedDevices() {
 	//   address: plus.android.invoke(device, 'getAddress'),
 	//   type: getDeviceType(plus.android.invoke(device, 'getBluetoothClass'))
 	// }));
-	const app = getApp()
 	const car_info = uni.getStorageSync('car_info') ||{}
 	const car_sn=car_info.car_sn
+	const app = getApp();
+	
 	let deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == car_sn);
 	if(!deviceId) return false
 	//配对配对蓝牙设备是否在蓝牙列表里面

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "FRANCO MORINI",
-    "appid" : "__UNI__111A022",
+    "appid" : "__UNI__E67DD80",
     "description" : "",
     "versionName" : "1.3.7",
     "versionCode" : 137,

mixin/index.js

@@ -5,7 +5,7 @@ import {
 	setFunctionTag,
 	getUserCurrentLocation
 } from '@/common/storage.js';
-var app = getApp();
+// var app = getApp();
 var config = require('@/common/config.js');
 var common = require('@/common/common.js');
 var http = require('@/common/http.js');
@@ -168,6 +168,7 @@ export default {
 		bluetoothCmd(isCarLocation) {
 			const me = this
 			const car_info = uni.getStorageSync('car_info');
+			const app = getApp();
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
 			const isBluetoothConnect = app.globalData.nearLockCheck
 			if(isBluetoothConnect){

pages/bluetoothUnlock/bluetoothPair.vue

@@ -21,7 +21,8 @@
 		</view>
 
 		<!-- 测试指令！！！别删除 -->
-		<view class="pair-btn" style="bottom: 340rpx;" @tap="nearCloseUnlockBtn">关闭靠近解锁</view>
+		<view class="pair-btn" style="bottom: 240rpx;" @tap="nearCloseUnlockBtn">关闭靠近解锁</view>
+		<!-- <view class="pair-btn" style="bottom: 240rpx;" @tap="nearTest">跳转解绑配对</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>
@@ -39,11 +40,11 @@
 	var bluetooth = require('@/common/bluetooth.js');
 	import permision from "@/js_sdk/wa-permission/permission.js"
 	const DF_CAB_INFO_DONE = 10000; //机柜信息传输完成
-	var app = getApp();
 	var config = require('../../common/config.js');
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
+	// const app = getApp({allowDefault: true})
 	export default {
 		components: {
 			CenterDialog,
@@ -63,14 +64,18 @@
 				model_name,
 				car_sn
 			})
+			 // console.log(app,'app');
+			 // return
+			 // bluetooth.initBluetooth()
+			 // this.bluetoothClose()
 			const isOpenBluetoothPermission=permision.checkBluetoothPermission()
 			if(isOpenBluetoothPermission){
-				bluetooth.initBluetooth()
 				//初始化 连接蓝牙  -下发配对指令 -会断开连接-直接再次连接 记得不要提示可以蓝牙断开连接
 				//点击配对-连接蓝牙-调用配对-确认配对  取消 断开蓝牙 不走逻辑
+				bluetooth.initBluetooth()
 				this.bluetoothClose()
 			}else{
-				common.showContent('蓝牙未启用,请先打开蓝牙')
+				common.simpleToast('蓝牙未启用,请先打开蓝牙')
 			}
 			
 		},
@@ -144,6 +149,7 @@
 			},
 			switchNormal(){
 				const me=this
+				const app=getApp()
 				app.globalData.connectionState={}
 				bluetooth.sendSwitchNormalCommand(this.car_sn, (res) => {
 						// uni.hideLoading();
@@ -187,6 +193,7 @@
 					bt_type: "ZXCAR",
 					device_type: "ZXCAR"
 				};
+				const app=getApp()
 				app.globalData.connectionState={}
 				//bluetooth.acceptDevice(device) 是否是蓝牙类型列表里面的
 				if (bluetooth.acceptDevice(device)) {
@@ -200,7 +207,7 @@
 							//监听蓝牙设备连接状态变化事件
 							bluetooth.onConnectionStateChange(device.mac_id, 'index', (res) => {
 								
-								if (!res.connected &&('lockType' in app.globalData.nearLockInfo &&app.globalData.nearLockInfo.lockType==0)) {
+								if (!res.connected &&!('lockType' in app.globalData.nearLockInfo)) {
 									// 蓝牙连接断开
 									console.log('蓝牙连接断开');
 									me.loadBluetooth()
@@ -212,51 +219,7 @@
 									
 								}
 							});
-							// uni.hideLoading()
-							// await bluetooth.sendOTACommand(device.mac_id, 'index', (res) => {
-							// 		uni.hideLoading();
-							// 		if (!res.connected) {
-							// 			// 蓝牙未连接
-							// 			common.simpleToast('蓝牙连接断开1111', 2000)
-							// 		} else {
-							// 			common.simpleToast('蓝牙连接成功2222', 2000)
-							// 		}
-							// 	});
-							// console.log('test');
-							// console.log(app.globalData.connectionStateChangeFunc,'app.globalData.connectionStateChangeFunc');
-							//监听蓝牙特征值状态变化事件
-							// 	bluetooth.onCharacteristicStateChange(device.mac_id, 'index', (data) => {
-							// 		console.log(data,'datatest');
-							// 		if (JSON.stringify(data) != '{}') {
-							// 			if (data.state === DF_CAB_INFO_DONE) {
-							// 				me.reportCabintInfo(device.mac_id, data.commandList);
-							// 				uni.hideLoading();
-							// 				common.simpleToast('蓝牙连接成功0000')
-							// 				// 进行机柜蓝牙换电 API_DAYHIRE_CABINRT_BLUETOOTH_CHANGE_BATTERY
-							// 			}
-							// 		}
-							// 	});
-								
-							// 	bluetooth.sendGetCabinetInfoCommand(
-							// 		device.mac_id,
-							// 		device,
-							// 		(res) => {
-							// 			common.loading();
-							// 		},
-							// 		(res) => {
-							// 			uni.showModal({
-							// 				title: '提示',
-							// 				confirmText: '重新连接',
-							// 				content: '连接失败，请尝试重新连接3333',
-							// 				success: function(res) {
-							// 					if (res.confirm) {
-							// 						me.loadBluetooth();
-							// 					} else {}
-							// 				}
-							// 			});
-							// 		}
-							// 	);
-							
+
 							},
 							(res) => {
 								console.log('观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限',res,res.errCode);
@@ -312,6 +275,11 @@
 					// });
 				}
 			},
+			nearTest(){
+				uni.navigateTo({
+					url:'/pages/bluetoothUnlock/unlockSet'
+				})
+			}
 			
 		}
 	}

pages/bluetoothUnlock/unlockSet.vue

@@ -43,14 +43,14 @@
 
 <script>
 	var bluetooth = require('@/common/bluetooth.js');
-	var app = getApp();
+	var common = require('@/common/common.js');
 	export default {
 		data() {
 			return {
 				stepIndex:1,
 				start:0,
 				end:0,
-				showSensitivityDialog: true,
+				showSensitivityDialog: false,
 				sensitivityValue: 1
 			}
 		},
@@ -103,7 +103,9 @@
 				})
 			},
 			closeNeerUnlock(){
-				nearCloseUnlock(car_sn,()=>{
+				const car_sn = uni.getStorageSync('car_info').car_sn
+				common.loading();
+				bluetooth.nearCloseUnlock(car_sn,()=>{
 					console.log('关闭接近解锁成功');
 				})
 			}

pages/index/index.vue

@@ -69,7 +69,7 @@
 			
 			
 					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time?'height_362':'height_260']">
-						<MapCard :car_info="car_info" :height="car_info.exchange_package_info && car_info.exchange_package_info.activity_time"/>
+						<MapCard :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
 			
 						<view class="card-right">
 							<view class="card-bg" @tap="navTravelingTrack">
@@ -276,12 +276,12 @@
 		},
 		methods: {
 			init() {
+				const app = getApp();
 				this.loadModelList()
 				this.contrilList = getFunctionTag().activeTag
 				const user_token = storage.getUserToken()
 				this.car_info = uni.getStorageSync('car_info') || {};
-				this.isBluethConnect = app.globalData.connectionState[this.car_sn] && app.globalData.connectionState[this
-					.car_sn].connected && app.globalData.nearLockCheck
+				this.isBluethConnect =  app.globalData.nearLockCheck
 				if (!user_token) return
 				this.newsNumFn()
 				this.isLogin = true