Merge branch 'lw_test' into gyq_test

.hbuilderx/launch.json

@@ -20,7 +20,7 @@
         },
         {
             "openVueDevtools" : false,
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

common/bluetooth.js

@@ -370,9 +370,10 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
             return;
         }
     }
-	const deviceIds = app.globalData.connectionState[device.mac_id].deviceId
+	const car_sn=uni.getStorageSync('car_info').car_sn
+	const deviceIds = app.globalData.connectionState[car_sn].deviceId
 	console.log(deviceIds,'deviceIds');
-	const device_name=app.globalData.connectionState[device.mac_id].deviceName
+	const device_name=app.globalData.connectionState[car_sn].deviceName
     // 创建蓝牙连接
     uni.createBLEConnection({
         deviceId: deviceIds,
@@ -433,127 +434,131 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
     }
 	console.log("xxxx2")
 	console.log(deviceId)
-    // 获取蓝牙设备的服务列表
+	  var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
 	setTimeout(()=>{
-    uni.getBLEDeviceServices({
-        deviceId: deviceId,
-        success(res) {
-            console.log(res,'res1111');
-			console.log(bluetoothDeviceConfig(device).writeServiceID)
-			// 获取蓝牙设备的写特征值
-			setTimeout(()=>{
-            uni.getBLEDeviceCharacteristics({
-                deviceId: deviceId,
-                serviceId: bluetoothDeviceConfig(device).writeServiceID,
-                success(res) {
-                    console.log(res,'res22222');
-                    // 获取蓝牙设备的读特征值
-                    uni.getBLEDeviceCharacteristics({
-                        deviceId: deviceId,
-                        serviceId: bluetoothDeviceConfig(device).readServiceID,
-                        success(res) {
-                            console.log(res,'res3333');
-                            // 监听蓝牙设备的读特征值变化
-                            uni.notifyBLECharacteristicValueChange({
-                                state: true,
-                                deviceId: deviceId,
-                                serviceId: bluetoothDeviceConfig(device).readServiceID,
-                                characteristicId: bluetoothDeviceConfig(device).readID,
-                                success(res) {
-                                    console.log(res);
-                                    // 判断设备是否支持  ，并且当前平台是否为安卓
-                                    if (bluetoothDeviceConfig(device).MTU && SystemInfoUtil.platform == SystemInfoUtil.ANDROID) {
-                                        // 设置蓝牙设备的MTU
-                                        uni.setBLEMTU({
-                                            deviceId: deviceId,
-                                            mtu: bluetoothDeviceConfig(device).MTU,
-                                            success: (res) => {
-                                                console.log('setBLEMTU success>>', res);
-                                                // 判断设备是否有alterConnect方法
-                                                if (bluetoothDeviceConfig(device).alterConnect) {
-                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-													console.log(data[0],'data111111');
-                                                    // 判断alterConnect方法是否返回数据
-                                                    if (data) {
-                                                        // 写入数据
-														setTimeout(()=>{
-															writeData(device, deviceId, data, callback, fail);
-														},100)
+		writeData(device, deviceId, data, callback, fail);
+	},3000)
+    // 获取蓝牙设备的服务列表
+	// setTimeout(()=>{
+ //    uni.getBLEDeviceServices({
+ //        deviceId: deviceId,
+ //        success(res) {
+ //            console.log(res,'res1111');
+	// 		console.log(bluetoothDeviceConfig(device).writeServiceID)
+	// 		// 获取蓝牙设备的写特征值
+	// 		setTimeout(()=>{
+ //            uni.getBLEDeviceCharacteristics({
+ //                deviceId: deviceId,
+ //                serviceId: bluetoothDeviceConfig(device).writeServiceID,
+ //                success(res) {
+ //                    console.log(res,'res22222');
+ //                    // 获取蓝牙设备的读特征值
+ //                    uni.getBLEDeviceCharacteristics({
+ //                        deviceId: deviceId,
+ //                        serviceId: bluetoothDeviceConfig(device).readServiceID,
+ //                        success(res) {
+ //                            console.log(res,'res3333');
+ //                            // 监听蓝牙设备的读特征值变化
+ //                            uni.notifyBLECharacteristicValueChange({
+ //                                state: true,
+ //                                deviceId: deviceId,
+ //                                serviceId: bluetoothDeviceConfig(device).readServiceID,
+ //                                characteristicId: bluetoothDeviceConfig(device).readID,
+ //                                success(res) {
+ //                                    console.log(res);
+ //                                    // 判断设备是否支持  ，并且当前平台是否为安卓
+ //                                    if (bluetoothDeviceConfig(device).MTU && SystemInfoUtil.platform == SystemInfoUtil.ANDROID) {
+ //                                        // 设置蓝牙设备的MTU
+ //                                        uni.setBLEMTU({
+ //                                            deviceId: deviceId,
+ //                                            mtu: bluetoothDeviceConfig(device).MTU,
+ //                                            success: (res) => {
+ //                                                console.log('setBLEMTU success>>', res);
+ //                                                // 判断设备是否有alterConnect方法
+ //                                                if (bluetoothDeviceConfig(device).alterConnect) {
+ //                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+	// 												console.log(data[0],'data111111');
+ //                                                    // 判断alterConnect方法是否返回数据
+ //                                                    if (data) {
+ //                                                        // 写入数据
+	// 													setTimeout(()=>{
+	// 														writeData(device, deviceId, data, callback, fail);
+	// 													},3000)
                                                         
-                                                    } else {
-                                                        // 调用回调函数
-                                                        callback(res);
-                                                    }
-                                                } else {
-                                                    // 调用回调函数
-                                                    callback(res);
-                                                }
-                                            },
-                                            fail: (res) => {
-                                                console.log('setBLEMTU fail>>', res);
-                                                // 判断设备是否有alterConnect方法
-                                                if (bluetoothDeviceConfig(device).alterConnect) {
-                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-                                                    // 判断alterConnect方法是否返回数据
-                                                    if (data) {
-                                                        // 写入数据
-                                                        writeData(device, deviceId, data, callback, fail);
-                                                    } else {
-                                                        // 调用回调函数
-                                                        callback(res);
-                                                    }
-                                                } else {
-                                                    // 调用回调函数
-                                                    callback(res);
-                                                }
-                                            }
-                                        });
-                                    } else {
-                                        // 判断设备是否有alterConnect方法
-                                        if (bluetoothDeviceConfig(device).alterConnect) {
-                                            var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-                                            // 判断alterConnect方法是否返回数据
-                                            if (data) {
-                                                // 写入数据
-                                                writeData(device, deviceId, data, callback, fail);
-                                            } else {
-                                                // 调用回调函数
-                                                callback(res);
-                                            }
-                                        } else {
-                                            // 调用回调函数
-                                            callback(res);
-                                        }
-                                    }
-                                },
-                                fail(res) {
-                                    // 调用失败回调函数
-                                    fail(res);
-                                }
-                            });
-                        },
-                        fail(res) {
-                            // 调用失败回调函数
-                            fail(res);
-                        }
-                    });
-				},
-                fail(res) {
-					console.log('getBLEDeviceServices fail',res);
-                    // 调用失败回调函数
-                    fail(res);
-                }
-            });	
-			},500)
+ //                                                    } else {
+ //                                                        // 调用回调函数
+ //                                                        callback(res);
+ //                                                    }
+ //                                                } else {
+ //                                                    // 调用回调函数
+ //                                                    callback(res);
+ //                                                }
+ //                                            },
+ //                                            fail: (res) => {
+ //                                                console.log('setBLEMTU fail>>', res);
+ //                                                // 判断设备是否有alterConnect方法
+ //                                                if (bluetoothDeviceConfig(device).alterConnect) {
+ //                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+ //                                                    // 判断alterConnect方法是否返回数据
+ //                                                    if (data) {
+ //                                                        // 写入数据
+ //                                                        writeData(device, deviceId, data, callback, fail);
+ //                                                    } else {
+ //                                                        // 调用回调函数
+ //                                                        callback(res);
+ //                                                    }
+ //                                                } else {
+ //                                                    // 调用回调函数
+ //                                                    callback(res);
+ //                                                }
+ //                                            }
+ //                                        });
+ //                                    } else {
+ //                                        // 判断设备是否有alterConnect方法
+ //                                        if (bluetoothDeviceConfig(device).alterConnect) {
+ //                                            var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+ //                                            // 判断alterConnect方法是否返回数据
+ //                                            if (data) {
+ //                                                // 写入数据
+ //                                                writeData(device, deviceId, data, callback, fail);
+ //                                            } else {
+ //                                                // 调用回调函数
+ //                                                callback(res);
+ //                                            }
+ //                                        } else {
+ //                                            // 调用回调函数
+ //                                            callback(res);
+ //                                        }
+ //                                    }
+ //                                },
+ //                                fail(res) {
+ //                                    // 调用失败回调函数
+ //                                    fail(res);
+ //                                }
+ //                            });
+ //                        },
+ //                        fail(res) {
+ //                            // 调用失败回调函数
+ //                            fail(res);
+ //                        }
+ //                    });
+	// 			},
+ //                fail(res) {
+	// 				console.log('getBLEDeviceServices fail',res);
+ //                    // 调用失败回调函数
+ //                    fail(res);
+ //                }
+ //            });	
+	// 		},500)
             
-        },
-        fail(res) {
+ //        },
+ //        fail(res) {
 			
-            // 调用失败回调函数
-            fail(res);
-        }
-    });
-	},500)
+ //            // 调用失败回调函数
+ //            fail(res);
+ //        }
+ //    });
+	// },500)
 }
 // 关闭设备连接
 function closeDevice(macid, callback = () => {}, fail = () => {}) {
@@ -637,7 +642,6 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
     // buffer = common.toArrayBuffer(data.shift());
 	
     //buffer = common.toArrayBuffer(data.shift());
-	console.log()
 	var byteArray = data.shift()
 	const buffer = new ArrayBuffer(byteArray.length);
 	const dataView = new DataView(buffer);
@@ -650,7 +654,8 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
 	// console.log(buffer,'buffer111');
     // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
 	// setTimeout(() => {
-    uni.writeBLECharacteristicValue({
+		plus.bluetooth.writeBLECharacteristicValue({
+    // uni.writeBLECharacteristicValue({
         deviceId: deviceId,
         serviceId: bluetoothDeviceConfig(device).writeServiceID,
         characteristicId: bluetoothDeviceConfig(device).writeID,
@@ -668,7 +673,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
                 // // 否则，延时500毫秒后再次调用writeData函数
                 setTimeout(() => {
                     writeData(device, deviceId, data, callback, fail);
-                }, 60);
+                }, 150);
             }
         },
         // 失败回调函数
@@ -1075,12 +1080,12 @@ 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);
+	const deviceId =  app.globalData.connectionState[macid].deviceId
     if (deviceId == undefined) {
         fail();
         return false;
     }
