提交

pages/bluetooth/bluetooth.vue

@@ -51,7 +51,7 @@
 	let zzApi = require("../../static/etc/WJAPI/wjBleAPI.js");
 	let jtApi = require("../../static/etc/JTAPI/BleUtil.js");
 	let kcApi = require("../../static/etc/kcBle/kcBleAPI.js");
-	// let jyApiEtc = require("../../static/etc/JYAPI-ETC/jy-bluetooth-obu-wechatmp.js");  //前装-金溢
+	let jyApiEtc = require("../../static/etc/JYAPI-ETC/jy-bluetooth-obu-wechatmp.js");  //前装-金溢
 
 
 	// #ifdef MP-ALIPAY
@@ -469,18 +469,17 @@
 									listenStatus(res);
 								}
 							);
-						} 
-						// else if (device.name.includes("JY")) {
-						// 	jyApiEtc.connectDevice(
-						// 		device,
-						// 		function (res) {
-						// 			preDevice(res);
-						// 		},
-						// 		function (res) {
-						// 			listenStatus(res);
-						// 		}
-						// 	);
-						// }
+						}else if (device.name.includes("JY")) {
+							jyApiEtc.connectDevice(
+								device,
+								function (res) {
+									preDevice(res);
+								},
+								function (res) {
+									listenStatus(res);
+								}
+							);
+						}
 						break;
 					case "JY":
 						jyApi.connectDevice(

subpackage/carPark/etc/etcDeviceInfo.vue

@@ -172,7 +172,7 @@
 	const tools = require("../../../static/etcUtil/tools.js");
 	const datas = require("../../../static/etcUtil/datas.js");
 	const bluetoothUtil = require("../../../static/etcUtil/index.js");
-	// let jyApiEtc = require("../../../static/etc/JYAPI-ETC/jy-bluetooth-obu-wechatmp.js"); //前装-金溢
+	let jyApiEtc = require("../../../static/etc/JYAPI-ETC/jy-bluetooth-obu-wechatmp.js"); //前装-金溢
 	const card = reactive({
 		cardNo: "",
 		startTime: "",
@@ -223,24 +223,24 @@
 		//执行0015文件
 		tools.showLoadingAlert("执行指令");
 		if (datas.getData("deviceName").includes("JY")) {
-			// jyApiEtc.getCardInfo(function(res) {
-			// 	if (res.code == '0') {
-			// 		var cardInfo = res.cardInfo;
-			// 		console.log("res.cardInfo", res.cardInfo)
-			// 		card.cardNo = cardInfo.cardId;
-			// 		card.startTime = cardInfo.signedDate;
-			// 		card.endTime = cardInfo.expiredDate;
-			// 		// message = "卡片方标识：" + cardInfo.provider + " 卡片类型：" + cardInfo.cardType + " 卡片版本号：" +
-			// 		// 	cardInfo.cardVersion + " 卡号：" + cardInfo.cardId + " 启用时间：" +
-			// 		// 	cardInfo.signedDate + " 到期时间：" + cardInfo.expiredDate + " 车牌号：" + cardInfo
-			// 		// 	.vehicleNumber +
-			// 		// 	" 用户类型：" + cardInfo.userType + " 车牌颜色：" + cardInfo.plateColor + " 车型：" + cardInfo
-			// 		// 	.vehicleModel;
-			// 		getObuId();
-			// 	} else {
-			// 		tools.alertF("获取卡片信息失败" + res.code);
-			// 	}
-			// })
+			jyApiEtc.getCardInfo(function(res) {
+				if (res.code == '0') {
+					var cardInfo = res.cardInfo;
+					console.log("res.cardInfo", res.cardInfo)
+					card.cardNo = cardInfo.cardId;
+					card.startTime = cardInfo.signedDate;
+					card.endTime = cardInfo.expiredDate;
+					// message = "卡片方标识：" + cardInfo.provider + " 卡片类型：" + cardInfo.cardType + " 卡片版本号：" +
+					// 	cardInfo.cardVersion + " 卡号：" + cardInfo.cardId + " 启用时间：" +
+					// 	cardInfo.signedDate + " 到期时间：" + cardInfo.expiredDate + " 车牌号：" + cardInfo
+					// 	.vehicleNumber +
+					// 	" 用户类型：" + cardInfo.userType + " 车牌颜色：" + cardInfo.plateColor + " 车型：" + cardInfo
+					// 	.vehicleModel;
+					getObuId();
+				} else {
+					tools.alertF("获取卡片信息失败" + res.code);
+				}
+			})
 		} else {
 			let cmdArr = [cmd.HOME_DIRECTORY, cmd.APPLICATION_DIRECTORY, "00B095002B"];
 			console.log(cmdArr);
@@ -384,9 +384,10 @@
 					return;
 				}
 				obu.num = obuStr.substring(20, 36)
+				let rand = datas.generateMixed(16);
 				let arr = [cmd.OBU_DF01, cmd.OBU_00B400000A + rand + cmd.OBU_4F00];
 				bluetoothUtil.transCmd(arr, '20', function(res) {
-					console.log("解密信息",res);
+					console.log("解密信息kc没问题",res);
 				})
 				return;
 				let str = res[1].substring(res[1].length - 4, res[1].length);