修改bug

static/etcUtil/index.js

@@ -681,5 +681,6 @@ function alertF(msg) {
 module.exports = {
 	disconnectDevice,
 	transCmd,
+	transCmdAfter,
 	transCmdArrAfter
 };

subpackage/after-sale/activation/activate.vue

@@ -251,7 +251,11 @@
 		vehicleId: '',
 	});
 
-	function cmdResult1() {
+	async function cmdResult1() { 
+		const cardres = await getCardIdAfter();
+		if(!cardres) return;
+		const obures = await getObuIdAfter(); 
+		if(!obures) return;
 		console.log("我的orderInfo：",orderInfo)
 		// tools.showLoadingAlert('正在激活，请等待')
 		state.progressNum = 100 / 20
@@ -495,6 +499,82 @@
 		getObuId();
 	};
 
+	async function getObuIdAfter(){
+		return new Promise(async (resolve, reject) =>{ 
+			try{
+				let cmdArray = [cmd.HOME_DIRECTORY, cmd.OBU_SYSTEM_FILE, cmd.RANDOM_NUMBER];
+				const res = await bluetoothUtil.transCmdAfter(cmdArray, "20");
+				var status = res[1].substring(res[1].length - 4, res[1].length);
+				console.log('获取OBU号执行结果' + status, res)
+				//第一次获取随机数
+				if (status == "9000") {
+					state.disabled = true
+					obu.obuId = res[1].substring(20, 36);
+					if(state.transfer == '2' && fileDataStrings.obuId && fileDataStrings.obuId != obu.obuId ) {
+						showModals('车牌obuId与设备obuId不符，请重新选择')
+						resolve(false);
+					}
+					// obu.obuId = '5201250802001105';
+					obu.vin = res[1].substring(18, 20);
+					obu.version = res[1].substring(18, 20);
+					state.ObuVersion = res[1].substring(18, 20)
+					state.ChipSn = res[1].substring(0, 8)
+					cmdRandNum = res[2].substring(0, res[2].length - 4);
+					resolve(true);
+					console.log("success")
+					return
+				} else {
+					showModals('获取设备信息错误！')
+					resolve(false);
+					return
+				}
+			} catch (e) {
+				//TODO handle the exception
+				console.log('错误错误', e);
+				reject(e);
+			}
+		})
+	}
+
+	async function getCardIdAfter(){
+		return new Promise(async (resolve, reject) =>{
+			try{				
+				let cmdArr = [cmd.HOME_DIRECTORY, cmd.APPLICATION_DIRECTORY, cmd.CMD_READBINARY, cmd.CMD_GETBALANCE];
+				const res = await bluetoothUtil.transCmdAfter(cmdArr, "10");
+				console.log("5201", res)
+				let str = res[2].substring(res[2].length - 4, res[2].length); //判断是否为9000
+				let str3 = res[3].substring(res[3].length - 4, res[3].length); //判断是否为9000
+				if (str == "9000" || str3 == "9000") {
+					if (res[2].length > 86 || res[3] >= 12) {
+						card.cardId = res[2].substring(20, 40);
+						if(state.transfer == '2' && fileDataStrings.cardId && fileDataStrings.cardId != card.cardId ) {
+							showModals('车牌cardId与设备cardId不符，请重新选择')
+							resolve(false);
+							return
+						}
+						// card.cardId = '52012511110201724155';
+						state.CardVersion = res[2].substring(18, 20),
+							tools.hideLoadingAlert();
+						state.showBtn = true
+						resolve(true);
+						return
+					} else {
+						alertF("CMD_READBINARY指令长度不符" + res[2]);
+						resolve(false);
+						return
+					}
+				}
+				alertF("CMD_READBINARY指令长度不符" + res[2]);
+				resolve(false);
+				return
+			} catch (e) {
+				//TODO handle the exception
+				console.log('错误错误', e);
+				reject(e);
+			}
+		})
+	}
+
 	/**
 	 * 获取OBU号 读OBU
 	 */