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

@@ -434,7 +434,9 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
     }
 	console.log("xxxx2")
 	console.log(deviceId)
-	var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+	// var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
+	//蓝牙不使用登录指令
+	var data = bluetoothDeviceConfig(device).getNearUnlockSet(device, deviceId);
 	setTimeout(()=>{
 		writeData(device, deviceId, data, callback, fail);
 	},3000)

common/bluetooth/ZXCar - 副本.js

@@ -0,0 +1,700 @@
+const common = require('../common.js');
+
+const FMBMS = require('./FMBMS.js');
+var bluetooth = require('@/common/bluetooth.js');
+import permision from "@/js_sdk/wa-permission/permission.js"
+
+const readServiceID = '0000FEE7-0000-1000-8000-00805F9B34FB';
+const readID = '000036F6-0000-1000-8000-00805F9B34FB';
+const writeServiceID = '0000FEE7-0000-1000-8000-00805F9B34FB';
+const writeID = '000036F5-0000-1000-8000-00805F9B34FB';
+const MTU = 115;
+let subIndex = -1
+let commands = []; // 升级包指令数组，每个指令是一个 ArrayBuffer
+let currentCommandIndex = 1;
+var totalLength = 0 //总包长度
+var joinPack = []//接收到的数据包
+var readRepeatTime = 0 //读到完整数据包的时间戳
+var readRepeatTime = 0 //读到完整数据包的时间戳
+
+
+function acceptDevice(device) {
+	return device.btid ? true : false;
+}
+
+function isSingleBt() {
+	console.log('是单蓝牙');
+	return true;
+}
+
+function haveBms() {
+	console.log('是单蓝牙并且带bms');
+	return true;
+}
+
+function isDevice(device, data) {
+	// console.log(device,data,'device111');
+	const advertisData = new Uint8Array(data.advertisData);
+	// console.log(advertisData,'判断返回第几个字段是正常模式还是升级模式');
+	//打印返回广播 判断返回字段是正常模式还是升级模式
+	// console.log(advertisData.slice(4, 10).toString(),'device2222');
+	const mac = device.btid
+		.split('')
+		.map((p, i) => parseInt(p + device.btid[i + 1], 16))
+		.filter((p, i) => i % 2 == 0);
+
+	// 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") {
+	// if (data.name === "ZX2503150000000") {
+	if (result) {
+		return true
+	}
+
+	return false;
+}
+
+//连接蓝牙后 发送登录指令
+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]
+	//登录 [[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]]
+	//时间戳 0x67AC53E7 0x65,0xB3,0xED,0x6F 16:00:05
+	//切换正常，工厂下发指令 [[0x22,0x22,0x54,0x01,0x01,0x12,0xAA,0xAA]]
+	//OTA 升级指令 [[0x22,0x22,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,n,0xCB,0xAA,0xAA]]
+
+	// 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.mac_id)
+	
+	// const car_info = uni.getStorageSync('car_info')
+	// const device_sn=stringToHexArray(car_info.car_sn)
+	// const device_sn=stringToHexArray('865416038001109')
+	data.push(...device_sn)
+	data.push(0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00)
+	// const data=[ 0x1F, 0x0F,0x38, 0x36, 0x35, 0x34, 0x31, 0x36, 0x30, 0x33, 0x38, 0x30, 0x30, 0x32, 0x32, 0x30, 0x31,0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00]
+	// console.log(data,'datatest');
+	console.log(crc8IEEE8023(data).toString(16).toUpperCase(),'crc---------');
+	const crc_data = parseInt(crc8IEEE8023(data).toString(16).toUpperCase(),16) 
+	// const crc_data =crc8IEEE8023(data).toString(16).toUpperCase()
+	data.push(crc_data,0xAA,0xAA)
+	data.unshift(0x22,0x22,0x01)
+	// // 从索引 0 开始，删除 3 个元素
+	const firstPart = data.splice(0, 20);
+	
+	// // 剩余的元素
+	const secondPart = data;
+	// const threePart = data;
+	// return [data]
+	return [firstPart,secondPart]
+	// return [[0x22]]
+}
+
+function crc8IEEE8023(data) {
+    const poly = 0x07; // IEEE 802.3 polynomial x^8 + x^2 + x + 1
+    let crc = 0x00;
+
+    for (let i = 0; i < data.length; i++) {
+        crc ^= data[i];
+        for (let j = 0; j < 8; j++) {
+            if (crc & 0x80) {
+                crc = ((crc << 1) ^ poly) & 0xFF;
+            } else {
+                crc = (crc << 1) & 0xFF;
+            }
+        }
+    }
+    return crc;
+}
+
+function stringToHexArray(str) {
+  const result = [];
+  for (let i = 0; i < str.length; i++) {
+    const charCode = str.charCodeAt(i); // 获取字符的 ASCII 码值
+	const hexValue=`0x${charCode.toString(16).toUpperCase()}`
+	const hexDataValue=parseInt(hexValue,16)
+    result.push(hexDataValue);
+  }
+  return result;
+}
+
+
+
+
+//收到硬件方向软件方发送的数据
+function readData(device, value, data) {
+	console.log('***********************test');
+	var test = new Uint8Array(value);
+	// const bmsData=Array.from(test);
+	const normalArray=Array.from(test);
+	// console.log(bmsData,'bmsData-------------');
+	// 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;
+			
+		}
+	}
+		
+	// 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;
+	// 	}
+	// }
+	
+
+
+	
+	
+		
+
+
+	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)
+		// }
+		checkUnlock(mac_id,'login')
+	
+	}
+}
+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){
+	const app = getApp();
+	uni.hideLoading();
+	//测试
+	const len=data.length-4
+	const pData={
+		lockType:data[4],//接近解锁配置
+	}
+	console.log(pData,data,pData.status,'pData');
+	app.globalData.nearLockInfo=pData
+	
+	if(data[len]==0x00){
+		common.simpleToast('操作成功')
+		// common.simpleToast(`请在系统通知中同意与${mac_id}配对`)
+		
+	}else if(data[len]==0x01){
+		common.simpleToast('操作失败')
+		// 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
+	//包长度 data.length
+	const dataLen=parseInt(data.length.toString(16).toUpperCase(), 16)
+	//信息内容 cmd
+	//crc校验
+	const pData=[dataLen,...data]
+	const crcData=parseInt(crc8IEEE8023(pData).toString(16).toUpperCase(), 16)
+	cmdData.push(cmd,dataLen,...data,crcData,0xAA, 0xAA)
+	// console.log(cmdData,'cmdDatacmdData');
+	return cmdData
+}
+
+
+function turnOnCar(device, deviceId) {
+	return [sendCommand(0x02,[0x02])];
+}
+
+function turnOffCar(device, deviceId) {
+	return [sendCommand(0x03,[0x03])];
+}
+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 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(macid,data){
+	console.log('getNearCarCmdInfo',macid,data);
+	
+	
+	if(data[5]==0x02||data[5]==0x01){
+		uni.hideLoading();
+		const pData={
+				lockType:data[4],//接近解锁配置
+				level:data[5],//感应等级
+			}
+		const app = getApp();
+		app.globalData.nearLockInfo=pData
+		
+		console.log('已开启配对');
+		// common.simpleToast('已开启配对',2000)
+		// common.simpleToast('感应解锁已开启,前往设置灵敏度页面')
+		// uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockset' })
+		
+		// if( pData.status == 0x01){
+		// 	common.simpleToast('配对成功')
+		// 	return 
+		// }else if(pData.status==0x00){
+		// 	common.simpleToast('未配对')
+		// }
+		setTimeout(()=>{
+			checkUnlock(macid)
+		},300)
+	}else if(data[5]==0x00){
+		console.log('未开启配对')
+		const nearUnlockCmd=nearUnlock()
+		console.log(nearUnlockCmd,'nearUnlockCmd');
+		writeData(mac_id,nearUnlockCmd)
+	}
+		
+}
+function checkUnlock(macid,type='get'){
+	
+	const res=permision.getBondedDevices()
+	console.log(res,'test0000000000000');
+	let app=getApp()
+	if(res){
+			app.globalData.nearLockCheck=true
+			common.simpleToast('感应解锁已开启,前往设置灵敏度页面')
+			uni.redirectTo({ 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)
+						}, 200);
+			}else{
+				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) {},
+				})
+			}
+	}
+}
+
+
+
+function switchFactory(device, deviceId) {
+	//切换正常，工厂模式指令
+	//切换工厂模式 [[0x22,0x22,0x54,0x01,0x01,0x12,0xAA,0xAA]]
+	//切换正常模式 [[0x22,0x22,0x54,0x01,0x00,0x15,0xAA,0xAA]]
+	return [[0x22,0x22,0x54,0x01,0x01,0x12,0xAA,0xAA]]
+	// return [sendCommand([0x54, 0x01, 0x01, 0x12])];
+}
+//升级按钮
+function otaUpgrade(device){
+	
+	const data = readBinBinarayToCommand()
+	data.then(result=>{commands=result})
+	
+	// console.log(data,'datatest111');
+	return data
+}
+async function readBinBinarayToCommand() {
+	let res =await uni.request({
+	  url: 'https://opt.bms16.com/ota.BIN', // 文件的网络地址
+	  method: 'GET',
+	  responseType: 'arraybuffer', // 指定响应类型为 arraybuffer
+	});
+	const arrayBuffer=res[1].data
+	const uint8Array = new Uint8Array(arrayBuffer); // 转换为 Uint8Array
+	const test = splitArrayIntoChunks(uint8Array, 80); // 分割成长度为 80 的数组
+	const data =makeArr(test)
+	return data
+}
+
+function sendNextCommand(mac_id) {
+	const app = getApp();
+	readRepeatTime=0
+	// console.log(currentCommandIndex,commands.length,'开始发送指令');
+	// console.log(commands[currentCommandIndex],'command');
+    if (currentCommandIndex >= commands.length) {
+		uni.hideLoading();
+		common.simpleToast('所有指令发送完成', 2000)
+        return;
+    }
+	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == mac_id);
+    if (deviceId == undefined) {
+		console.log('deviceId == undefined');
+        return ;
+    }
+    const command = [commands[currentCommandIndex]];
+	if(command.length==0){
+		return
+	}
+	// // 将数据转换为ArrayBuffer类型
+	var buffer;
+	buffer = common.toArrayBuffer(command.shift());
+	// console.log(command,'command');
+    uni.writeBLECharacteristicValue({
+        deviceId: deviceId, // 替换为实际的设备 ID
+        serviceId: writeServiceID, // 替换为实际的服务 ID
+        characteristicId: writeID, // 替换为可写入的特征值 ID
+        value: buffer,
+        success() {
+            // console.log('指令发送成功，等待设备响应',currentCommandIndex,commands[currentCommandIndex]);
+        },
+        fail(err) {
+            console.error('指令发送失败', err);
+        }
+    });
+    currentCommandIndex++;
+}
+
+function splitArrayIntoChunks(array, chunkSize) {
+	const newArr=array.slice(16383)
+    const numChunks = Math.ceil(newArr.length / chunkSize);
+	
+    return Array.from({ length: numChunks }, (_, i) => {
+        return newArr.slice(i * chunkSize, (i + 1) * chunkSize);
+    });
+}
+
+
+// 处理分割后的数组
+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,0xeb,0xfc]
+		const totalPackageSize=[0x00,0x00,0x01,0xAB,0xFC]
+		startArray.push(packageLen,...totalPackageSize)
+		 //软件包id
+		const ids=splitNumber(i)  // 0x00,0x01
+		startArray.push(...ids)
+		 //是否为最后一个包
+		startArray.push(endPackage)
+		 //软件数据包
+		const formattedChunk = array[i].map(byte => `0x${byte.toString(16).toUpperCase()}`); // 转换为 0xXX 格式 
+		startArray.push(...formattedChunk)
+		// if(i>95&& i<105){
+		// 	console.log(startArray,'startArray-------');
+		// }
+		//crc检验
+		const crcStr='0x'+crc8IEEE8023(startArray).toString(16).toUpperCase()
+		const testCrc=parseInt(crcStr,16)
+		
+		startArray.push(crcStr)
+		startArray.push(0xAA,0xAA)
+		startArray.unshift(0x22,0x22,0x30)
+        result.push(startArray);
+    }
+	// result.push([0x22,0x22,0x30,0x58,0x00,0x00,0x00,0xE9,0xD4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2C,0xAA,0xAA])
+    return result;
+}
+
+
+
+function splitNumber(num) {
+	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];
+}
+
+// 定义一个函数，用于向蓝牙设备写入数据
+function writeData(mac_id, data, callback = () => {}, fail = () => {}) {
+	const app = getApp();
+	const deviceIds = app.globalData.connectionState[mac_id].deviceId
+	console.log(deviceIds,'deviceIds');
+    if (deviceIds == undefined) {
+        return ;
+    }
+	// 如果数据长度为0，则直接返回
+	if (data.length == 0) {
+        return;
+    }
+    // 将数据转换为ArrayBuffer类型
+    var buffer;
+    buffer = common.toArrayBuffer(data.shift());
+    // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
+    uni.writeBLECharacteristicValue({
+        deviceId: deviceIds,
+        serviceId: writeServiceID,
+        characteristicId: writeID,
+        value: buffer,
+        // 成功回调函数
+        success(res) {
+            // 如果数据长度为0，则调用回调函数
+            if (data.length == 0) {
+                callback(res);
+            } else {
+                // 否则，延时500毫秒后再次调用writeData函数
+                setTimeout(() => {
+                    writeData(device,  data, callback, fail);
+                }, 500);
+            }
+        },
+        // 失败回调函数
+        fail(res) {
+            console.log(res);
+            // 调用失败回调函数
+            fail(res);
+        }
+    });
+}
+
+
+
+
+module.exports = {
+	readServiceID: readServiceID,
+	readID: readID,
+	writeServiceID: writeServiceID,
+	writeID: writeID,
+	MTU: MTU,
+	acceptDevice: acceptDevice,
+	isDevice: isDevice,
+	alterConnect: alterConnect,
+	readData: readData,
+	turnOffCar: turnOffCar,
+	isSingleBt: isSingleBt,
+	haveBms: haveBms,
+	switchFactory: switchFactory,
+	otaUpgrade,
+	findCarCmd,
+	turnOffCar,
+	turnOnCar,
+	getCarPressure,
+	nearUnlock,
+	nearCloseUnlock,
+	getSensitivity,
+	setSensitivity,
+	getNearUnlockSet,
+	setNearUnlock,
+	
+
+};

