Merge branch 'lw_test' into gyq_test

common/bluetooth.js

@@ -18,7 +18,8 @@ const bluetoothDevices = {
     AD3BTS: require('./bluetooth/AD3BTS.js'),
     BWJT: require('./bluetooth/ZXBT_JL.js'),
     JTBMS: require('./bluetooth/ZXBT_JL.js'),
-	ZXCAR: require('./bluetooth/ZXCar.js')
+	ZXZK: require('./bluetooth/ZXCar.js') //flk中控
+	// ZXCAR: require('./bluetooth/ZXCar.js') //flk中控
 };
 //初始化蓝牙
 function initBluetooth() {
@@ -50,24 +51,26 @@ function initBluetooth() {
     //监听低功耗蓝牙设备的特征值变化事件。必须先启用 notifyBLECharacteristicValueChange 接口才能接收到设备推送的 notification
     uni.onBLECharacteristicValueChange((res) => {
 		console.log(res,'restest1111');
-        if (app.globalData.connectionState[res.deviceId]) {
-            const device = app.globalData.connectionState[res.deviceId].device;
+		const car_sn=uni.getStorageSync('car_info').car_sn;
+        if (app.globalData.connectionState[car_sn]) {
+            const device = app.globalData.connectionState[car_sn].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--------');
+				console.log(app.globalData.connectionState[car_sn],bluetoothDeviceConfig(device),'data--------');
+                var data = bluetoothDeviceConfig(device).readData(device, res.value, app.globalData.connectionState[car_sn].data);
+				
 				if (data) {
 					const app = getApp();
-                    app.globalData.connectionState[res.deviceId].data = data;
+                    app.globalData.connectionState[car_sn].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)
                         );
-						// common.simpleToast(app.globalData.connectionState[res.deviceId].data)
-                        console.log(app.globalData.connectionState[res.deviceId].data);
+						// common.simpleToast(app.globalData.connectionState[car_sn].data)
+                        console.log(app.globalData.connectionState[car_sn].data);
                     }
                 }
             }
@@ -243,18 +246,22 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
 						res.devices.forEach((data) => {
 							// console.log(data,'data***************');
 							// 判断设备是否为指定设备
+							console.log('------',bluetoothDeviceConfig(device).isDevice(device, data));
 							if (bluetoothDeviceConfig(device).isDevice(device, data)) {
 								const app = getApp();
 								// uni.offBluetoothDeviceFound();
 								uni.stopBluetoothDevicesDiscovery(); //查找到蓝牙设备停止搜索
-								deviceId = data.deviceId;
+								const car_info= uni.getStorageSync('car_info')
+								const deviceIds = data.deviceId;
+								console.log(deviceIds,'deviceIds123');
+								const deviceId = car_info.car_sn;
 								if (app.globalData.connectionState[deviceId]) {
 									app.globalData.connectionState[deviceId].device = device;
 								} else {
 									app.globalData.connectionState[deviceId] = {
 										device: device,
 										deviceName:data.name,
-										deviceId: deviceId,
+										deviceId: deviceIds,
 										connected: false,
 										data: {}
 									};
@@ -294,7 +301,10 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                         // uni.offBluetoothDeviceFound();
                         // 停止蓝牙设备搜索
                         uni.stopBluetoothDevicesDiscovery();
-                        deviceId = data.deviceId;
+						const car_info= uni.getStorageSync('car_info')
+                        const deviceIds = data.deviceId;
+						console.log(deviceIds,'deviceIds456');
+						const deviceId = car_info.car_sn;
 						const app = getApp();
                          // 检查全局状态中是否已经存在该设备
                         if (app.globalData.connectionState[deviceId]) {
@@ -305,7 +315,7 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
                             app.globalData.connectionState[deviceId] = {
                                 device: device,
 								deviceName:data.name,
-                                deviceId: deviceId,
+                                deviceId: deviceIds,
                                 connected: false,
                                 data: {}
                             };
@@ -360,10 +370,12 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
             return;
         }
     }
-	const device_name=app.globalData.connectionState[deviceId].deviceName
+	const deviceIds = app.globalData.connectionState[device.mac_id].deviceId
+	console.log(deviceIds,'deviceIds');
+	const device_name=app.globalData.connectionState[device.mac_id].deviceName
     // 创建蓝牙连接
     uni.createBLEConnection({
-        deviceId: deviceId,
+        deviceId: deviceIds,
         success: (res) => {
 			console.log(res,'蓝牙连接成功');
 			const app = getApp();
@@ -371,14 +383,14 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
             app.globalData.connectionState[deviceId] = {
                 device: device,
 				deviceName: device_name,
-                deviceId: deviceId,
+                deviceId: deviceIds,
                 connected: true,
                 data: {}
             };
             // 调用连接成功回调
             alterConnect(
                 device,
-                deviceId,
+                deviceIds,
                 (res) => {
                     console.log('uni.createBLEConnection');
                     callback(res);
@@ -466,7 +478,7 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
                                                         // 写入数据
 														setTimeout(()=>{
 															writeData(device, deviceId, data, callback, fail);
-														},500)
+														},100)
                                                         
                                                     } else {
                                                         // 调用回调函数
@@ -525,14 +537,14 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
                             fail(res);
                         }
                     });
-                },
+				},
                 fail(res) {
 					console.log('getBLEDeviceServices fail',res);
                     // 调用失败回调函数
                     fail(res);
                 }
             });	
-			},800)
+			},500)
             
         },
         fail(res) {
@@ -656,7 +668,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
                 // // 否则，延时500毫秒后再次调用writeData函数
                 setTimeout(() => {
                     writeData(device, deviceId, data, callback, fail);
-                }, 50);
+                }, 60);
             }
         },
         // 失败回调函数
