蓝牙升级连调卡1572

common/bluetooth.js

@@ -584,7 +584,6 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
         value: buffer,
         // 成功回调函数
         success(res) {
-            // console.log('writeData 写入成功');
             // 如果数据长度为0，则调用回调函数
             if (data.length == 0) {
                 callback(res);
@@ -1005,6 +1004,15 @@ function turnOffCar(macid, 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);
+}
 
 module.exports = {
     initBluetooth: initBluetooth,
@@ -1058,6 +1066,9 @@ module.exports = {
     turnOnCar,
     turnOffCar,
 	findCarCmd,
+	openCarSeat,
+	openCarTrunk,
+	getCarPressure,
 	
 	
 };

common/bluetooth/ZXCar.js

@@ -107,26 +107,29 @@ function stringToHexArray(str) {
 //收到硬件方向软件方发送的数据
 function readData(device, value, data) {
 	// console.log(value, 'test1111');
-	var value = new Uint8Array(value);
-	const normalArray = Array.from(value); // 或 [...uint8Array]
-	console.log(normalArray,currentCommandIndex-1,commands[currentCommandIndex-1], 'value**************************');
-	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;
+	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;
+		}
 	}
 	switch(normalArray[3]){
 		case 0x00:
@@ -136,10 +139,13 @@ function readData(device, value, data) {
 		
 		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;
 	}
+
+
 	
 	
 		
@@ -151,22 +157,20 @@ function readData(device, value, data) {
 
 //发送指令封装
 function sendCommand(cmd, data = []) {
-	let cmdData = [0x02, 0x02]
+	let cmdData = [0x22, 0x22]
 	// cmdData.push(cmd)
 	//协议号 cmd
 	//包长度 data.length
-	const dataLen=ensureInteger(data.length)
+	const dataLen=parseInt(data.length.toString(16).toUpperCase(), 16)
 	//信息内容 cmd
 	//crc校验
 	const pData=[dataLen,cmd]
 	const crcData='0x'+crc8IEEE8023(pData).toString(16).toUpperCase()
-	cmdData.push(cmd,dataLen,crcData,0xAA, 0xAA)
+	cmdData.push(cmd,dataLen,cmd,crcData,0xAA, 0xAA)
+	// console.log(cmdData,'cmdDatacmdData');
 	return cmdData
 }
-//转成16进制
-function ensureInteger(cmd){
-	return parseInt((cmd).toString(16).toUpperCase(), 16)
-}
+
 
 function turnOnCar(device, deviceId) {
 	return [sendCommand(0x02,[0x02])];
@@ -175,8 +179,17 @@ function turnOnCar(device, deviceId) {
 function turnOffCar(device, deviceId) {
 	return [sendCommand(0x03,[0x03])];
 }
-function defenseCmd(device, deviceId) {
-	return [sendCommand(0x04,[0x04])];
+function findCarCmd(device, deviceId) {
+	return [sendCommand(0x06,[0x06])];
+}
+function openCarSeat(device, deviceId) {
+	return [sendCommand(0x07,[0x07])];
+}
+function openCarTrunk(device, deviceId) {
+	return [sendCommand(0x08,[0x08])];
+}
+function getCarPressure(device, deviceId) {
+	return [sendCommand(0x4A,[0x4A])];
 }
 
 function switchFactory(device, deviceId) {
@@ -205,15 +218,13 @@ async function readBinBinarayToCommand() {
 	const uint8Array = new Uint8Array(arrayBuffer); // 转换为 Uint8Array
 	const test = splitArrayIntoChunks(uint8Array, 80); // 分割成长度为 80 的数组
 	const data =makeArr(test)
-	// const tests=data.slice(data.length-3)
-	// console.log(data.length,tests[0],'testtest数组');
-	// console.log(tests,'tests');
 	return data
 }
 
 function sendNextCommand(mac_id) {
+	console.log('开始发送指令');
 	// console.log(commands[currentCommandIndex],'command');
-    if (currentCommandIndex >= commands.length) {
+    if (currentCommandIndex >= commands.length-1) {
 		uni.hideLoading();
 		common.simpleToast('所有指令发送完成', 2000)
         return;
@@ -224,7 +235,6 @@ function sendNextCommand(mac_id) {
         return ;
     }
     const command = [commands[currentCommandIndex]];
-	console.log(command,'commandtest');
 	if(command.length==0){
 		return
 	}
@@ -238,7 +248,7 @@ function sendNextCommand(mac_id) {
         characteristicId: writeID, // 替换为可写入的特征值 ID
         value: buffer,
         success() {
-            // console.log('指令发送成功，等待设备响应');
+            // console.log('指令发送成功，等待设备响应',currentCommandIndex,commands[currentCommandIndex]);
         },
         fail(err) {
             console.error('指令发送失败', err);
@@ -260,18 +270,18 @@ function makeArr(array) {
     const result = [];
 	let endPackage;
     for (let i = 0; i < array.length; i ++) {
-       
 			endPackage = 0x00
 		if((i + 1) >= array.length){
 			//当前是最后一次循环
 			endPackage = 0x01
 		}
+		// if(i==2) return
 		//协议号 30 包长度未固定array.length+8 转16进制  固件类型0x00 升级包大小(总包大小) 125396字节-》0x00,0x01,0xE9,0xD4
 		let startArray = []
 		const packageLen=parseInt((array[i].length+8).toString(16).toUpperCase(), 16)
 		
 		// const totalPackageSize=[0x00,0x00,0x01,0xE9,0xD4]
-		const totalPackageSize=[0x00,0x00,0x01,0xe8,0x24]
+		const totalPackageSize=[0x00,0x00,0x01,0xeb,0xfc]
 		startArray.push(packageLen,...totalPackageSize)
 		 //软件包id
 		const ids=splitNumber(i)  // 0x00,0x01
@@ -287,9 +297,7 @@ function makeArr(array) {
 		//crc检验
 		const crcStr='0x'+crc8IEEE8023(startArray).toString(16).toUpperCase()
 		const testCrc=parseInt(crcStr,16)
-		// if(i>95&& i<105){
-		// 	console.log(testCrc,crcStr,'startArray*******');
-		// }
+		
 		startArray.push(crcStr)
 		startArray.push(0xAA,0xAA)
 		startArray.unshift(0x22,0x22,0x30)
@@ -302,21 +310,16 @@ function makeArr(array) {
 
 
 function splitNumber(num) {
-    // 将数字转换为字符串
-    const numStr = num.toString();
-
-    // 使用正则表达式分割字符串为两位一组
-    const parts = numStr.match(/.{1,2}/g) || [];
-
-    // 将字符串数组转换为数字数组
-    let result = parts.map(part => parseInt(part, 10));
-
-    // 如果数组长度为 1，前面补一个 0
-    if (result.length === 1) {
-        result = [0, ...result];
-    }
-
-    return result;
+	let highByte = (num >> 8) & 0xFF; // 对于0-255的数字，结果总是0
+	// 低字节
+	let lowByte = num & 0xFF;
+  
+	// 将每个字节转换为两位的十六进制字符串，并添加'0x'前缀
+	let highHex = highByte.toString(16).toUpperCase().padStart(2, '0'); // 确保是两位十六进制数
+	let lowHex = lowByte.toString(16).toUpperCase().padStart(2, '0');  // 确保是两位十六进制数
+  
+	// 返回结果数组（这里实际上可以返回一个对象或字符串，根据需求调整）
+	return ['0x' + highHex, '0x' + lowHex];
 }
 
 
@@ -333,11 +336,14 @@ module.exports = {
 	isDevice: isDevice,
 	alterConnect: alterConnect,
 	readData: readData,
-	turnOnCar: turnOnCar,
 	turnOffCar: turnOffCar,
 	isSingleBt: isSingleBt,
 	haveBms: haveBms,
 	switchFactory: switchFactory,
-	otaUpgrade
+	otaUpgrade,
+	findCarCmd,
+	turnOffCar,
+	turnOnCar,
+	getCarPressure
 
 };

locale/zh.json

@@ -14,12 +14,14 @@
 	"设备信息":"设备信息",
 	"软件版本":"软件版本",
 	"开机":"开机",
+	"开启车辆":"开启车辆",
+	"关闭车辆":"关闭车辆",
 	"闪灯鸣笛":"闪灯鸣笛",
 	"打开座桶":"打开座桶",
 	"打开尾箱":"打开尾箱",
 	"更多功能":"更多功能",
 	"开启车辆":"开启车辆",
-	"确定打开":"确定打开",
+	"您确认":"您确认",
 	"取消":"取消",
 	"确定":"确定",
 	"更多功能":"更多功能",

pages/bluetoothUnlock/bluetoothPair.vue

@@ -40,7 +40,6 @@
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
-	var ZXCar = require('@/common/bluetooth/ZXCar.js');
 	export default {
 		components: {
 			CenterDialog,

pages/bluetoothUnlock/components/AndroidUnlockAuth.vue

@@ -105,14 +105,14 @@ export default {
       }
     },
     linkTo() {
-		uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-      // const allPermissionsGranted = Object.values(this.permisionCheckObj).every(value => value === true);
-      // if (allPermissionsGranted) {
-      //   this.close()
-      //   uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-      // } else {
-      //   permision.gotoAppPermissionSetting()
-      // }
+		// uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+      const allPermissionsGranted = Object.values(this.permisionCheckObj).every(value => value === true);
+      if (allPermissionsGranted) {
+        this.close()
+        uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+      } else {
+        permision.gotoAppPermissionSetting()
+      }
     },
     close() {
       this.$emit('input', false)

pages/index/components/control/control.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="container-view-contril">
 		<scroll-view class="scroll-view flex-row" scroll-x="true">
-			<view @tap="tapOpen" v-for="(item,index) of contrilList" :key="index" class="contril-item flex-row">
+			<view @tap="tapOpen" v-for="(item,index) of contrilList" :key="index" :data-item="item" class="contril-item flex-row">
 				<img class="contril-item-img"  :src="item.iconUrl" alt="">
 				<text>{{item.name}}</text>
 			</view>
@@ -12,11 +12,11 @@
 		</scroll-view>
 		<view v-if="popupShow" class="show-modal">
 			<view class="modal-info">
-				<view class="popup-title">{{$t("开启车辆")}}</view>
-				<view class="popup-content">{{$t("确定打开")}}</view>
+				<view class="popup-title">{{$t(popText)}}</view>
+				<view class="popup-content">{{$t("您确认")+$t(popText)}}</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" >{{$t("确定")}}</view>
+					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>
 				</view>
 			</view>
 		</view>
@@ -62,8 +62,8 @@
 </template>
 
 <script>
-// component/nomore/nomore.js
-
+	var app = getApp();
+	var bluetooth = require('@/common/bluetooth.js');
 export default {
 	props:{
 		contrilList: {
@@ -74,6 +74,7 @@ export default {
 	
     data() {
         return {
+			popText:'',
 			popupShow:false,
 			controlType:null,//选择的车辆控制
 			isShowMore:false
@@ -87,8 +88,40 @@ export default {
      * 组件的方法列表
      */
     methods: {
-		tapOpen(){
-			this.popupShow=true
+		tapOpen(e){
+			const {name} = e.currentTarget.dataset.item;
+			this.setData({
+				popText:name,
+				popupShow:true
+			})
+		},
+		tapBlueToothCmd(){
+			// const isLock=this.contrilList.map(i=>i.isLock||false)
+			if(this.popText=='开机'){
+				bluetooth.turnOnCar('900000997',()=>{
+					console.log('发送开机指令结束');
+				})
+			}else if(this.popText=='闪灯鸣笛'){
+				bluetooth.findCarCmd('900000997',()=>{
+					console.log('发送闪灯鸣笛指令结束');
+				})
+			}else if(this.popText=='打开座桶'){
+				bluetooth.openCarSeat('900000997',()=>{
+					console.log('发送打开座桶指令结束');
+				})
+			}else if(this.popText=='打开尾箱'){
+				bluetooth.openCarTrunk('900000997',()=>{
+					console.log('发送打开尾箱指令结束');
+				})
+			}else if(this.popText=='关机'){
+				bluetooth.turnOffCar('900000997',()=>{
+					console.log('发送关机指令结束');
+				})
+			}else if(this.popText=='胎压'){
+				bluetooth.getCarPressure('900000997',()=>{
+					console.log('发送胎压指令结束');
+				})
+			}
 		},
 		closePopup(){
 			this.popupShow=false