common/bluetooth/ZXCar.js

@@ -400,10 +400,11 @@ function getSensitivity(device, deviceId) {
 function setSensitivity(device, deviceId,type) {
 	return [sendCommand(0x4E,['0x4'+type])];
 }
-function setNearUnlock(device, deviceId,type) {
+function setNearUnlock(device, deviceId) {
 	return [sendCommand(0x4D,[0x4D])];
 }
-function getNearUnlockSet(device, deviceId,type) {
+//
+function getNearUnlockSet(device, deviceId) {
 	return [sendCommand(0x4D,[0x4D])];
 }
 

common/storage.js

@@ -33,14 +33,15 @@ const ICONS = {
 	add: `${QINIU_URL}FqLEWbMe8DcnQtNz6GdDDD87ObZK`,
 	placeholder: `${QINIU_URL}FpKvfFNSDbx0d9RDwyGAQdFb7Kt6`
 }
-const activeTabs = [{
-		name: i18n.t('开机'),
-		type:'turnOnOrOff',
-		iconUrl: `${QINIU_URL}Fp5T9lSNakoiioji6S7W4DmFQ_ys`,
-		offUrl: `${QINIU_URL}FqxGx0H169EOJN0__Ym2Ls8x2i03`,
-		isLock: true,
-		isTurnOn:1
-	},
+// {
+// 		name: i18n.t('开机'),
+// 		type:'turnOnOrOff',
+// 		iconUrl: `${QINIU_URL}Fp5T9lSNakoiioji6S7W4DmFQ_ys`,
+// 		offUrl: `${QINIU_URL}FqxGx0H169EOJN0__Ym2Ls8x2i03`,
+// 		isLock: true,
+// 		isTurnOn:1
+// 	},
+const activeTabs = [
 	{
 		name: i18n.t('闪灯鸣笛'),
 		type:'findCar',
@@ -55,15 +56,15 @@ const activeTabs = [{
 		name: i18n.t('打开尾箱'),
 		type:'openTailBox',
 		iconUrl: `${QINIU_URL}Fv3KLuYWEeV5IM4_2sMbmur7yZtz`
-	}
-]
-const toBeSelectTabs = [{
+	},
+	{
 		name:i18n.t('胎压'),
 		type:'tirePressure',
 		url:'',
 		iconUrl: `${QINIU_URL}FmbcjmvoB4J3CT1hrbjNX4kxv9Zq`
-	},
-	{
+	}
+]
+const toBeSelectTabs = [{
 		name: i18n.t('电池信息'),
 		type:'batteryInfo',
 		url:'/pages/batteryDetail/batteryDetail',

component/returnCar/returnCar.vue

@@ -10,6 +10,7 @@
 					<view @tap="navStore">导航到店</view>
 					<view @tap="immediatelyReturn">我已到店</view>
 				</view>
+				<view v-if="typePage=='index'" style="height: 110rpx;"></view>
 			</view>
 		</view>
 </template>
@@ -28,6 +29,10 @@ export default {
 			type: Boolean,
 			default: false
 		},
+		typePage: {
+			type: String,
+			default: 'order'
+		},
     },
     /**
      * 组件的方法列表
@@ -50,7 +55,7 @@ export default {
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 10;
+	z-index: 1000;
 	width: 100%;
 	height: 100vh;
 	background-color: rgba(0, 0, 0, 0.4);
@@ -60,7 +65,7 @@ export default {
 	border-radius: 32rpx 32rpx 0rpx 0rpx;
 	background-color: #ffffff;
 	padding: 40rpx 32rpx 74rpx;
-	z-index: 100;
+	z-index: 1100;
 	position: fixed;
 	bottom: 0;
 	width: 100%;

component/scanCabBtn/scanBtn.vue

@@ -27,7 +27,7 @@
 	// var IndexImpl = require('../../pages/index/model/indexImpl.js');
 	const DF_CAB_INFO_DONE = 10000; //机柜信息传输完成
 	var subscribeTimer = null;
-	let app = getApp();
+	
 	export default {
 		props: {
 			listData:{
@@ -110,6 +110,7 @@
 				// this.license_plate_number = car_list.plate_number
 				this.carInfo = car_list
 			}
+			let app = getApp();
 			if (app.globalData.showScanBtn) {
 				this.showScanBtn = true
 			} else {

mixin/index.js

@@ -89,34 +89,34 @@ export default {
 				// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
 				if (this.carOnline) {
 					if (this.cmdType == 'turnOnOrOff') {
-						const switchType = this.contrilList.find(item => item.isTurnOn).isTurnOn
-						const pData = {
-							car_sn: car_info.car_sn,
-							switch: switchType
-						}
-						const me=this
-						common.loading();
-						http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
-							uni.hideLoading();
-							if (resp.data.code === 200) {
-								common.simpleToast(me.popText + '成功');
-								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
-								})
-								me.$emit('loadCarDetail',pData,car_sn)
-							} else {
-								common.simpleToast(resp.data.msg);
-							}
-						});
+						// const switchType = this.contrilList.find(item => item.isTurnOn).isTurnOn
+						// const pData = {
+						// 	car_sn: car_info.car_sn,
+						// 	switch: switchType
+						// }
+						// const me=this
+						// common.loading();
+						// http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
+						// 	uni.hideLoading();
+						// 	if (resp.data.code === 200) {
+						// 		common.simpleToast(me.popText + '成功');
+						// 		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
+						// 		})
+						// 		me.$emit('loadCarDetail',pData,car_sn)
+						// 	} else {
+						// 		common.simpleToast(resp.data.msg);
+						// 	}
+						// });
 					}else{
 						const testArr=[
 							{type:'findCar',opt_type:1},
@@ -126,7 +126,7 @@ export default {
 						const pData = testArr.find(i=>i.type===this.cmdType)
 						const me=this
 						common.loading();
-						http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, pData, (resp) => {
+						http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, {...pData,car_sn: car_info.car_sn}, (resp) => {
 							uni.hideLoading();
 							if (resp.data.code === 200) {
 								common.simpleToast(me.popText + '成功');
@@ -148,8 +148,8 @@ export default {
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
 			const isBluetoothConnect = app.globalData.nearLockCheck
 			if(isBluetoothConnect){
+				//改成判断开关锁
 				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,
@@ -192,6 +192,36 @@ export default {
 					complete: function(res) {},
 				})
 			}
+		},
+		trunOn(){
+			const switchType = this.contrilList.find(item => item.isTurnOn).isTurnOn
+			const pData = {
+				car_sn: car_info.car_sn,
+				switch: switchType
+			}
+			const me=this
+			common.loading();
+			http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
+				uni.hideLoading();
+				if (resp.data.code === 200) {
+					common.simpleToast(me.popText + '成功');
+					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
+					})
+					me.$emit('loadCarDetail',pData,car_sn)
+				} else {
+					common.simpleToast(resp.data.msg);
+				}
+			});
 		}
 	},
 

pages.json

@@ -74,6 +74,12 @@
 		{
 			"path": "pages/message/deviceInfo",
 			"style": {
+				
+			}
+		},{
+			"path": "pages/message/systemInfo",
+			"style": {
+				"navigationBarTitleText": "系统详情"
 			}
 		},
 		{

pages/activation/activation.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<navBar name="车辆激活" left="0"></navBar>
+		<navBar :name="typePage=='index'?'归还车辆':'车辆激活'" left="0"></navBar>
 		<view class="container-view">
 			<view class="return-info">
 				<view class="h5">车辆信息</view>
@@ -111,7 +111,8 @@
 				return_imgs: [],
 				car_imgs: [],
 				model_image_list: '',
-				_image_list: []
+				_image_list: [],
+				typePage:''
 			};
 		},
 		/**
@@ -129,6 +130,7 @@
 			this.sub_sn = options.sub_sn || ''
 			this.model_id = options.model_id || ''
 			this.car_sn = options.car_sn || ''
+			this.typePage = options.type || ''
 			if (options.overdueMoney == 'undefined' || !options.overdueMoney) {
 				this.overdueMoney = 0
 			} else {

pages/carList/carList.vue

@@ -34,7 +34,7 @@
 <script>
  import Confirm from '@/component/comPopup/Confirm'
 	var config = require('../../common/config.js');
-	let app = getApp();
+	
 	var config = require('../../common/config.js');
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
@@ -59,6 +59,7 @@
 		 */
 		,
 		onLoad: function(options) {
+			const app = getApp();
 			this.isNearLockCheck=app.globalData.nearLockCheck
 			this.loadUserCarList()
 		},
@@ -89,6 +90,7 @@
 						resp.data.data.car_sn = car_sn
 						uni.setStorageSync('car_info', resp.data.data);
 						me.car_info = resp.data.data
+						const app = getApp();
 						//清空当前设备蓝牙相关
 						app.globalData.nearLockCheck=false
 						app.globalData.nearLockInfo={}

pages/contract/contract.vue

@@ -21,7 +21,7 @@
 	const config = require('../../common/config.js');
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
-	let app = getApp();
+
 	export default {
 		data() {
 			return {
@@ -57,6 +57,7 @@
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
+			const app = getApp();
 			this.setData({
 				orderSign:app.globalData.orderSign,
 			    orderSignUrl:app.globalData.orderSignUrl
@@ -74,6 +75,7 @@
 				const accountInfo = wx.getAccountInfoSync() // 上报小程序账号信息
 				http.postApi(config.API_USER_INFO, { appid: accountInfo.miniProgram.appId }, function (resp) {
 					if (resp.data.code === 200) {
+						const app = getApp();
 						app.globalData.orderSign = resp.data.data.userInfo.order_sign
 						app.globalData.orderSignUrl = resp.data.data.userInfo.order_sign_url
 						me.setData({

pages/index/components/AndroidUnlockAuth.vue

@@ -28,7 +28,6 @@
 </template>
 
 <script>
-	let app = getApp();
 	var common = require('@/common/common.js');
 	import permision from "@/js_sdk/wa-permission/permission.js"
 	// import mixin from '@/mixin/index.js'; // 引入 mixin
@@ -108,6 +107,7 @@ export default {
       }
     },
     linkTo() {
+      // const app = getApp();
 		// let isOpenAllPermission=false
 		// app.globalData.permissionArr.map(item=>{
 		// 	if(!item.state) isOpenAllPermission=true

pages/index/components/control/control.css

@@ -150,4 +150,54 @@
 .ok-btn-pop{
 	color: #FFFFFF;
 	background: #060809;
-}
+}
+.power-view{
+	padding: 0 32rpx;
+	margin-bottom: 40rpx;
+}
+.power-on-off{
+	align-items: center;
+	flex-grow: 1;
+	margin-right: 14rpx;
+	height: 96rpx;
+	background: #FFFFFF;
+	border-radius: 48rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 600;
+	font-size: 32rpx;
+	color: #060809;
+	border: 4rpx solid #F1F3F4;
+}
+.power-on-btn{
+	height: 96rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 144rpx;
+	background: #060809;
+	border-radius: 52rpx;
+	border: 6rpx solid #FFF;
+}
+.power-on-text{
+	display:flex;
+	flex-grow: 1;
+	margin-left: 40rpx;
+	translateX:('-135px');
+}
+.car-change-battery{
+	align-items: center;
+	width: 272rpx;
+	height: 96rpx;
+	background: #FFFFFF;
+	border-radius: 48rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 600;
+	font-size: 32rpx;
+	color: #060809;
+	padding-left: 20rpx;
+}
+.car-change-text{
+	margin-left: 8rpx;
+	display: flex;
+	flex-grow: 1;
+}

pages/index/components/control/control.vue

@@ -10,6 +10,16 @@
 				<text>{{$t("更多功能")}}</text>
 			</view>
 		</scroll-view>
+		<view class="flex-row power-view">
+			<view class="power-on-off flex-row" >
+				<view :style="sliderStyle" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" class="power-on-btn"><image style="width: 52rpx;height: 52rpx;" src="https://qiniu.bms16.com/Fkovrpq1bexe-Unal_VJREbLUhdu" mode=""></image></view>
+				<view class="power-on-text" >滑动启动</view>
+			</view>
+			<view class="car-change-battery flex-row">
+				<view class="car-change-btn"><image style="width: 80rpx;height: 80rpx;" src="https://qiniu.bms16.com/FgvnT-msLbL5RHjl6fvNlM0kab5N" mode=""></image></view>
+				<view class="car-change-text">车辆换电</view>
+			</view>
+		</view>
 		<view v-if="popupControlShow" class="show-modal">
 			<view class="modal-info">
 				<view class="popup-title">{{($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText))}}</view>
@@ -62,7 +72,6 @@
 </template>
 
 <script>
-	let app = getApp();
 	var bluetooth = require('@/common/bluetooth.js');
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');
@@ -92,9 +101,20 @@ export default {
 			// popupControlShow:false,
 			// controlType:null,//选择的车辆控制
 			isShowMore:false,
-			car_line:false
+			car_line:false,
+			startX: 0, // 滑块开始滑动的初始位置
+			moveX: 0, // 滑块滑动的距离
+			unlocked: false // 是否解锁成功的标志
 		};
     },
+	computed: {
+	    // 计算滑块的样式
+	    sliderStyle() {
+	      return {
+	        transform: `translateX(${this.moveX}px)`
+	      };
+	    }
+	},
 	mounted() {
 		// this.contrilList = getFunctionTag().activeTag
 	},
@@ -111,7 +131,27 @@ export default {
 			uni.navigateTo({
 				url: '/pages/carFunctionSet/more?online='+this.online
 			})
-		}
+		},
+		    touchStart(event) {
+				console.log(event,'test');
+		      this.startX = this.unlocked?this.moveX:event.touches[0].clientX;
+		    },
+		    touchMove(event) {
+		      this.moveX = event.touches[0].clientX - this.startX;
+			  console.log( event.touches[0].clientX,this.startX,'this.moveX');
+		      if (this.moveX < 0) this.moveX = 0;
+		      if (this.moveX > 70 &&!this.unlocked) this.moveX = 135; // 假设滑块最大滑动距离为135px
+			  
+		    },
+		    touchEnd() {
+				 console.log(this.moveX,'this.moveX1111');
+		      if (this.moveX >= 135) {
+		        this.unlocked = true;
+		        console.log('解锁成功');
+		      } else {
+		        // this.moveX = 0;
+		      }
+		    }
 		// tapOpen(e){
 		// 	this.carOnline=this.online
 		// 	console.log( getFunctionTag().activeTag, getFunctionTag());

pages/index/index.css

@@ -5,7 +5,7 @@
 	align-items: center;
 }
 .padding_about_40{
-	padding: 26rpx 0rpx 44rpx 40rpx;
+	padding: 26rpx 0rpx 20rpx 40rpx;
 }
 .car-img-view{
 	padding: 0 40rpx;
@@ -18,7 +18,8 @@
 	flex-direction: column;
 	line-height: 1;
 	align-items: flex-start;
-	position: absolute;
+	/* position: absolute;
+	z-index: 100; */
 }
 .car-name-view{
 	font-weight: 600;
@@ -51,7 +52,7 @@
 	text-align:center;
 	display: flex;
 	align-items: baseline;
-	margin-top: 20rpx;
+	margin-top: 14rpx;
 }
 .update-time-view{
 	justify-content: center;
@@ -76,6 +77,8 @@
 	flex-grow: 1;
 	height: 100%;
 	margin-left:20rpx;
+	display: flex;
+	flex-direction: column;
 }
 .card-top-title{
 	margin-bottom: 20rpx;
@@ -184,4 +187,21 @@
 	color: #FFFFFF;
 	text-align: center;
 	width: 148rpx;
+}
+.return-car-btn{
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 600;
+	font-size: 28rpx;
+	color: #060809;
+	width: 220rpx;
+	height: 62rpx;
+	justify-content: center;
+	align-items: center;
+	background: rgba(255,255,255,0.32);
+	border-radius: 40rpx;
+}
+.custom-swiper-view{
+	width: 100%;
+	height: 480rpx;
+	margin: 10rpx 0;
 }

pages/index/index.vue

@@ -44,9 +44,15 @@
 						<view @click="routerLink('/pages/order/order')" class="renew-btn">去续费</view>
 					</view>
 					<view class="car-img-view" @tap="toMoreInfoPage">
-						<view class="quantity-view flex-row">
+						<view class="flex-row flex-between" style="align-items: center;">
 							<text class="quantity flex-row">{{car_info.soc}} <text
 									style="font-size: 28rpx;font-weight: 500;">%</text></text>
+							<view @tap.stop="tapReturnCar" class="return-car-btn flex-row">
+								<image style="width: 46rpx;height: 46rpx;" src="https://qiniu.bms16.com/FtyG7Gq2QBaVVrZmTnmZFzXhE5nN" mode=""></image>
+								<view style="margin-left: 12rpx;">我要还车</view>
+							</view>
+						</view>
+						<view class="quantity-view flex-row">
 							<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10"
 								:show-percent="false" :percent="car_info.soc"></u-line-progress>
 							<view class="quantity-text flex-row">
@@ -55,8 +61,16 @@
 							</view>
 						</view>
 						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
-						<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
-							style="width: 100%;height: 526rpx;" alt="">
+						<!-- <img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
+							style="width: 100%;height: 526rpx;" alt=""> -->
+							<view class="custom-swiper-view">
+								<u-swiper v-if="car_image.length!=0" :list="car_image"  :autoplay="false" mode="none"
+									 :height="480" bgColor="transparent" class="custom-swiper">
+								</u-swiper>
+								<image v-else style="width: 100%;height: 480rpx;" src="https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX" mode="">
+								</image>
+							</view>
+							
 						<view class="flex-row align-center update-time-view">
 							<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>
@@ -152,6 +166,8 @@
 			<IosUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission"
 				v-else-if="isShowPermission && (platform === 'ios')" />
 		</view>
+		<returnCar :isShowReturnCar="isShowReturnCar" typePage="index" @closeShowReturnCarBtn="()=>isShowReturnCar=false"
+			@navStoreBtn="navStoreBtn" @immediatelyReturnBtn="immediatelyReturnBtn" />
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -170,6 +186,7 @@
 	import BluetoothUnlockAuth from '../bluetoothUnlock/bluetoothUnlockAuth.vue'
 	import AndroidUnlockAuth from './components/AndroidUnlockAuth.vue'
 	import IosUnlockAuth from './components/IosUnlockAuth.vue'
+	import ReturnCar from '@/component/returnCar/returnCar';
 	import {
 		getFunctionTag,
 	} from '@/common/storage.js';
@@ -202,6 +219,9 @@
 				statusBarHeight: 0,
 				isBluethConnect: false, //当前是否蓝牙连接或者配对
 				isOpenAllPermission: false, //所有蓝牙配对所需权限是否已开启
+				isShowReturnCar:false,
+				overdueData:{},
+				car_image:[]
 			};
 		},
 		computed: {},
@@ -212,7 +232,8 @@
 			UnleasedPages,
 			BluetoothUnlockAuth,
 			AndroidUnlockAuth,
-			IosUnlockAuth
+			IosUnlockAuth,
+			ReturnCar
 		},
 
 		/**
@@ -273,11 +294,12 @@
 		},
 		methods: {
 			init() {
-				const app = getApp();
+				
 				this.loadModelList()
 				this.contrilList = getFunctionTag().activeTag
 				const user_token = storage.getUserToken()
 				this.car_info = uni.getStorageSync('car_info') || {};
+				const app = getApp();
 				this.isBluethConnect =  app.globalData.nearLockCheck
 				if (!user_token) return
 				this.newsNumFn()
@@ -398,49 +420,6 @@
 				uni.navigateTo({
 					url: url
 				});
-				// if (me.userInfo.is_auth - 0 == 1 && me.userInfo.status - 0 == 2) {
-				// 	uni.navigateTo({
-				// 		url: url
-				// 	});
-				// } else if (me.userInfo.is_auth - 0 == 1 && me.userInfo.status - 0 != 2) {
-				// 	uni.showModal({
-				// 		title: '身份认证提示',
-				// 		content: '尚未完成身份认证，是否进行身份认证?',
-				// 		cancelText: '取消',
-				// 		confirmText: '确定',
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				me.loadFaceToken()
-				// 			}
-				// 		},
-				// 		fail: function(res) {},
-				// 		complete: function(res) {},
-				// 	})
-				// } else {
-				// 	uni.showModal({
-				// 		title: '提示',
-				// 		content: '您还未登录，请先登录',
-				// 		showCancel: true,
-				// 		cancelText: '取消',
-				// 		confirmText: '确定',
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				//#ifdef MP-ALIPAY
-				// 				uni.navigateTo({
-				// 					url: '/pages/phoneLogin/phoneLogin',
-				// 				})
-				// 				//#endif
-				// 				//#ifdef MP-WEIXIN
-				// 				uni.navigateTo({
-				// 					url: '/pages/login/login',
-				// 				})
-				// 				//#endif
-				// 			}
-				// 		},
-				// 		fail: function(res) {},
-				// 		complete: function(res) {},
-				// 	})
-				// }
 			},
 			loadUserCarList() {
 				const me = this
@@ -485,11 +464,13 @@
 					uni.hideLoading();
 					if (resp.data.code === 200) {
 						resp.data.data.car_sn = car_sn
+						const _car_image=resp.data.data.model_images?resp.data.data.model_images.split(','):[]
 						me.setData({
 							car_info: resp.data.data,
+							car_image:_car_image
 						})
 						uni.setStorageSync('car_info', this.car_info);
-						console.log(this.car_info, 'this.car_info------------------');
+						console.log(_car_image, 'this.car_info------------------');
 						//判断逾期
 						if (!resp.data.data.sold_time) return
 						let time = Math.ceil(resp.data.data.hire_end_time - Math.floor(new Date()) / 1000) / 60
@@ -528,7 +509,51 @@
 					
 				}
 			},
-
+			navStoreBtn() {
+				const {
+					latitude,
+					longitude,
+					address,
+					model_name
+				} = this.car_info
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name: model_name,
+					address: address,
+					success: function(res) {}
+				});
+			},
+			tapReturnCar() {
+				this.overdueMoneyFn(this.car_info.car_sn)
+				this.setData({
+					isShowReturnCar: true
+				})
+			},
+			//逾期费用计算
+			async overdueMoneyFn(car_sn) {
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_CAR_OVERDUE_MONEY, {
+					car_sn
+				})
+				if (data.code == 200) {
+					this.overdueData = data.data
+				} else {
+					common.simpleToast(data.msg)
+				}
+			},
+			immediatelyReturnBtn() {
+				const {
+					car_sn,
+					model_id
+				} = this.car_info
+				//提交还车图片
+				uni.navigateTo({
+					url: `/pages/activation/activation?isReturnCar=${true}&model_id=${model_id}&car_sn=${car_sn}&isOverdue=${this.isOverdueShow}&overdueMoney=${this.overdueData.money}&overdueTime=${this.overdueData.time}&type=index`
+				});
+			},
 
 		}
 	};

pages/login/login.vue

@@ -44,7 +44,6 @@
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
 	var encryption = require('../../common/encryption.js')
-	let app = getApp()
 	export default {
 		data() {
 			return {
@@ -186,6 +185,7 @@
 								uni.reLaunch({
 									url: '/pages/index/index',
 								})
+								const app = getApp();
 								let accounts = app.globalData.accountManagement
 								accounts.push(accountsData2)
 								if (accounts.length > 0) {

pages/message/index.vue

@@ -24,112 +24,84 @@
 			style="display: flex;align-items: center;justify-content: center;height: 80vh;">
 			您还没有设备消息
 		</view>
-
-		<view v-if="isSys==='1' && sysMsgList.length > 0 " style="margin-top: 20rpx;" class="sys-msg-wrap base-wrap">
-
-			<view class="row">
-				<view class="title" style="display: flex;">
-					<view>{{ $t('系统消息') }}</view>
-					<view v-if="unreadCount > 0" class="bage">{{ unreadCount }}</view>
-				</view>
-			</view>
-			<view @click="gotoDetail(item)" class="msg-item" v-for="(item, index) in sysMsgList" :key="index">
-				<view class="msg">
-					<view class="flex">
-						<view v-if="item.read === '0'" class="dot"></view>
-						{{ item.title }}
-					</view>
-					<view v-if="item.type === 1" class="btn">绑定设备</view>
-				</view>
-				<view class="time">{{ item.ctime }}</view>
-				<view class="dtl">{{ item.overview }}</view>
-			</view>
-		</view>
-
-		<view v-if="isSys==='1' && sysMsgList.length === 0 "
-			style="display: flex;align-items: center;justify-content: center;height: 80vh;">
+        
+        <view v-if="isSys==='1' && sysMsgList.length > 0 " style="margin-top: 20rpx;" class="sys-msg-wrap base-wrap" >
+            <view class="title">{{ $t('系统消息') }}</view>
+			
+            <view class="msg-item" v-for="(item, index) in sysMsgList" :key="index" @tap="toSystemMsgPage(item)">
+                <view class="msg">
+                    {{ item.title }}
+                    <view v-if="item.type === 1" class="btn">绑定设备</view>
+                </view>
+                <view class="time">{{ item.ctime }}</view>
+                <view class="dtl">{{ item.overview }}</view>
+            </view>
+        </view>
+		
+		<view v-if="isSys==='1' && sysMsgList.length === 0 " style="display: flex;align-items: center;justify-content: center;height: 80vh;">
 			您还没有系统消息
 		</view>
 	</view>
 </template>
 
 <script>
-	const config = require('@/common/config.js');
-	const http = require('@/common/http.js');
-	const request = require('@/common/request.js');
-	const common = require('@/common/common.js');
-	export default {
-		data() {
-			return {
-				value: 10,
-				sysMsgList: [],
-				deviceList: [],
-				deviceInfo: {},
-				isSys: '1',
-				unreadCount: 0
-			}
-		},
-		onLoad(options) {
-			this.isSys = options.isSys
-		},
-		created() {
-			this.querySysMsgList()
-			this.queryDeviceMsg()
-			// this.readMessage()
+const config = require('@/common/config.js');
+const http = require('@/common/http.js');
+const request = require('@/common/request.js');
+const common = require('@/common/common.js');
+export default {
+    data() {
+        return {
+            value: 10,
+            sysMsgList: [],
+            deviceList: [],
+            deviceInfo: {},
+			isSys:'1'
+        }
+    },
+	onLoad(options){
+		this.isSys = options.isSys || '0'
+	},
+    created() {
+        this.querySysMsgList()
+        this.queryDeviceMsg()
+		this.readMessage()
+    },
+    methods: {
+		async readMessage(){
+			await request.postApi(config.API_MESSAGE_READ_MESSAGE,{msg_type:2,car_id:0})
 		},
-		methods: {
-			async readMessage() {
-				await request.postApi(config.API_MESSAGE_READ_MESSAGE, {
-					msg_type: 2,
-					car_id: 0
-				})
-			},
-			gotoDetail(item) {
-				request.postApi(config.API_MESSAGE_READ_MESSAGE, {
-					msg_type: 2,
-					msg_id: item.plat_msg_id,
-					car_id: ''
-				})
-
-				uni.navigateTo({
-					url: `/pages/message/detail?id=${item.plat_msg_id}`
-				})
-			},
-			toDeviceMsgPage(item) {
-				equest.postApi(config.API_MESSAGE_READ_MESSAGE, {
-					msg_type: 1,
-					car_id: item.car_id
-				})
-
-				uni.navigateTo({
-					url: `/pages/message/detail?id=${item.car_id}`
-				})
-			},
-			queryDeviceMsg() {
-				http.postApi(config.API_DEVICE_MSG, {}, res => {
-					if (res.succeed) {
-						this.deviceList = res.body.data
-						this.deviceList.map(item => {
-							item.message_date = common.formatTime(item.message_date)
-						})
-					}
-				})
-			},
-			querySysMsgList() {
-				http.postApi(config.API_MESSAGE_LIST, {
-					msg_type: 'PLAT'
-				}, res => {
-					if (res.succeed) {
-						this.sysMsgList = res.body.data.list
-						this.sysMsgList.map(item => {
-							item.ctime = common.formatTime(item.ctime)
-						})
-						this.unreadCount = this.sysMsgList.filter(item => item.read === "0").length;
-					}
-				})
-			}
-		}
-	}
+        toDeviceMsgPage(itemData) {
+            const { id } = itemData
+            uni.navigateTo({ url: `/pages/message/deviceInfo?car_id=${car_id}` })
+        }, 
+		toSystemMsgPage(itemData) {
+            const { id } = itemData
+            uni.navigateTo({ url: `/pages/message/systemInfo?id=${id}` })
+        },
+        queryDeviceMsg() {
+            http.postApi(config.API_DEVICE_MSG, {}, res => {
+                if (res.succeed) {
+                    this.deviceList = res.body.data
+                    this.deviceList.map(item => {
+                        item.message_date = common.formatTime(item.message_date)
+						item.image = item.image.split(',')[0]
+                    })
+                }
+            })
+        },
+        querySysMsgList() {
+            http.postApi(config.API_MESSAGE_LIST, { msg_type: 'PLAT' }, res => {
+                if (res.succeed) {
+                    this.sysMsgList= res.body.data.list
+                    this.sysMsgList.map(item => {
+                        item.ctime = common.formatTime(item.ctime)
+                    })
+                }
+            })
+        }
+    }
+}
 </script>
 
 <style lang="scss" scoped>

pages/message/systemInfo.vue

@@ -0,0 +1,67 @@
+<template>
+	<view class="">
+		<navBar name="系统消息"/>
+		<view class="info-title">{{systemInfo.title}}</view>
+		<view class="info-time">{{tools.formatTime(systemInfo.ctime)}}</view>
+		<view class="nodes">
+			<rich-text v-if="systemInfo.content" :nodes="systemInfo.content"></rich-text>
+		</view>
+	</view>
+</template>
+<script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
+<script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
+<script>
+const config = require('@/common/config.js');
+const http = require('@/common/http.js');
+const request = require('@/common/request.js');
+const common = require('@/common/common.js');
+export default {
+    data() {
+        return {
+            systemInfo:{},
+			id:''
+        }
+    },
+	onLoad(options){
+		this.id = options.id || ''
+		this.querySystemMsg()
+	},
+    methods: {
+        querySystemMsg() {
+			const pData={
+				id:this.id,
+				type:'PLAT'
+			}
+            http.postApi(config.API_MESSAGE_DTL, pData, res => {
+                if (res.succeed) {
+                    this.systemInfo = res.body.data
+                }
+            })
+        },
+    }
+}
+</script>
+
+
+<style>
+	.info-title{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 600;
+		font-size: 36rpx;
+		color: #060809;
+		padding: 20rpx 32rpx;
+	}
+	.info-time{
+		font-family: Futura, Futura;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #060809;
+		opacity: 0.4;
+		padding: 20rpx 32rpx;
+	}
+	.nodes{
+		color: #333;
+		font-size: 28rpx;
+		padding: 34rpx 32rpx 32rpx;
+	}
+</style>

pages/openCabinet/openCabinet.vue

@@ -49,7 +49,6 @@
 	const common = require('../../common/common.js');
 	var bluetooth = require('../../common/bluetooth.js');
 	const DF_CAB_INFO_DONE = 10000; //机柜信息传输完成
-	const app = getApp();
 	export default {
 		data() {
 			return {

pages/orderStatus/orderStatus.vue

@@ -673,7 +673,7 @@
 				}
 				//提交还车图片
 				uni.navigateTo({
-					url: `/pages/activation/activation?isReturnCar=true,model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${this.orderInfo.car_sn}&isOverdue=${isOverdue}&overdueMoney=${this.overdueData.money}&overdueTime=${this.overdueData.time}`
+					url: `/pages/activation/activation?isReturnCar=true&model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${this.orderInfo.car_sn}&isOverdue=${isOverdue}&overdueMoney=${this.overdueData.money}&overdueTime=${this.overdueData.time}&type=index`
 				});
 				// if (isOverdue) {
 				// 	this.setData({

pages/phoneLogin/phoneLogin.vue

@@ -34,7 +34,6 @@
 	var common = require('../../common/common.js');
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
-	let app = getApp()
 	export default {
 		data() {
 			return {
@@ -201,6 +200,7 @@
 								uni.reLaunch({
 									url: '/pages/index/index',
 								})
+								const app = getApp();
 								let accounts = app.globalData.accountManagement
 								accounts.push(accountsData2)
 								if (accounts.length >0) {

pages/service/service.vue

@@ -82,7 +82,6 @@
 </template>
 
 <script>
-	let app = getApp();
 	var config = require("@/common/config.js");
 	var config_gyq = require("@/common/config_gyq.js");
 	var common = require("@/common/common.js");