@@ -1077,7 +1089,7 @@ function executeDeviceCommand(macid, commandName, callback = () => {}, fail = ()
     if (data) {
 		setTimeout(()=>{
 			writeData(device, deviceId, data, callback, fail);
-		},200)
+		},100)
         return true;
     }
     fail();

common/bluetooth/ZXCar.js

@@ -46,7 +46,7 @@ function isDevice(device, data) {
 	// if ( advertisData.slice(4, 10).toString() == "095A5832") {
 	//     return true;
 	// }
-		//判断是否是智寻的蓝牙
+	//判断是否是智寻的蓝牙
 	const result = data.name.startsWith("ZX");
 	// const result = data.name.startsWith("ZN");
 	// if (data.name === "865416038002201") {
@@ -72,7 +72,7 @@ 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[deviceId].deviceName
+	const device_name=app.globalData.connectionState[device.mac_id].deviceName
 	const device_sn=stringToHexArray(device_name)
 	
 	// const car_info = uni.getStorageSync('car_info')
@@ -95,7 +95,7 @@ function alterConnect(device, deviceId) {
 	// const threePart = data;
 	// return [data]
 	return [firstPart,secondPart]
-	// return [[0x22,0x22,0x02,0x01,0x02,0x1B,0xAA,0xAA]]
+	// return [[0x22]]
 }
 
 function crc8IEEE8023(data) {
@@ -443,54 +443,49 @@ 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]
-	console.log(app.globalData.connectionState,'app.globalData.connectionState1111');
-	console.log(device,'device------------');
-	permision.getBondedDevices(deviceId).then(res=>{
-		if(res){
+	console.log('test0000000000000');
+	const res=permision.getBondedDevices()
+	let app=getApp()
+	if(res){
 			app.globalData.nearLockCheck=true
 			common.simpleToast('感应解锁已开启,前往设置灵敏度页面')
 			uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
 			console.log('test');
 			//redirectTo 关闭当前页面 防止用户重复操作
-			
 		}else{
-				if(type==='login'){
-							//下发接近解锁指令
-							// const nearUnlockCmd=nearUnlock()
-							// console.log(nearUnlockCmd,'nearUnlockCmd');
-							// setTimeout(() => {
-							//     writeData(macid,nearUnlockCmd)
-							// }, 500);
-							
-							// 获取接近解锁指令信息
-							const getNearUnlockSetCmd=getNearUnlockSet()
-							console.log(getNearUnlockSetCmd,'getNearUnlockSetCmd');
-							setTimeout(() => {
-							    writeData(macid,getNearUnlockSetCmd)
-							}, 500);
-				}else{
-					uni.showModal({
-						title: '蓝牙配对确认',
-						content: '请在系统通知栏前往同意与'+device.deviceName+'设备配对',
-						cancelText: '取消',
-						confirmText: '已同意',
-						success: function(res) {
-							if (res.confirm) {
-								checkUnlock(macid)
-							}else{
-								// uni.redirectTo({ url: '/pages/index/index' })
-							}
-						},
-						fail: function(res) {},
-						complete: function(res) {},
-					})
-				}
-				
-		}
-	})
+			if(type==='login'){
+						//下发接近解锁指令
+						// const nearUnlockCmd=nearUnlock()
+						// console.log(nearUnlockCmd,'nearUnlockCmd');
+						// setTimeout(() => {
+						//     writeData(macid,nearUnlockCmd)
+						// }, 500);
+						
+						// 获取接近解锁指令信息
+						const getNearUnlockSetCmd=getNearUnlockSet()
+						console.log(getNearUnlockSetCmd,'getNearUnlockSetCmd');
+						setTimeout(() => {
+							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) {},
+				// })
+			}
+			
+	}
 }
 
 
@@ -633,8 +628,9 @@ 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) {
+	const deviceIds = app.globalData.connectionState[mac_id].deviceId
+	console.log(deviceIds,'deviceIds');
+    if (deviceIds == undefined) {
         return ;
     }
 	// 如果数据长度为0，则直接返回
@@ -646,7 +642,7 @@ function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
     buffer = common.toArrayBuffer(data.shift());
     // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
     uni.writeBLECharacteristicValue({
-        deviceId: deviceId,
+        deviceId: deviceIds,
         serviceId: writeServiceID,
         characteristicId: writeID,
         value: buffer,
@@ -658,7 +654,7 @@ function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
             } else {
                 // 否则，延时500毫秒后再次调用writeData函数
                 setTimeout(() => {
-                    writeData(device, deviceId, data, callback, fail);
+                    writeData(device,  data, callback, fail);
                 }, 500);
             }
         },

js_sdk/wa-permission/permission.js

@@ -444,9 +444,9 @@ function openGeneralSettings() {
     main.startActivity(intent);
 }
 
-async function getBondedDevices(deviceId) {
+function getBondedDevices() {
   // #ifdef APP-PLUS
-  try {
+
 	// 检查蓝牙是否可用
 	const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter');
 	const bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -474,7 +474,7 @@ async function getBondedDevices(deviceId) {
 	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);
+	let deviceId = uni.getStorageSync('car_info').car_sn
 	if(!deviceId) return false
 	//配对配对蓝牙设备是否在蓝牙列表里面
 	deviceArray.map(device => {
@@ -483,16 +483,7 @@ async function getBondedDevices(deviceId) {
 		}
 	});
 	return isPaired
-  } catch (e) {
-	console.error('获取蓝牙设备失败:', e);
-	// uni.showToast({ title: '获取设备列表失败', icon: 'none' });
-	return false;
-  }
-  // #endif
-  
-  // #ifndef APP-PLUS
-  console.warn('此方法仅支持APP平台');
-  return false;
+
   // #endif
 }
 

mixin/index.js

@@ -59,8 +59,9 @@ export default {
 		closePopup(){
 			this.popupControlShow=false
 		},
-		tapBlueToothCmd(isCarLocation=false){
+		tapBlueToothCmd(cmd,type){
 			const car_info= uni.getStorageSync('car_info');
+			const isCarLocation = cmd=='more'?true:type
 			if(this.cmdType=='batteryInfo'){
 				uni.navigateTo({
 					url:`/pages/batteryDetail/batteryDetail`
@@ -86,11 +87,11 @@ export default {
 			}else{
 				// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
 				if (this.carOnline) {
-					if(this.cmdType=='turnOnOrOff'){
-						const switchType=this.contrilList.find(item => item.isTurnOn)
-						const pData={
-							car_sn:car_info.car_sn,
-							switch:switchType
+					if (this.cmdType == 'turnOnOrOff') {
+						const switchType = (this.contrilList.find(item => item.isTurnOn).isTurnOn == 1) ? 0 : 1
+						const pData = {
+							car_sn: car_info.car_sn,
+							switch: switchType
 						}
 						const me=this
 						common.loading();
@@ -98,14 +99,19 @@ export default {
 							uni.hideLoading();
 							if (resp.data.code === 200) {
 								common.simpleToast(me.popText + '成功');
-								const activeTag=me.contrilList.map(item=>{
-									item.isTurnOn=(item.isTurnOn==1)?0:1
-									item.name=i18n.t((item.isTurnOn==1)?'关机':'开机')
+								const activeTag = me.contrilList.map(item => {
+									if('isLock' in item){
+										item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+										item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
+									}
 									return item
 								})
-								const tag=getFunctionTag().tag
-								setFunctionTag({activeTag,tag})
-								
+								const tag = getFunctionTag().tag
+								setFunctionTag({
+									activeTag,
+									tag
+								})
+								me.$emit('loadCarDetail',pData,car_sn)
 							} else {
 								common.simpleToast(resp.data.msg);
 							}

pages/bluetoothUnlock/bluetoothPair.vue

@@ -2,7 +2,7 @@
 	<view class="bluetoothPair-page">
 		<navBar name="开启感应解锁"></navBar>
 		<view class="car-wrap">
-			<view class="name">{{model_name}}</view>
+			<view class="name">{{car_info.model_name}}</view>
 			<image :src="QINIU_URL + 'Fi6CPKj4-raA86oizhL3PiXD4DkH'" class="car-img" />
 			<view>
 				<viwe class="pair-title">是否配对改设备</viwe>
@@ -54,16 +54,19 @@
 			return {
 				QINIU_URL,
 				showNotice: false,
-				model_name:'',
+				// model_name:'',
 				car_sn:'',
+				car_info:{}
 			}
 		},
 		onLoad(){
-			const { car_sn , model_name } = uni.getStorageSync('car_info')
-			this.setData({
-				model_name,
-				car_sn
-			})
+			
+			this.car_info= uni.getStorageSync('car_info')
+			this.car_sn=this.car_info.car_sn
+			// this.setData({
+			// 	model_name,
+			// 	car_sn
+			// })
 			 // console.log(app,'app');
 			 // return
 			 // bluetooth.initBluetooth()
@@ -186,12 +189,16 @@
 			},
 			loadBluetooth() {
 				const me = this;
+				const third_device_type = this.car_info.third_device_type
+				console.log(third_device_type,'third_device_type');
 				var device = {
 					mac_id: this.car_sn,
 					btid: this.car_sn,
 					btkey: this.car_sn,
-					bt_type: "ZXCAR",
-					device_type: "ZXCAR"
+					bt_type: third_device_type,
+					device_type: third_device_type,
+					// bt_type: 'ZXCAR',
+					// device_type: 'ZXCAR'
 				};
 				const app=getApp()
 				app.globalData.connectionState={}
@@ -224,27 +231,27 @@
 							(res) => {
 								console.log('观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限',res,res.errCode);
 								uni.hideLoading();
-								var showContent = ""
-								if (res && ("errCode" in res)) {
-									if (res.errCode == 9000001) {
-										var showContent = "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
-									} else {
-										var showContent = "连接失败，请尝试重新连接44444"+res.errCode
-									}
-								} else {
-									var showContent = "连接失败，请尝试重新连接55555"
-								}
-								uni.showModal({
-									title: '提示',
-									confirmText: '重新连接',
-									content: showContent,
-									success: function(res) {
-										if (res.confirm) {
+								// var showContent = ""
+								// if (res && ("errCode" in res)) {
+								// 	if (res.errCode == 9000001) {
+								// 		var showContent = "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
+								// 	} else {
+								// 		var showContent = "连接失败，请尝试重新连接44444"+res.errCode
+								// 	}
+								// } else {
+								// 	var showContent = "连接失败，请尝试重新连接55555"
+								// }
+								// uni.showModal({
+								// 	title: '提示',
+								// 	confirmText: '重新连接',
+								// 	content: showContent,
+								// 	success: function(res) {
+								// 		if (res.confirm) {
 											
-											me.loadBluetooth();
-										} else {}
-									}
-								});
+								// 			me.loadBluetooth();
+								// 		} else {}
+								// 	}
+								// });
 							}, 
 							(res) => {
 								// console.log('蓝牙未打开或请在右上角设置授权小程序使用蓝牙66666');

pages/carFunctionSet/more.vue

@@ -38,7 +38,7 @@
 				<view class="popup-content">{{$t("您确认")+(($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText)))+$t("吗")}}</view>
 				<view class="flex-row modal-footer">
 					<view class="show-btn cencel-btn-pop" @tap="closePopup">{{$t("取消")}}</view>
-					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>
+					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd('more')">{{$t("确定")}}</view>
 				</view>
 			</view>
 		</view>

pages/index/index.vue

@@ -59,13 +59,13 @@
 						<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
 							style="width: 100%;height: 526rpx;" alt="">
 						<view class="flex-row align-center update-time-view">
-							<text  style="margin-right: 10rpx;">{{car_info.acc_state==1?$t("车辆已开机"): $t("车辆已关机")}} </text>
+							<text  style="margin-right: 10rpx;">{{car_info.online==1&&car_info.acc_state==1?$t("车辆已开机"): $t("车辆已关机")}} </text>
 							<text v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}} {{tools.formatTime( car_info.heart_time|| '')}}</text>
 							<img :src="'https://qiniu.bms16.com/'+(isBluethConnect?'Fk3f9H_o-1Wq2xXx7I_xo7bxK1xJ':'FsL6XWGoIhfsVB7jRg6EGFVsuaTZ')"
 								:style="{width: (isBluethConnect?32:24)+'rpx',height: '32rpx'}" alt="">
 						</view>
 					</view>
-					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle"/>
+					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail"/>
 			
 			
 					<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']">
@@ -281,6 +281,7 @@
 				this.contrilList = getFunctionTag().activeTag
 				const user_token = storage.getUserToken()
 				this.car_info = uni.getStorageSync('car_info') || {};
+				console.log(this.car_info,'this.car_info');
 				this.isBluethConnect =  app.globalData.nearLockCheck
 				if (!user_token) return
 				this.newsNumFn()