-    const device = app.globalData.connectionState[deviceId].device;
+    const device = app.globalData.connectionState[macid].device;
     if (!bluetoothDeviceConfig(device)[commandName]) {
         fail();
         return false;
@@ -1134,12 +1139,12 @@ 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);
+	const deviceId = app.globalData.connectionState[macid].deviceId
 	if (deviceId == undefined) {
 	    fail();
 	    return false;
 	}
-	const device = app.globalData.connectionState[deviceId].device;
+	const device = app.globalData.connectionState[macid].device;
 	if (!bluetoothDeviceConfig(device)[setSensitivity]) {
 	    fail();
 	    return false;

common/bluetooth/ZXCar.js

@@ -72,8 +72,8 @@ function alterConnect(device, deviceId) {
 	// const data = [0x1F, 0x0F, ,0x5A,0x58, 0x35, 0x32, 0x30, 0x32, 0x32, 0x32, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
 	console.log("校检---》")
 	let data=[ 0x1F, 0x0F]
-	const device_name=app.globalData.connectionState[device.mac_id].deviceName
-	const device_sn=stringToHexArray(device_name)
+	// const device_name=app.globalData.connectionState[device.mac_id].deviceName
+	const device_sn=stringToHexArray(device.mac_id)
 	
 	// const car_info = uni.getStorageSync('car_info')
 	// const device_sn=stringToHexArray(car_info.car_sn)
@@ -443,13 +443,14 @@ function getNearCarCmdInfo(macid,data){
 		
 }
 function checkUnlock(macid,type='get'){
-	console.log('test0000000000000');
+	
 	const res=permision.getBondedDevices()
+	console.log(res,'test0000000000000');
 	let app=getApp()
 	if(res){
 			app.globalData.nearLockCheck=true
 			common.simpleToast('感应解锁已开启,前往设置灵敏度页面')
-			uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
+			uni.redirectTo({ url: '/pages/bluetoothUnlock/unlockSet' })
 			console.log('test');
 			//redirectTo 关闭当前页面 防止用户重复操作
 		}else{
@@ -468,23 +469,22 @@ function checkUnlock(macid,type='get'){
 							writeData(macid,getNearUnlockSetCmd)
 						}, 200);
 			}else{
-				// uni.showModal({
-				// 	title: '蓝牙配对确认',
-				// 	content: '请在系统通知栏前往同意与'+macid+'设备配对',
-				// 	cancelText: '取消',
-				// 	confirmText: '已同意',
-				// 	success: function(res) {
-				// 		if (res.confirm) {
-				// 			checkUnlock(macid)
-				// 		}else{
-				// 			// uni.redirectTo({ url: '/pages/index/index' })
-				// 		}
-				// 	},
-				// 	fail: function(res) {},
-				// 	complete: function(res) {},
-				// })
+				uni.showModal({
+					title: '蓝牙配对确认',
+					content: '请在系统通知栏前往同意与'+macid+'设备配对',
+					cancelText: '取消',
+					confirmText: '已同意',
+					success: function(res) {
+						if (res.confirm) {
+							checkUnlock(macid)
+						}else{
+							// uni.switchTab({ url: '/pages/index/index' })
+						}
+					},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
 			}
-			
 	}
 }
 

js_sdk/wa-permission/permission.js

@@ -470,11 +470,9 @@ function getBondedDevices() {
 	//   address: plus.android.invoke(device, 'getAddress'),
 	//   type: getDeviceType(plus.android.invoke(device, 'getBluetoothClass'))
 	// }));
-	const car_info = uni.getStorageSync('car_info') ||{}
-	const car_sn=car_info.car_sn
 	const app = getApp();
-	
-	let deviceId = uni.getStorageSync('car_info').car_sn
+	const car_sn=  uni.getStorageSync('car_info').car_sn
+	const deviceId =app.globalData.connectionState[car_sn].deviceId
 	if(!deviceId) return false
 	//配对配对蓝牙设备是否在蓝牙列表里面
 	deviceArray.map(device => {
@@ -497,6 +495,14 @@ function getDeviceType(bluetoothClass) {
 //设备蓝牙权限是否开启
 function checkBluetoothPermission() {
     // #ifdef APP-PLUS
+	if (isIos) {
+        // iOS 平台蓝牙权限检查
+        // iOS 平台没有独立的蓝牙权限，但需要检查定位权限是否开启
+        // 因为在 iOS 上，蓝牙扫描需要定位权限
+        return judgeIosPermissionLocation();
+    } else {
+        // 安卓平台蓝牙权限检查
+        // #ifdef APP-PLUS
         // 检查蓝牙是否可用
         const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter');
         const bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -514,6 +520,8 @@ function checkBluetoothPermission() {
 
         console.log('蓝牙已启用');
         return true;
+        // #endif
+    }
     // #endif
 }
 

mixin/index.js

@@ -1,7 +1,7 @@
 // mixins/countdownMixin.js
 var bluetooth = require('@/common/bluetooth.js');
 import {getFunctionTag,setFunctionTag,getUserCurrentLocation} from '@/common/storage.js';
-var app = getApp();
+
 var config = require('@/common/config.js');
 var common = require('@/common/common.js');
 var http = require('@/common/http.js');
@@ -61,7 +61,7 @@ export default {
 		},
 		tapBlueToothCmd(cmd,type){
 			const car_info= uni.getStorageSync('car_info');
-			const isCarLocation = cmd=='more'?true:type
+			const isCarLocation = (cmd=='more')?true:type
 			if(this.cmdType=='batteryInfo'){
 				uni.navigateTo({
 					url:`/pages/batteryDetail/batteryDetail`
@@ -143,8 +143,9 @@ export default {
 		bluetoothCmd(isCarLocation){
 			const me=this
 			const car_info= uni.getStorageSync('car_info');
+			const app = getApp();
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
-			const isBluetoothConnect = app.globalData.connectionStateChangeFunc[car_info.car_sn]
+			const isBluetoothConnect = app.globalData.nearLockCheck
 			if(isBluetoothConnect){
 				const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
 				console.log(isTurnOn,this.cmdType,this.contrilList);

pages/bluetoothUnlock/bluetoothPair.vue

@@ -56,7 +56,8 @@
 				showNotice: false,
 				// model_name:'',
 				car_sn:'',
-				car_info:{}
+				car_info:{},
+				isReconnecting: false // 新增标志位
 			}
 		},
 		onLoad(){
@@ -217,8 +218,13 @@
 								if (!res.connected &&!('lockType' in app.globalData.nearLockInfo)) {
 									// 蓝牙连接断开
 									console.log('蓝牙连接断开');
-									me.loadBluetooth()
-									// common.simpleToast('蓝牙连接断开')
+									if (!me.isReconnecting) { // 检查标志位
+										me.isReconnecting = true; // 设置标志位
+										setTimeout(() => {
+											me.loadBluetooth();
+											me.isReconnecting = false; // 重置标志位
+										}, 100);
+									}
 								} else {
 									console.log('蓝牙连接成功');
 									// uni.hideLoading();
@@ -247,8 +253,9 @@
 								// 	content: showContent,
 								// 	success: function(res) {
 								// 		if (res.confirm) {
-											
-								// 			me.loadBluetooth();
+								// 			setTimeout(()=>{
+								// 				me.loadBluetooth();
+								// 			},100)
 								// 		} else {}
 								// 	}
 								// });